diff options
| author | ChenXiaoSong <chenxiaosong@kylinos.cn> | 2026-08-04 18:42:05 -0500 |
|---|---|---|
| committer | Paulo Alcantara <pc@manguebit.org> | 2026-08-19 12:30:57 -0300 |
| commit | 77d852c76342ff4922f7fabef465cc5d012ab0a7 (patch) | |
| tree | d86305c1472c2fcb8a2e8a8a9ad638bf6d136e7f | |
| parent | 60be95527bc8d1b33dca25d2a849268cca11d139 (diff) | |
| download | linux-77d852c76342ff4922f7fabef465cc5d012ab0a7.tar.gz linux-77d852c76342ff4922f7fabef465cc5d012ab0a7.zip | |
smb/client: fix nlink of an overwritten open file
Reproducer:
1. server: systemctl start ksmbd
2. client: mount with `posix` option
mount -t cifs -o posix //${server_ip}/export /mnt
3. client: touch /mnt/file1 /mnt/file2
4. client: C program: int fd = open("/mnt/file2", O_RDONLY);
5. client: C program: rename("/mnt/file1", "/mnt/file2");
6. client: C program: struct stat stbuf; fstat(fd, &stbuf);
stbuf.st_nlink is 1, should be 0
This patch fixes xfstests generic/035 when mounted with `posix` option.
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Paulo Alcantara <pc@manguebit.org>
| -rw-r--r-- | fs/smb/client/inode.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c index ec1679ad4a87..3a0263df104b 100644 --- a/fs/smb/client/inode.c +++ b/fs/smb/client/inode.c @@ -2648,11 +2648,8 @@ unlink_target: if (d_really_is_positive(target_dentry)) { if (!rc) { struct inode *inode = d_inode(target_dentry); - /* - * Samba and ksmbd servers allow renaming a target - * directory that is open, so make sure to update - * ->i_nlink and then mark it as delete pending. - */ + + /* Update the target link count after rename. */ if (S_ISDIR(inode->i_mode)) { drop_cached_dir_by_name(xid, tcon, to_name, cifs_sb); spin_lock(&inode->i_lock); @@ -2663,6 +2660,10 @@ unlink_target: CIFS_I(inode)->time = 0; /* force reval */ inode_set_ctime_current(inode); inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); + } else { + cifs_mark_open_handles_for_deleted_file(inode, to_name); + cifs_drop_nlink(inode); + inode_set_ctime_current(inode); } } else if (rc == -EACCES || rc == -EEXIST) { /* |