diff mbox series

Fix setting EOF

Message ID ZA8/B2wzQP8mEtRn@sernet.de
State New
Headers show
Series Fix setting EOF | expand

Commit Message

Volker Lendecke March 13, 2023, 3:19 p.m. UTC 
Hi!

b6f2a0f89d7ed introduced looking for a writable path. This patch
should probably have gone with it.

Volker

Comments

Volker Lendecke March 13, 2023, 3:24 p.m. UTC | #1 
Am Mon, Mar 13, 2023 at 04:19:35PM +0100 schrieb Volker Lendecke:
> b6f2a0f89d7ed introduced looking for a writable path. This patch
> should probably have gone with it.

Skip that, patch is incomplete. Will submit a fixed one v soon.

Volker
Volker Lendecke March 13, 2023, 3:28 p.m. UTC | #2 
Am Mon, Mar 13, 2023 at 04:24:57PM +0100 schrieb Volker Lendecke:
> Am Mon, Mar 13, 2023 at 04:19:35PM +0100 schrieb Volker Lendecke:
> > b6f2a0f89d7ed introduced looking for a writable path. This patch
> > should probably have gone with it.
> 
> Skip that, patch is incomplete. Will submit a fixed one v soon.

Here's the updated version.

Sorry for the noise,

Volker
Volker Lendecke March 13, 2023, 3:42 p.m. UTC | #3 
Am Mon, Mar 13, 2023 at 04:28:37PM +0100 schrieb Volker Lendecke:
> Here's the updated version.
> 
> Sorry for the noise,

It's not my day today, V3....

Volker
Paulo Alcantara March 14, 2023, 3:16 p.m. UTC | #4 
Volker Lendecke <Volker.Lendecke@sernet.de> writes:

> Am Mon, Mar 13, 2023 at 04:28:37PM +0100 schrieb Volker Lendecke:
> From 41e6250b60b5ba3d262b50f97e8b01df67ccecc4 Mon Sep 17 00:00:00 2001
> From: Volker Lendecke <vl@samba.org>
> Date: Mon, 13 Mar 2023 16:09:54 +0100
> Subject: [PATCH] cifs: Fix smb2_set_path_size()
>
> If cifs_get_writable_path() finds a writable file, smb2_compound_op()
> must use that file's FID and not the COMPOUND_FID.
>
> Signed-off-by: Volker Lendecke <vl@samba.org>
> ---
>  fs/cifs/smb2inode.c | 31 ++++++++++++++++++++++++-------
>  1 file changed, 24 insertions(+), 7 deletions(-)

Looks good.  Thanks!

Reviewed-by: Paulo Alcantara (SUSE) <pc@manguebit.com>
Steve French March 14, 2023, 7:44 p.m. UTC | #5 
merged into cifs-2.6 for-next and added Cc:stable (and RB from Paulo).

On Mon, Mar 13, 2023 at 10:47 AM Volker Lendecke
<Volker.Lendecke@sernet.de> wrote:
>
> Am Mon, Mar 13, 2023 at 04:28:37PM +0100 schrieb Volker Lendecke:
> > Here's the updated version.
> >
> > Sorry for the noise,
>
> It's not my day today, V3....
>
> Volker
diff mbox series

Patch

From 4b72cd033b5ad1143b11305b07c9fab5c9b610ca Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 13 Mar 2023 16:09:54 +0100
Subject: [PATCH] cifs: Fix smb2_set_path_size()

If cifs_get_writable_path() finds a writable file, smb2_compound_op()
must use that file's FID and not the COMPOUND_FID.

Signed-off-by: Volker Lendecke <vl@samba.org>
---
 fs/cifs/smb2inode.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index 9b956294e864..63541ad1bab2 100644
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -234,11 +234,29 @@  static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
 		size[0] = 8; /* sizeof __le64 */
 		data[0] = ptr;
 
-		rc = SMB2_set_info_init(tcon, server,
-					&rqst[num_rqst], COMPOUND_FID,
-					COMPOUND_FID, current->tgid,
-					FILE_END_OF_FILE_INFORMATION,
-					SMB2_O_INFO_FILE, 0, data, size);
+		if (cfile) {
+			rc = SMB2_set_info_init(tcon, server,
+						&rqst[num_rqst],
+						cfile->fid.persistent_fid,
+						cfile->fid.volatile_fid,
+						current->tgid,
+						FILE_END_OF_FILE_INFORMATION,
+						SMB2_O_INFO_FILE, 0,
+						data, size);
+		} else {
+			rc = SMB2_set_info_init(tcon, server,
+						&rqst[num_rqst],
+						COMPOUND_FID,
+						COMPOUND_FID,
+						current->tgid,
+						FILE_END_OF_FILE_INFORMATION,
+						SMB2_O_INFO_FILE, 0,
+						data, size);
+			if (!rc) {
+				smb2_set_next_command(tcon, &rqst[num_rqst]);
+				smb2_set_related(&rqst[num_rqst]);
+			}
+		}
 		if (rc)
 			goto finished;
 		smb2_set_next_command(tcon, &rqst[num_rqst]);
-- 
2.30.2