Changeset 745 for trunk/server/source3/modules/gpfs.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/gpfs.c (modified) (6 diffs)

trunk/server/source3/modules/gpfs.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 #ifdef HAVE_GPFS
 
+#include "libcli/security/security.h"
 #include "gpfs_gpl.h"
 #include "vfs_gpfs.h"
@@ -39 +41 @@
 static int (*gpfs_get_winattrs_fn)(int fd, struct gpfs_winattr *attrs);
 static int (*gpfs_ftruncate_fn)(int fd, gpfs_off64_t length);
+static int (*gpfs_lib_init_fn)(int flags);
 
 bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
@@ -133 +136 @@
 }
 
-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);
+int smbd_gpfs_ftruncate(int fd, gpfs_off64_t length)
+{
+        if (!gpfs_do_ftruncate || (gpfs_ftruncate_fn == NULL)) {
+                errno = ENOSYS;
+                return -1;
+        }
+
+        return gpfs_ftruncate_fn(fd, length);
 }
 
@@ -186 +189 @@
         DEBUG(10, ("gpfs_set_winattrs_path:open call %s\n",pathname));
         return gpfs_set_winattrs_path_fn(pathname,flags, attrs);
+}
+
+void smbd_gpfs_lib_init()
+{
+        if (gpfs_lib_init_fn) {
+                int rc = gpfs_lib_init_fn(0);
+                DEBUG(10, ("gpfs_lib_init() finished with rc %d "
+                           "and errno %d\n", rc, errno));
+        } else {
+                DEBUG(10, ("libgpfs lacks gpfs_lib_init\n"));
+        }
 }
 
@@ -249 +263 @@
         init_gpfs_function(&gpfs_set_winattrs_path_fn,"gpfs_set_winattrs_path");
         init_gpfs_function(&gpfs_get_winattrs_fn,"gpfs_get_winattrs");
-        init_gpfs_function(&gpfs_ftruncate_fn,"gpfs_ftruncate");
+        init_gpfs_function(&gpfs_ftruncate_fn, "gpfs_ftruncate");
+        init_gpfs_function(&gpfs_lib_init_fn,"gpfs_lib_init");
 
         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);
 
@@ -311 +325 @@
 }
 
+void smbd_gpfs_lib_init()
+{
+        return;
+}
+
 void init_gpfs(void)
 {