diff options
author | Volker Lendecke <vl@samba.org> | 2012-08-08 10:38:36 +0200 |
---|---|---|
committer | Christian Ambach <ambi@samba.org> | 2012-08-17 18:25:53 +0200 |
commit | 3755a418ccee85d633aaac5047c007893ce63c73 (patch) | |
tree | e2a97282ff25ddeb98c1351857270dd84e1556fe /source3/modules | |
parent | 2c3a58db9e2149785486e6b6398615f2d226dc23 (diff) | |
download | samba-3755a418ccee85d633aaac5047c007893ce63c73.tar.gz samba-3755a418ccee85d633aaac5047c007893ce63c73.tar.bz2 samba-3755a418ccee85d633aaac5047c007893ce63c73.zip |
s3: Remove the gpfs_hsm_notify module
The functionality has been merged into vfs_gpfs
Signed-off-by: Christian Ambach <ambi@samba.org>
Diffstat (limited to 'source3/modules')
-rw-r--r-- | source3/modules/vfs_gpfs_hsm_notify.c | 110 | ||||
-rw-r--r-- | source3/modules/wscript_build | 8 |
2 files changed, 0 insertions, 118 deletions
diff --git a/source3/modules/vfs_gpfs_hsm_notify.c b/source3/modules/vfs_gpfs_hsm_notify.c deleted file mode 100644 index d53363c460..0000000000 --- a/source3/modules/vfs_gpfs_hsm_notify.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Make sure offline->online changes are propagated by notifies - - This module must come before aio_fork in the chain, because - aio_fork (correcly!) does not propagate the aio calls further - - Copyright (C) Volker Lendecke 2011 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "includes.h" -#include "smbd/smbd.h" -#include "librpc/gen_ndr/ndr_xattr.h" -#include "include/smbprofile.h" - -#undef DBGC_CLASS -#define DBGC_CLASS DBGC_VFS - -#include <gpfs_gpl.h> -#include "nfs4_acls.h" -#include "vfs_gpfs.h" - -static ssize_t vfs_gpfs_hsm_notify_pread(vfs_handle_struct *handle, files_struct *fsp, - void *data, size_t n, off_t offset) -{ - ssize_t ret; - - ret = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset); - - DEBUG(10, ("vfs_private = %x\n", - (unsigned int)fsp->fsp_name->st.vfs_private)); - - if ((ret != -1) && - ((fsp->fsp_name->st.vfs_private & GPFS_WINATTR_OFFLINE) != 0)) { - fsp->fsp_name->st.vfs_private &= ~GPFS_WINATTR_OFFLINE; - notify_fname(handle->conn, NOTIFY_ACTION_MODIFIED, - FILE_NOTIFY_CHANGE_ATTRIBUTES, - fsp->fsp_name->base_name); - } - - return ret; -} - -static ssize_t vfs_gpfs_hsm_notify_pwrite(struct vfs_handle_struct *handle, - struct files_struct *fsp, - const void *data, size_t n, off_t offset) -{ - ssize_t ret; - - ret = SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset); - - if ((ret != -1) && - ((fsp->fsp_name->st.vfs_private & GPFS_WINATTR_OFFLINE) != 0)) { - fsp->fsp_name->st.vfs_private &= ~GPFS_WINATTR_OFFLINE; - notify_fname(handle->conn, NOTIFY_ACTION_MODIFIED, - FILE_NOTIFY_CHANGE_ATTRIBUTES, - fsp->fsp_name->base_name); - } - - return ret; -} - -static ssize_t vfs_gpfs_hsm_notify_aio_return(struct vfs_handle_struct *handle, - struct files_struct *fsp, - SMB_STRUCT_AIOCB *aiocb) -{ - ssize_t ret; - - ret = SMB_VFS_NEXT_AIO_RETURN(handle, fsp, aiocb); - - DEBUG(10, ("vfs_gpfs_hsm_notify_aio_return: vfs_private = %x\n", - (unsigned int)fsp->fsp_name->st.vfs_private)); - - if ((ret != -1) && - ((fsp->fsp_name->st.vfs_private & GPFS_WINATTR_OFFLINE) != 0)) { - fsp->fsp_name->st.vfs_private &= ~GPFS_WINATTR_OFFLINE; - DEBUG(10, ("sending notify\n")); - notify_fname(handle->conn, NOTIFY_ACTION_MODIFIED, - FILE_NOTIFY_CHANGE_ATTRIBUTES, - fsp->fsp_name->base_name); - } - - return ret; -} - -static struct vfs_fn_pointers vfs_gpfs_hsm_notify_fns = { - .pread_fn = vfs_gpfs_hsm_notify_pread, - .pwrite_fn = vfs_gpfs_hsm_notify_pwrite, - .aio_return_fn = vfs_gpfs_hsm_notify_aio_return -}; - -NTSTATUS vfs_gpfs_hsm_notify_init(void); -NTSTATUS vfs_gpfs_hsm_notify_init(void) -{ - return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "gpfs_hsm_notify", - &vfs_gpfs_hsm_notify_fns); -} diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index 4043292069..eccbfadcd0 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -31,7 +31,6 @@ VFS_CACHEPRIME_SRC = 'vfs_cacheprime.c' VFS_PREALLOC_SRC = 'vfs_prealloc.c' VFS_COMMIT_SRC = 'vfs_commit.c' VFS_GPFS_SRC = 'vfs_gpfs.c gpfs.c' -VFS_GPFS_HSM_NOTIFY_SRC = 'vfs_gpfs_hsm_notify.c' VFS_NOTIFY_FAM_SRC = 'vfs_notify_fam.c' VFS_READAHEAD_SRC = 'vfs_readahead.c' VFS_TSMSM_SRC = 'vfs_tsmsm.c' @@ -317,13 +316,6 @@ bld.SAMBA3_MODULE('vfs_gpfs', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs')) -bld.SAMBA3_MODULE('vfs_gpfs_hsm_notify', - subsystem='vfs', - source=VFS_GPFS_HSM_NOTIFY_SRC, - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs_hsm_notify'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs_hsm_notify')) - bld.SAMBA3_MODULE('vfs_notify_fam', subsystem='vfs', source=VFS_NOTIFY_FAM_SRC, |