[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.11_ctdb.60-10-g4890ad0

[Michael Adam]

The branch, v3-2-ctdb has been updated
       via  4890ad0359f2171f9f70f2441869fad9e02dba8f (commit)
       via  e6107bb568852b815cbc4f536f38ad3cb9704573 (commit)
      from  2aa0d5e360e3a7366d28dd0828c6840d8611ff62 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb


- Log -----------------------------------------------------------------
commit 4890ad0359f2171f9f70f2441869fad9e02dba8f
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 18 06:18:57 2009 +0200

    Use SMB_VFS_NEXT_CLOSE. This VFS stuff is really opaque to me...

commit e6107bb568852b815cbc4f536f38ad3cb9704573
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:
 source/modules/vfs_gpfs.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_gpfs.c b/source/modules/vfs_gpfs.c
index 5aaba7b..7c49c84 100644
--- a/source/modules/vfs_gpfs.c
+++ b/source/modules/vfs_gpfs.c
@@ -49,6 +49,15 @@ 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)
+{
+	if ((fsp->fh != NULL) && (fsp->fh->fd != -1)) {
+		set_gpfs_sharemode(fsp, 0, 0);
+	}
+
+	return SMB_VFS_NEXT_CLOSE(handle, fsp);
+}
+
 static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp, 
 			     int leasetype)
 {
@@ -932,6 +941,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-CTDB repository