Changeset 745 for trunk/server/source3/modules/vfs_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/vfs_gpfs.c (modified) (20 diffs)

trunk/server/source3/modules/vfs_gpfs.c

@@ -23 +23 @@
 
 #include "includes.h"
+
+
+
 
 #undef DBGC_CLASS
@@ -30 +33 @@
 #include "nfs4_acls.h"
 #include "vfs_gpfs.h"
+
 
 struct gpfs_config_data {
         bool sharemodes;
         bool leases;
+
 };
 
@@ -117 +122 @@
         char real_pathname[PATH_MAX+1];
         int buflen;
+
+
+
+
+
+
+
 
         full_path = talloc_asprintf(talloc_tos(), "%s/%s", path, name);
@@ -323 +335 @@
 static NTSTATUS gpfsacl_fget_nt_acl(vfs_handle_struct *handle,
         files_struct *fsp, uint32 security_info,
-        SEC_DESC **ppdesc)
+         **ppdesc)
 {
         SMB4ACL_T *pacl = NULL;
@@ -345 +357 @@
 static NTSTATUS gpfsacl_get_nt_acl(vfs_handle_struct *handle,
         const char *name,
-        uint32 security_info, SEC_DESC **ppdesc)
+        uint32 security_info,  **ppdesc)
 {
         SMB4ACL_T *pacl = NULL;
@@ -461 +473 @@
 }
 
-static NTSTATUS gpfsacl_set_nt_acl_internal(files_struct *fsp, uint32 security_info_sent, const SEC_DESC *psd)
+static NTSTATUS gpfsacl_set_nt_acl_internal(files_struct *fsp, uint32 security_info_sent, const  *psd)
 {
         struct gpfs_acl *acl;
@@ -489 +501 @@
 }
 
-static NTSTATUS gpfsacl_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const SEC_DESC *psd)
+static NTSTATUS gpfsacl_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const  *psd)
 {
         return gpfsacl_set_nt_acl_internal(fsp, security_info_sent, psd);
@@ -927 +939 @@
 static int gpfs_set_xattr(struct vfs_handle_struct *handle,  const char *path,
                            const char *name, const void *value, size_t size,  int flags){
+
+
+
         const char *attrstr = value;
         unsigned int dosmode=0;
@@ -940 +955 @@
         }
 
-        if (size < 2 || attrstr[0] != '0' || attrstr[1] != 'x' ||
-                                sscanf(attrstr, "%x", &dosmode) != 1) {
-                        DEBUG(1,("gpfs_set_xattr: Trying to set badly formed DOSATTRIB on file %s - %s\n", path, attrstr));
-                return False;
-        }
+        blob.data = (uint8_t *)attrstr;
+        blob.length = size;
+
+        ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &dosattrib,
+                        (ndr_pull_flags_fn_t)ndr_pull_xattr_DOSATTRIB);
+
+        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                DEBUG(1, ("gpfs_set_xattr: bad ndr decode "
+                          "from EA on file %s: Error = %s\n",
+                          path, ndr_errstr(ndr_err)));
+                return false;
+        }
+
+        if (dosattrib.version != 3) {
+                DEBUG(1, ("gpfs_set_xattr: expected dosattrib version 3, got "
+                          "%d\n", (int)dosattrib.version));
+                return false;
+        }
+        if (!(dosattrib.info.info3.valid_flags & XATTR_DOSINFO_ATTRIB)) {
+                DEBUG(10, ("gpfs_set_xattr: XATTR_DOSINFO_ATTRIB not "
+                           "valid, ignoring\n"));
+                return true;
+        }
+
+        dosmode = dosattrib.info.info3.attrib;
 
         attrs.winAttrs = 0;
-        /*Just map RD_ONLY, ARCHIVE, SYSTEM and HIDDEN. Ignore the others*/
+        /*Just map RD_ONLY, ARCHIVE, SYSTEM . Ignore the others*/
         if (dosmode & FILE_ATTRIBUTE_ARCHIVE){
                 attrs.winAttrs |= GPFS_WINATTR_ARCHIVE;
@@ -960 +995 @@
                         attrs.winAttrs |= GPFS_WINATTR_READONLY;
         }
+
+
+
 
 
@@ -984 +1022 @@
         struct gpfs_winattr attrs;
         int ret = 0;
-        ssize_t result;
 
         DEBUG(10, ("gpfs_get_xattr: %s \n",path));
@@ -1001 +1038 @@
                 }
 
-                DEBUG(1, ("gpfs_get_xattr: Get GPFS attributes failed: %d\n",ret));
+                DEBUG(1, ("gpfs_get_xattr: Get GPFS attributes failed: "
+                          "%d (%s)\n", ret, strerror(errno)));
                 return -1;
         }
@@ -1007 +1045 @@
         DEBUG(10, ("gpfs_get_xattr:Got attributes: 0x%x\n",attrs.winAttrs));
 
-        /*Just map RD_ONLY, ARCHIVE, SYSTEM and HIDDEN. Ignore the others*/
+        /*Just map RD_ONLY, ARCHIVE, SYSTEM. Ignore the others*/
         if (attrs.winAttrs & GPFS_WINATTR_ARCHIVE){
                 dosmode |= FILE_ATTRIBUTE_ARCHIVE;
@@ -1020 +1058 @@
                 dosmode |= FILE_ATTRIBUTE_READONLY;
         }
-
-        result = snprintf(attrstr, size, "0x%x",
-                          dosmode & SAMBA_ATTRIBUTES_MASK) + 1;
-
+        if (attrs.winAttrs & GPFS_WINATTR_SPARSE_FILE) {
+                dosmode |= FILE_ATTRIBUTE_SPARSE;
+        }
+
+        snprintf(attrstr, size, "0x%2.2x",
+                 (unsigned int)(dosmode & SAMBA_ATTRIBUTES_MASK));
         DEBUG(10, ("gpfs_get_xattr: returning %s\n",attrstr));
-        return result;
+        return ;
 }
 
@@ -1050 +1090 @@
                 smb_fname->st.st_ex_btime.tv_sec = attrs.creationTime.tv_sec;
                 smb_fname->st.st_ex_btime.tv_nsec = attrs.creationTime.tv_nsec;
+
         }
         return 0;
@@ -1097 +1138 @@
                 smb_fname->st.st_ex_btime.tv_sec = attrs.creationTime.tv_sec;
                 smb_fname->st.st_ex_btime.tv_nsec = attrs.creationTime.tv_nsec;
+
         }
         return 0;
@@ -1142 +1184 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 int vfs_gpfs_connect(struct vfs_handle_struct *handle, const char *service,
                         const char *user)
 {
         struct gpfs_config_data *config;
+
+
+
         int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
 
@@ -1164 +1273 @@
                                         "leases", true);
 
+
+
+
         SMB_VFS_HANDLE_SET_DATA(handle, config,
                                 NULL, struct gpfs_config_data,
@@ -1171 +1283 @@
 }
 
-
-static int vfs_gpfs_ftruncate(struct vfs_handle_struct *handle,
-                              struct files_struct *fsp,
-                              SMB_OFF_T len)
-{
-       int result;
-
-       result = smbd_gpfs_ftrunctate(fsp->fh->fd, len);
-       if ((result == -1) && (errno == ENOSYS)) {
-               return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, len);
-       }
-       return result;
-}
+static uint32_t vfs_gpfs_capabilities(struct vfs_handle_struct *handle,
+                                      enum timestamp_set_resolution *p_ts_res)
+{
+        struct gpfs_config_data *config;
+        uint32_t next;
+
+        next = SMB_VFS_NEXT_FS_CAPABILITIES(handle, p_ts_res);
+
+        SMB_VFS_HANDLE_GET_DATA(handle, config,
+                                struct gpfs_config_data,
+                                return next);
+
+        if (config->hsm) {
+                next |= FILE_SUPPORTS_REMOTE_STORAGE;
+        }
+        return next;
+}
+
+static int vfs_gpfs_open(struct vfs_handle_struct *handle,
+                         struct smb_filename *smb_fname, files_struct *fsp,
+                         int flags, mode_t mode)
+{
+        if (lp_parm_bool(fsp->conn->params->service, "gpfs", "syncio",
+                         false)) {
+                flags |= O_SYNC;
+        }
+        return SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode);
+}
+
 
 static struct vfs_fn_pointers vfs_gpfs_fns = {
         .connect_fn = vfs_gpfs_connect,
+
         .kernel_flock = vfs_gpfs_kernel_flock,
         .linux_setlease = vfs_gpfs_setlease,
@@ -1207 +1336 @@
         .lstat = vfs_gpfs_lstat,
         .ntimes = vfs_gpfs_ntimes,
-        .ftruncate = vfs_gpfs_ftruncate,
+        .is_offline = vfs_gpfs_is_offline,
+        .aio_force = vfs_gpfs_aio_force,
+        .sendfile = vfs_gpfs_sendfile,
+        .open_fn = vfs_gpfs_open,
+        .ftruncate = vfs_gpfs_ftruncate
 };