Changeset 228 for branches/samba-3.2.x/source/modules/vfs_streams_xattr.c

Timestamp:

May 26, 2009, 9:44:50 AM (17 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/modules/vfs_streams_xattr.c (modified) (19 diffs)

branches/samba-3.2.x/source/modules/vfs_streams_xattr.c

@@ -30 +30 @@
         char *base;
         char *xattr_name;
+
+
+
 };
 
@@ -65 +68 @@
 }
 
-static ssize_t get_xattr_size(connection_struct *conn, const char *fname,
-                              const char *xattr_name)
+static ssize_t get_xattr_size(connection_struct *conn,
+                                files_struct *fsp,
+                                const char *fname,
+                                const char *xattr_name)
 {
         NTSTATUS status;
@@ -72 +77 @@
         ssize_t result;
 
-        status = get_ea_value(talloc_tos(), conn, NULL, fname,
+        status = get_ea_value(talloc_tos(), conn, , fname,
                               xattr_name, &ea);
 
@@ -84 +89 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp,
@@ -93 +141 @@
         DEBUG(10, ("streams_xattr_fstat called for %d\n", fsp->fh->fd));
 
-        if (io == NULL) {
+        if (io == NULL) {
                 return SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf);
         }
 
-        if (SMB_VFS_NEXT_FSTAT(handle, fsp, sbuf) == -1) {
-                return -1;
-        }
-
-        sbuf->st_size = get_xattr_size(handle->conn, io->base, io->xattr_name);
+        if (!streams_xattr_recheck(io)) {
+                return -1;
+        }
+
+        if (SMB_VFS_STAT(handle->conn, io->base, sbuf) == -1) {
+                return -1;
+        }
+
+        sbuf->st_size = get_xattr_size(handle->conn, fsp->base_fsp,
+                                        io->base, io->xattr_name);
         if (sbuf->st_size == -1) {
                 return -1;
@@ -134 +187 @@
         }
 
+
+
+
+
         if (SMB_VFS_STAT(handle->conn, base, sbuf) == -1) {
                 goto fail;
@@ -145 +202 @@
         }
 
-        sbuf->st_size = get_xattr_size(handle->conn, base, xattr_name);
+        sbuf->st_size = get_xattr_size(handle->conn, base, xattr_name);
         if (sbuf->st_size == -1) {
                 errno = ENOENT;
@@ -181 +238 @@
         }
 
+
+
+
+
         if (SMB_VFS_LSTAT(handle->conn, base, sbuf) == -1) {
                 goto fail;
@@ -192 +253 @@
         }
 
-        sbuf->st_size = get_xattr_size(handle->conn, base, xattr_name);
+        sbuf->st_size = get_xattr_size(handle->conn, base, xattr_name);
         if (sbuf->st_size == -1) {
                 errno = ENOENT;
@@ -235 +296 @@
                 errno = EINVAL;
                 goto fail;
+
+
+
+
+
+
         }
 
@@ -301 +368 @@
                                    xattr_name, base));
 
-                        if (SMB_VFS_SETXATTR(
-                                handle->conn, base, xattr_name,
-                                &null, sizeof(null),
-                                flags & O_EXCL ? XATTR_CREATE : 0) == -1) {
+                        if (fsp->base_fsp->fh->fd != -1) {
+                                if (SMB_VFS_FSETXATTR(
+                                        fsp->base_fsp, xattr_name,
+                                        &null, sizeof(null),
+                                        flags & O_EXCL ? XATTR_CREATE : 0) == -1) {
+                                        goto fail;
+                                }
+                        } else {
+                                if (SMB_VFS_SETXATTR(
+                                        handle->conn, base, xattr_name,
+                                        &null, sizeof(null),
+                                        flags & O_EXCL ? XATTR_CREATE : 0) == -1) {
+                                        goto fail;
+                                }
+                        }
+                }
+        }
+
+        if (flags & O_TRUNC) {
+                char null = '\0';
+                if (fsp->base_fsp->fh->fd != -1) {
+                        if (SMB_VFS_FSETXATTR(
+                                        fsp->base_fsp, xattr_name,
+                                        &null, sizeof(null),
+                                        flags & O_EXCL ? XATTR_CREATE : 0) == -1) {
                                 goto fail;
                         }
-                }
-        }
-
-        if (flags & O_TRUNC) {
-                char null = '\0';
-                if (SMB_VFS_SETXATTR(
-                            handle->conn, base, xattr_name,
-                            &null, sizeof(null),
-                            flags & O_EXCL ? XATTR_CREATE : 0) == -1) {
-                        goto fail;
+                } else {
+                        if (SMB_VFS_SETXATTR(
+                                        handle->conn, base, xattr_name,
+                                        &null, sizeof(null),
+                                        flags & O_EXCL ? XATTR_CREATE : 0) == -1) {
+                                goto fail;
+                        }
                 }
         }
@@ -331 +416 @@
         sio->base = talloc_strdup(VFS_MEMCTX_FSP_EXTENSION(handle, fsp),
                                   base);
+
+
+
 
         if ((sio->xattr_name == NULL) || (sio->base == NULL)) {
@@ -371 +459 @@
         }
 
+
+
+
+
         xattr_name = talloc_asprintf(talloc_tos(), "%s%s",
                                      SAMBA_XATTR_DOSSTREAM_PREFIX, sname);
@@ -390 +482 @@
         TALLOC_FREE(base);
         TALLOC_FREE(sname);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         return ret;
 }
@@ -578 +791 @@
         if (sio == NULL) {
                 return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
+
+
+
+
         }
 
@@ -604 +821 @@
         memcpy(ea.value.data + offset, data, n);
 
-        ret = SMB_VFS_SETXATTR(fsp->conn, fsp->base_fsp->fsp_name,
+        if (fsp->base_fsp->fh->fd != -1) {
+                ret = SMB_VFS_FSETXATTR(fsp->base_fsp,
                                 sio->xattr_name,
                                 ea.value.data, ea.value.length, 0);
-
+        } else {
+                ret = SMB_VFS_SETXATTR(fsp->conn, fsp->base_fsp->fsp_name,
+                                sio->xattr_name,
+                                ea.value.data, ea.value.length, 0);
+        }
         TALLOC_FREE(ea.value.data);
 
@@ -625 +847 @@
         struct ea_struct ea;
         NTSTATUS status;
-        size_t length, overlap;
+size_t length, overlap;
 
         if (sio == NULL) {
                 return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
+
+
+
+
         }
 
@@ -650 +876 @@
         TALLOC_FREE(ea.value.data);
         return overlap;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -673 +966 @@
         {SMB_VFS_OP(streams_xattr_unlink), SMB_VFS_OP_UNLINK,
          SMB_VFS_LAYER_TRANSPARENT},
+
+
+
+
         {SMB_VFS_OP(streams_xattr_streaminfo), SMB_VFS_OP_STREAMINFO,
          SMB_VFS_LAYER_OPAQUE},