[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  c709328 vfs:gpfs: fix a debug message
       via  9f6c4c4 vfs: update a bit-rotten comment
       via  ddb7d7f vfs: remove unused function vfs_pread_data()
      from  5c87425 man vfs_streams_xattr: new options "prefix" and "store_stream_type"

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


- Log -----------------------------------------------------------------
commit c70932827812cf3b3fc8323e11abf4c98f15ddec
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 13 12:05:05 2014 +0200

    vfs:gpfs: fix a debug message
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Jun 13 19:54:23 CEST 2014 on sn-devel-104

commit 9f6c4c4da20df633b28c1f3047e62c0daa6f6931
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 13 11:46:25 2014 +0200

    vfs: update a bit-rotten comment
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit ddb7d7fc940835e04a5d909790f99cee5c74084d
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jun 13 11:39:41 2014 +0200

    vfs: remove unused function vfs_pread_data()
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 source3/include/vfs_macros.h |   11 ++++++-----
 source3/modules/gpfs.c       |    2 +-
 source3/smbd/proto.h         |    2 --
 source3/smbd/vfs.c           |   22 ----------------------
 4 files changed, 7 insertions(+), 30 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 704054d..0f44c62 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -21,11 +21,12 @@
 #ifndef _VFS_MACROS_H
 #define _VFS_MACROS_H
 
-/*******************************************************************
- Don't access conn->vfs.ops.* directly!!!
- Use this macros!
- (Fixes should go also into the vfs_opaque_* and vfs_next_* macros!)
-********************************************************************/
+/*
+ * These macros SMB_VFS_<FOO> (and SMB_VFS_NEXT_<FOO>) are our
+ * interface for the VFS.
+ *
+ * Don't access conn->vfs_handles[->next]->fns->* directly!
+ */
 
 /* Disk operations */
 #define SMB_VFS_CONNECT(conn, service, user) \
diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index 6250286..53418f0 100644
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -177,7 +177,7 @@ int smbd_fget_gpfs_winattrs(int fd, struct gpfs_winattr *attrs)
                 errno = ENOSYS;
                 return -1;
         }
-        DEBUG(10, ("gpfs_get_winattrs_path:open call %d\n", fd));
+        DEBUG(10, ("gpfs_get_winattrs:open call %d\n", fd));
         return gpfs_get_winattrs_fn(fd, attrs);
 }
 
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 3c6accf..1e17f5b 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1129,8 +1129,6 @@ bool vfs_init_custom(connection_struct *conn, const char *vfs_object);
 bool smbd_vfs_init(connection_struct *conn);
 NTSTATUS vfs_file_exist(connection_struct *conn, struct smb_filename *smb_fname);
 ssize_t vfs_read_data(files_struct *fsp, char *buf, size_t byte_count);
-ssize_t vfs_pread_data(files_struct *fsp, char *buf,
-                size_t byte_count, off_t offset);
 ssize_t vfs_write_data(struct smb_request *req,
 			files_struct *fsp,
 			const char *buffer,
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 897bf1f..d5390ed 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -393,28 +393,6 @@ ssize_t vfs_read_data(files_struct *fsp, char *buf, size_t byte_count)
 	return (ssize_t)total;
 }
 
-ssize_t vfs_pread_data(files_struct *fsp, char *buf,
-                size_t byte_count, off_t offset)
-{
-	size_t total=0;
-
-	while (total < byte_count)
-	{
-		ssize_t ret = SMB_VFS_PREAD(fsp, buf + total,
-					byte_count - total, offset + total);
-
-		if (ret == 0) return total;
-		if (ret == -1) {
-			if (errno == EINTR)
-				continue;
-			else
-				return -1;
-		}
-		total += ret;
-	}
-	return (ssize_t)total;
-}
-
 /****************************************************************************
  Write data to a fd on the vfs.
 ****************************************************************************/


-- 
Samba Shared Repository