Skip to content

Commit 43a64bd

Browse files
dhowellstorvalds
authored andcommitted
cifs: Remove redundant setting of NETFS_SREQ_HIT_EOF
Fix an upstream merge resolution issue[1]. The NETFS_SREQ_HIT_EOF flag, and code to set it, got added via two different paths. The original path saw it added in the netfslib read improvements[2], but it was also added, and slightly differently, in a fix that was committed before v6.11: 1da29f2 netfs, cifs: Fix handling of short DIO read However, the code added to smb2_readv_callback() to set the flag in didn't get removed when the netfs read improvements series was rebased to take account of the cifs fixes. The proposed merge resolution[2] deleted it rather than rebase the patches. Fix this by removing the redundant lines. Code to set the bit that derives from the fix patch is still there, a few lines above in the source. Fixes: 35219bc ("Merge tag 'vfs-6.12.netfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs") Signed-off-by: David Howells <[email protected]> cc: Steve French <[email protected]> cc: Paulo Alcantara <[email protected]> cc: Christian Brauner <[email protected]> cc: Jeff Layton <[email protected]> cc: [email protected] cc: [email protected] cc: [email protected] Link: https://lore.kernel.org/r/CAHk-=wjr8fxk20-wx=63mZruW1LTvBvAKya1GQ1EhyzXb-okMA@mail.gmail.com/ [1] Link: https://lore.kernel.org/linux-fsdevel/20240913-vfs-netfs-39ef6f974061@brauner/ [2] Signed-off-by: Linus Torvalds <[email protected]>
1 parent dc1a456 commit 43a64bd

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

fs/smb/client/smb2pdu.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4614,8 +4614,6 @@ smb2_readv_callback(struct mid_q_entry *mid)
46144614
0, cifs_trace_rw_credits_read_response_clear);
46154615
rdata->credits.value = 0;
46164616
rdata->subreq.transferred += rdata->got_bytes;
4617-
if (rdata->subreq.start + rdata->subreq.transferred >= rdata->subreq.rreq->i_size)
4618-
__set_bit(NETFS_SREQ_HIT_EOF, &rdata->subreq.flags);
46194617
trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_progress);
46204618
INIT_WORK(&rdata->subreq.work, smb2_readv_worker);
46214619
queue_work(cifsiod_wq, &rdata->subreq.work);

0 commit comments

Comments
 (0)