Changeset 596 for trunk/server/source3/smbd/vfs.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/smbd/vfs.c (modified) (4 diffs)

trunk/server/source3/smbd/vfs.c

@@ -583 +583 @@
         }
 
+#ifdef S_ISFIFO
+        if (S_ISFIFO(st.st_ex_mode)) {
+                return 0;
+        }
+#endif
+
         DEBUG(10,("vfs_fill_sparse: write zeros in file %s from len %.0f to "
                   "len %.0f (%.0f bytes)\n", fsp_str_dbg(fsp),
@@ -591 +597 @@
 
         flush_write_cache(fsp, SIZECHANGE_FLUSH);
+
+
+        offset = st.st_ex_size;
+        num_to_write = len - st.st_ex_size;
+
+        /* Only do this on non-stream file handles. */
+        if (fsp->base_fsp == NULL) {
+                /* for allocation try posix_fallocate first. This can fail on some
+                 * platforms e.g. when the filesystem doesn't support it and no
+                 * emulation is being done by the libc (like on AIX with JFS1). In that
+                 * case we do our own emulation. posix_fallocate implementations can
+                 * return ENOTSUP or EINVAL in cases like that. */
+                ret = sys_posix_fallocate(fsp->fh->fd, offset, num_to_write);
+                if (ret == ENOSPC) {
+                        errno = ENOSPC;
+                        ret = -1;
+                        goto out;
+                }
+                if (ret == 0) {
+                        set_filelen_write_cache(fsp, len);
+                        goto out;
+                }
+
+                DEBUG(10,("vfs_fill_sparse: sys_posix_fallocate failed with "
+                        "error %d. Falling back to slow manual allocation\n", ret));
+        }
 
         if (!sparse_buf) {
@@ -601 +633 @@
         }
 
-        offset = st.st_ex_size;
-        num_to_write = len - st.st_ex_size;
         total = 0;
 
@@ -933 +963 @@
                         }
                         default:
-                                DEBUG(1,("check_reduced_name: couldn't get "
+                                DEBUG(3,("check_reduced_name: couldn't get "
                                          "realpath for %s\n", fname));
                                 return map_nt_error_from_unix(errno);