Changeset 597 for vendor/current/source3/modules/gpfs.c

Timestamp:

Jul 2, 2011, 4:01:14 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.9

File:

• vendor/current/source3/modules/gpfs.c (modified) (6 diffs)

vendor/current/source3/modules/gpfs.c

@@ -25 +25 @@
 #include "vfs_gpfs.h"
 
-static bool gpfs_share_modes;
-static bool gpfs_leases;
 static bool gpfs_getrealfilename;
 static bool gpfs_winattr;
+static bool gpfs_do_ftruncate;
 
 static int (*gpfs_set_share_fn)(int fd, unsigned int allow, unsigned int deny);
@@ -39 +38 @@
 static int (*gpfs_get_winattrs_path_fn)(char *pathname, struct gpfs_winattr *attrs);
 static int (*gpfs_get_winattrs_fn)(int fd, struct gpfs_winattr *attrs);
-
+static int (*gpfs_ftruncate_fn)(int fd, gpfs_off64_t length);
 
 bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
@@ -47 +46 @@
         unsigned int deny = GPFS_DENY_NONE;
         int result;
-
-        if (!gpfs_share_modes) {
-                return True;
-        }
 
         if (gpfs_set_share_fn == NULL) {
@@ -97 +92 @@
         int gpfs_type = GPFS_LEASE_NONE;
 
-        if (!gpfs_leases) {
-                return True;
-        }
-
         if (gpfs_set_lease_fn == NULL) {
                 errno = EINVAL;
@@ -140 +131 @@
 
         return gpfs_putacl_fn(pathname, flags, acl);
+}
+
+int smbd_gpfs_ftrunctate(int fd, gpfs_off64_t length)
+{
+       if (!gpfs_do_ftruncate || (gpfs_ftruncate_fn == NULL)) {
+               errno = ENOSYS;
+               return -1;
+       }
+
+       return gpfs_ftruncate_fn(fd, length);
 }
 
@@ -248 +249 @@
         init_gpfs_function(&gpfs_set_winattrs_path_fn,"gpfs_set_winattrs_path");
         init_gpfs_function(&gpfs_get_winattrs_fn,"gpfs_get_winattrs");
-
-
-        gpfs_share_modes = lp_parm_bool(-1, "gpfs", "sharemodes", True);
-        gpfs_leases      = lp_parm_bool(-1, "gpfs", "leases", True);
+        init_gpfs_function(&gpfs_ftruncate_fn,"gpfs_ftruncate");
+
         gpfs_getrealfilename = lp_parm_bool(-1, "gpfs", "getrealfilename",
                                             True);
         gpfs_winattr = lp_parm_bool(-1, "gpfs", "winattr", False);
+
+        gpfs_do_ftruncate = lp_parm_bool(-1, "gpfs", "ftruncate", True);
 
         return;