Attachment 2810 Details for Bug 4779 – Correct patch.

[patch] Correct patch.

look (text/plain), 1.44 KB, created by Jeremy Allison on 2007-07-11 21:01:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2007-07-11 21:01:52 UTC

Size: 1.44 KB

patch

obsolete

>Index: smbd/trans2.c
>===================================================================
>--- smbd/trans2.c	(revision 23844)
>+++ smbd/trans2.c	(working copy)
>@@ -4845,18 +4845,21 @@
> 		allocation_size = smb_roundup(conn, allocation_size);
> 	}
> 
>-	if(allocation_size == get_file_size(*psbuf)) {
>-		return NT_STATUS_OK;
>-	}
>- 
> 	DEBUG(10,("smb_set_file_allocation_info: file %s : setting new allocation size to %.0f\n",
> 			fname, (double)allocation_size ));
>- 
>+
> 	if (fsp && fsp->fh->fd != -1) {
> 		/* Open file handle. */
> 		if (vfs_allocate_file_space(fsp, allocation_size) == -1) {
> 			return map_nt_error_from_unix(errno);
> 		}
>+		if (null_timespec(fsp->pending_modtime)) {
>+			/*
>+			 * This is equivalent to a write. Ensure it's seen immediately
>+			 * if there are no pending writes.
>+			 */
>+			set_filetime(fsp->conn, fsp->fsp_name, timespec_current());
>+		}
> 		return NT_STATUS_OK;
> 	}
> 
>@@ -4870,11 +4873,18 @@
> 				FILE_ATTRIBUTE_NORMAL,
> 				FORCE_OPLOCK_BREAK_TO_NONE,
> 				NULL, &new_fsp);
>- 
>+
> 	if (!NT_STATUS_IS_OK(status)) {
> 		/* NB. We check for open_was_deferred in the caller. */
> 		return status;
> 	}
>+
>+	/* Changing the allocation size should set the last mod time. */
>+	/* Don't need to call set_filetime as this will be flushed on
>+	 * close. */
>+
>+	fsp_set_pending_modtime(new_fsp, timespec_current());
>+
> 	if (vfs_allocate_file_space(new_fsp, allocation_size) == -1) {
> 		status = map_nt_error_from_unix(errno);
> 		close_file(new_fsp,NORMAL_CLOSE);

Actions: View

Attachments on bug 4779: 2809 | 2810