[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  618af83 vfs_prealloc: Remove call to gpfs_prealloc
       via  627a98d lib: Fix a typo
      from  080ec0f s3: smbclient: Allinfo leaves the file handle open.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 618af83d1bd07b12a9acc88b0d2111cab7a8bb2b
Author: Christof Schmitt <cs at samba.org>
Date:   Tue Feb 10 13:36:17 2015 -0700

    vfs_prealloc: Remove call to gpfs_prealloc
    
    Calling gpfs_prealloc changes the actual size of the file, and this
    should not be done implicitly. Also this code does not compile due to
    the missing dependency to the gpfs library. The best way solution here
    is probably removing the call to gpfs_prealloc. The vfs_gpfs module
    already implements the call to gpfs_prelloc when this can be done
    safely.
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Feb 11 02:03:09 CET 2015 on sn-devel-104

commit 627a98d095f660fdb98e81c495a4395bf18094df
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 10 20:11:54 2015 +0000

    lib: Fix a typo
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/util_str.c         | 2 +-
 source3/modules/vfs_prealloc.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 3de64c6..a2d5997 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -910,7 +910,7 @@ uint64_t conv_str_size(const char * str)
 }
 
 /* Append an sprintf'ed string. Double buffer size on demand. Usable without
- * error checking in between. The indiation that something weird happened is
+ * error checking in between. The indication that something weird happened is
  * string==NULL */
 
 void sprintf_append(TALLOC_CTX *mem_ctx, char **string, ssize_t *len,
diff --git a/source3/modules/vfs_prealloc.c b/source3/modules/vfs_prealloc.c
index 4ba27a6..7b96d36 100644
--- a/source3/modules/vfs_prealloc.c
+++ b/source3/modules/vfs_prealloc.c
@@ -49,17 +49,12 @@
 #define lock_type struct flock64
 #endif
 
-#ifdef HAVE_GPFS
-#include "gpfs_gpl.h"
-#endif
-
 #define MODULE "prealloc"
 static int module_debug;
 
 static int preallocate_space(int fd, off_t size)
 {
 	int err;
-#ifndef HAVE_GPFS
 	lock_type fl = {0};
 
 	if (size <= 0) {
@@ -85,10 +80,6 @@ static int preallocate_space(int fd, off_t size)
 	err = -1;
 	errno = ENOSYS;
 #endif
-#else /* GPFS uses completely different interface */
-       err = gpfs_prealloc(fd, (gpfs_off64_t)0, (gpfs_off64_t)size);
-#endif
-
 	if (err) {
 		DEBUG(module_debug,
 			("%s: preallocate failed on fd=%d size=%lld: %s\n",


-- 
Samba Shared Repository