[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  389bb4f s3:smbd/oplock_linux: don't overwrite private_data
      from  e87d98c s3:vfs_gpfs:quieten an expectable warning message

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 389bb4fbe175af8bfb3b75f4ed69529e4d3e075b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 10 19:49:05 2012 +0100

    s3:smbd/oplock_linux: don't overwrite private_data
    
    We set ctx->private_data = sconn a few lines above
    and expect 'sconn' in the signal event handler.
    
    Thanks to Christian Ambach <ambi at samba.org> for the
    bug report.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Feb 10 21:48:18 CET 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/oplock_linux.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index f796e8c..190578e 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -228,8 +228,6 @@ struct kernel_oplocks *linux_init_kernel_oplocks(struct smbd_server_connection *
 		return NULL;
 	}
 
-	ctx->private_data = se;
-
 	DEBUG(3,("Linux kernel oplocks enabled\n"));
 
 	return ctx;


-- 
Samba Shared Repository