[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-1712-g54973d0
Volker Lendecke
vlendec at samba.org
Wed May 20 13:16:28 GMT 2009
The branch, master has been updated
via 54973d04221c4f45db1e33e49cfd445c81518f86 (commit)
from 3fbc871f70c2e711180def16b868cc03d0407461 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 54973d04221c4f45db1e33e49cfd445c81518f86
Author: Volker Lendecke <vl at samba.org>
Date: Mon May 18 06:02:07 2009 +0200
Fix bug disclosed by lock8 torture test
We have to drop the gpfs level share modes, regardless of whether we put
the file into the pending close queue.
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_gpfs.c | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index b304d8b..778f4a0 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -49,6 +49,19 @@ static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
return 0;
}
+static int vfs_gpfs_close(vfs_handle_struct *handle, files_struct *fsp)
+{
+ int result;
+
+ if ((fsp->fh != NULL) && (fsp->fh->fd != -1)) {
+ set_gpfs_sharemode(fsp, 0, 0);
+ }
+
+ result = fd_close_posix(fsp);
+
+ return result;
+}
+
static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp,
int leasetype)
{
@@ -923,6 +936,10 @@ static vfs_op_tuple gpfs_op_tuples[] = {
SMB_VFS_OP_FCHMOD,
SMB_VFS_LAYER_TRANSPARENT },
+ { SMB_VFS_OP(vfs_gpfs_close),
+ SMB_VFS_OP_CLOSE,
+ SMB_VFS_LAYER_TRANSPARENT },
+
{ SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP }
};
--
Samba Shared Repository
More information about the samba-cvs
mailing list