gpfs: Rename library wrapper to gpfswrap

The code in gpfs.c and vfs_gpfs.h now only wraps the gpfs library.
Rename the files to gpfswrap to make it clear that this is the only
purpose of that file.

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>

diff --git a/source3/modules/gpfs.c b/source3/modules/gpfswrap.c
similarity index 99%
rename from source3/modules/gpfs.c
rename to source3/modules/gpfswrap.c
index 05ff992680475d222796a2234420579cbd9d86e2..aac2f44405d0679364b2dc469b4f33c75a1e94e0 100644 (file)
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfswrap.c
@@ -19,7 +19,7 @@
  */
 
 #include "replace.h"
  */
 
 #include "replace.h"

-#include "vfs_gpfs.h"
+#include "gpfswrap.h"

 
 static int (*gpfs_set_share_fn)(int fd, unsigned int allow, unsigned int deny);
 static int (*gpfs_set_lease_fn)(int fd, unsigned int type);
 
 static int (*gpfs_set_share_fn)(int fd, unsigned int allow, unsigned int deny);
 static int (*gpfs_set_lease_fn)(int fd, unsigned int type);

diff --git a/source3/modules/vfs_gpfs.h b/source3/modules/gpfswrap.h
similarity index 100%
rename from source3/modules/vfs_gpfs.h
rename to source3/modules/gpfswrap.h

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index c8a5ee2707258febe622fc389181f5cd7638ada6..21707c5f6ccbb120ef17efd5af6cb1585cb90d1c 100644 (file)
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -27,10 +27,10 @@
 #include "modules/non_posix_acls.h"
 #include "libcli/security/security.h"
 #include "nfs4_acls.h"
 #include "modules/non_posix_acls.h"
 #include "libcli/security/security.h"
 #include "nfs4_acls.h"

-#include "vfs_gpfs.h"

 #include "system/filesys.h"
 #include "auth.h"
 #include "lib/util/tevent_unix.h"
 #include "system/filesys.h"
 #include "auth.h"
 #include "lib/util/tevent_unix.h"

+#include "gpfswrap.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS

diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 7fe66ecfef91f6eb8c1fe48d9e0235add64904ff..a4afcd7ed09c95654beeb79a23806db41c55d994 100644 (file)
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -275,7 +275,7 @@ bld.SAMBA3_MODULE('vfs_commit',
 
 bld.SAMBA3_MODULE('vfs_gpfs',
                  subsystem='vfs',
 
 bld.SAMBA3_MODULE('vfs_gpfs',
                  subsystem='vfs',

-                 source='vfs_gpfs.c gpfs.c',
+                 source='vfs_gpfs.c gpfswrap.c',

                  deps='NFS4_ACLS non_posix_acls',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'),
                  deps='NFS4_ACLS non_posix_acls',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'),