From: Christian Ambach <ambi@samba.org>
Date: Thu, 24 Nov 2011 15:57:58 +0000 (+0100)
Subject: s3:vfs:gpfs remove non-working code
X-Git-Tag: ldb-1.1.4~170
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=94229435e80ecc5c0158c59e0ab3976b98668238;p=ira%2Fwip.git

s3:vfs:gpfs remove non-working code

when development of vfs_gpfs was started a long time ago it was
considered a good idea to have it compileable even if GPFS is not
around and then the module would complain in the logs that libgpfs
is not there

Nowadays this does not work any more as the code contains GPFS
specific types that need the GPFS header files.

Instead of making it compile again by adding GPFS typedefs, this
removes the whole approach. Other VFS modules also do not even
compile when necessary headers are not around, so do the same for
the GPFS module code.
---

diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index 5b0d7d04abd..d73b94b75fb 100644
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -21,8 +21,6 @@
 #include "system/filesys.h"
 #include "smbd/smbd.h"
 
-#ifdef HAVE_GPFS
-
 #include "libcli/security/security.h"
 #include "gpfs_gpl.h"
 #include "vfs_gpfs.h"
@@ -273,66 +271,3 @@ void init_gpfs(void)
 
 	return;
 }
-
-#else
-
-int set_gpfs_lease(int snum, int leasetype)
-{
-	DEBUG(0, ("'VFS module smbgpfs loaded, without gpfs support compiled\n"));
-
-	/* We need to indicate that no GPFS is around by returning ENOSYS, so
-	 * that the normal linux kernel oplock code is called. */
-	errno = ENOSYS;
-	return -1;
-}
-
-bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
-			uint32 share_access)
-{
-	DEBUG(0, ("VFS module - smbgpfs.so loaded, without gpfs support compiled\n"));
-	/* Don't disturb but complain */
-	return True;
-}
-
-int smbd_gpfs_getacl(char *pathname, int flags, void *acl)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-int smbd_gpfs_putacl(char *pathname, int flags, void *acl)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-int smbd_gpfs_get_realfilename_path(char *pathname, char *fileamep,
-				    int *buflen)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-int set_gpfs_winattrs(char *pathname,int flags,struct gpfs_winattr *attrs)
-{
-        errno = ENOSYS;
-        return -1;
-}
-
-int get_gpfs_winattrs(char *pathname,struct gpfs_winattr *attrs)
-{
-        errno = ENOSYS;
-        return -1;
-}
-
-void smbd_gpfs_lib_init()
-{
-	return;
-}
-
-void init_gpfs(void)
-{
-	return;
-}
-
-#endif /* HAVE_GPFS */