[PATCH v1 2/2] smb: client: fix busy dentry on unmount from persistent handle reopen
From: Siddharth Chintamaneni
Date: Mon Nov 16 2026 - 19:17:55 EST
During unmount, cifs_kill_sb() waits on cifs_sb->outstanding_rreq for
in-flight netfs I/O requests and oplock breaks to complete before
flushing serverclose_wq and fileinfo_put_wq.
While cifs_kill_sb() is waiting on outstanding_rreq, any cifsFileInfo
referenced by an in-flight request (req->cfile) remains on
tcon->openFileList. On a mount using persistent handles, if a reconnect
runs on cifsiod_wq during this window, smb2_reconnect_server() calls
cifs_reopen_persistent_handles(), which walks tcon->openFileList and
takes a new reference on open_file via cifsFileInfo_get() to reopen the
handle over the network:
Thread 1 (umount) Thread 2 (cifsiod_wq) Thread 3 (workers)
----------------- --------------------- ------------------
cifs_kill_sb()
wait(outstanding_rreq)
[blocks: rreq == 1]
smb2_reconnect_server()
cifs_reopen_persistent_handles()
finds open_file on list
cifsFileInfo_get(open_file)
[cfile->count: 1 -> 2]
cifs_reopen_file()
cifs_free_request()
cifsFileInfo_put()
[cfile->count: 2 -> 1]
dec(outstanding_rreq)
[wakes: rreq == 0]
flush(serverclose_wq)
flush(fileinfo_put_wq)
kill_anon_super(sb)
-> generic_shutdown_super()
BUG: Dentry still in use (1)
VFS: Busy inodes after unmount!
Fix this by incrementing cifs_sb->outstanding_rreq when
cifs_reopen_persistent_handles() takes a reference on open_file and
decrementing it after cifsFileInfo_put(open_file), so wait_var_event()
in cifs_kill_sb() waits for any in-progress persistent handle reopen to
finish and queue its final put before draining fileinfo_put_wq.
Fixes: 340cea84f691 ("cifs: open files should not hold ref on superblock")
Reported-by: Adam Kim <adamkim@xxxxxxxxxxxxx>
Signed-off-by: Siddharth Chintamaneni <sidchintamaneni@xxxxxxxxx>
---
fs/smb/client/file.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 146ff2adfa244..e0b56c6c2c743 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -2044,6 +2044,7 @@ bool
cifs_reopen_persistent_handles(struct cifs_tcon *tcon)
{
struct cifsFileInfo *open_file, *tmp;
+ struct cifs_sb_info *cifs_sb;
LIST_HEAD(tmp_list);
bool retry = false;
int rc;
@@ -2060,12 +2061,16 @@ cifs_reopen_persistent_handles(struct cifs_tcon *tcon)
list_for_each_entry(open_file, &tcon->openFileList, tlist) {
if (!open_file->invalidHandle)
continue;
+ cifs_sb = CIFS_SB(d_inode(open_file->dentry)->i_sb);
cifsFileInfo_get(open_file);
+ atomic_inc(&cifs_sb->outstanding_rreq);
list_add_tail(&open_file->rlist, &tmp_list);
}
spin_unlock(&tcon->open_file_lock);
list_for_each_entry_safe(open_file, tmp, &tmp_list, rlist) {
+ cifs_sb = CIFS_SB(d_inode(open_file->dentry)->i_sb);
+
/* do not flush */
rc = cifs_reopen_file(open_file, false,
CIFS_REOPEN_BOUND | CIFS_REOPEN_NOWAIT);
@@ -2075,6 +2080,8 @@ cifs_reopen_persistent_handles(struct cifs_tcon *tcon)
}
list_del_init(&open_file->rlist);
cifsFileInfo_put(open_file);
+ if (atomic_dec_and_test(&cifs_sb->outstanding_rreq))
+ wake_up_var(&cifs_sb->outstanding_rreq);
}
return retry;
}
--
2.43.0