Changeset 599 for trunk/server/source3/modules/vfs_gpfs.c

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

File:

• trunk/server/source3/modules/vfs_gpfs.c (modified) (7 diffs)

trunk/server/source3/modules/vfs_gpfs.c

@@ -31 +31 @@
 #include "vfs_gpfs.h"
 
+
+
+
+
+
+
 static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp, 
                                  uint32 share_mode, uint32 access_mask)
 {
 
+
+
+
+
+
+
         START_PROFILE(syscall_kernel_flock);
 
         kernel_flock(fsp->fh->fd, share_mode, access_mask);
 
-        if (!set_gpfs_sharemode(fsp, access_mask, fsp->share_access)) {
-
-                return -1;
-
+        if (config->sharemodes
+                && !set_gpfs_sharemode(fsp, access_mask, fsp->share_access)) {
+                return -1;
         }
 
@@ -52 +63 @@
 static int vfs_gpfs_close(vfs_handle_struct *handle, files_struct *fsp)
 {
-        if ((fsp->fh != NULL) && (fsp->fh->fd != -1)) {
+
+        struct gpfs_config_data *config;
+
+        SMB_VFS_HANDLE_GET_DATA(handle, config,
+                                struct gpfs_config_data,
+                                return -1);
+
+        if (config->sharemodes && (fsp->fh != NULL) && (fsp->fh->fd != -1)) {
                 set_gpfs_sharemode(fsp, 0, 0);
         }
@@ -62 +80 @@
                              int leasetype)
 {
-        int ret;
+        struct gpfs_config_data *config;
+        int ret=0;
+
+        SMB_VFS_HANDLE_GET_DATA(handle, config,
+                                struct gpfs_config_data,
+                                return -1);
 
         START_PROFILE(syscall_linux_setlease);
 
-        if ( linux_set_lease_sighandler(fsp->fh->fd) == -1)
-                return -1;
-
-        ret = set_gpfs_lease(fsp->fh->fd,leasetype);
-
-        if ( ret < 0 ) {
+        if (linux_set_lease_sighandler(fsp->fh->fd) == -1)
+                return -1;
+
+        if (config->leases) {
+                ret = set_gpfs_lease(fsp->fh->fd,leasetype);
+        }
+
+        if (ret < 0) {
                 /* This must have come from GPFS not being available */
                 /* or some other error, hence call the default */
@@ -959 +984 @@
         struct gpfs_winattr attrs;
         int ret = 0;
+
 
         DEBUG(10, ("gpfs_get_xattr: %s \n",path));
@@ -995 +1021 @@
         }
 
-        snprintf(attrstr, size, "0x%x", dosmode & SAMBA_ATTRIBUTES_MASK);
+        result = snprintf(attrstr, size, "0x%x",
+                          dosmode & SAMBA_ATTRIBUTES_MASK) + 1;
+
         DEBUG(10, ("gpfs_get_xattr: returning %s\n",attrstr));
-        return size;
+        return ;
 }
 
@@ -1114 +1142 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 static struct vfs_fn_pointers vfs_gpfs_fns = {
+
         .kernel_flock = vfs_gpfs_kernel_flock,
         .linux_setlease = vfs_gpfs_setlease,
@@ -1135 +1207 @@
         .lstat = vfs_gpfs_lstat,
         .ntimes = vfs_gpfs_ntimes,
+
 };