git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff82afb
)
s3:vfs_gpfs skip local flock when gpfs sharemodes are disabled
author
Christian Ambach
<ambi@samba.org>
Fri, 12 Oct 2012 08:31:10 +0000
(10:31 +0200)
committer
Christian Ambach
<ambi@samba.org>
Fri, 12 Oct 2012 09:49:31 +0000
(11:49 +0200)
no sense in calling local flock when clustered sharemodes should be disabled
source3/modules/vfs_gpfs.c
patch
|
blob
|
history
diff --git
a/source3/modules/vfs_gpfs.c
b/source3/modules/vfs_gpfs.c
index b3cdca5cd886b22fe152f02c8197830e9475011a..fdd8e93cf603717bdc1e9f5179692358c6275a1d 100644
(file)
--- a/
source3/modules/vfs_gpfs.c
+++ b/
source3/modules/vfs_gpfs.c
@@
-61,12
+61,15
@@
static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
struct gpfs_config_data,
return -1);
+ if(!config->sharemodes) {
+ return 0;
+ }
+
START_PROFILE(syscall_kernel_flock);
kernel_flock(fsp->fh->fd, share_mode, access_mask);
- if (config->sharemodes
- && !set_gpfs_sharemode(fsp, access_mask, fsp->share_access)) {
+ if (!set_gpfs_sharemode(fsp, access_mask, fsp->share_access)) {
ret = -1;
}