Skip to content

Commit a218274

Browse files
darkrain42smfrench
authored andcommitted
smb: Log an error when close_all_cached_dirs fails
Under low-memory conditions, close_all_cached_dirs() can't move the dentries to a separate list to dput() them once the locks are dropped. This will result in a "Dentry still in use" error, so add an error message that makes it clear this is what happened: [ 495.281119] CIFS: VFS: \\otters.example.com\share Out of memory while dropping dentries [ 495.281595] ------------[ cut here ]------------ [ 495.281887] BUG: Dentry ffff888115531138{i=78,n=/} still in use (2) [unmount of cifs cifs] [ 495.282391] WARNING: CPU: 1 PID: 2329 at fs/dcache.c:1536 umount_check+0xc8/0xf0 Also, bail out of looping through all tcons as soon as a single allocation fails, since we're already in trouble, and kmalloc() attempts for subseqeuent tcons are likely to fail just like the first one did. Signed-off-by: Paul Aurich <[email protected]> Acked-by: Bharath SM <[email protected]> Suggested-by: Ruben Devos <[email protected]> Cc: [email protected] Signed-off-by: Steve French <[email protected]>
1 parent 2c4fd3d commit a218274

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

fs/smb/client/cached_dir.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,17 @@ void close_all_cached_dirs(struct cifs_sb_info *cifs_sb)
509509
spin_lock(&cfids->cfid_list_lock);
510510
list_for_each_entry(cfid, &cfids->entries, entry) {
511511
tmp_list = kmalloc(sizeof(*tmp_list), GFP_ATOMIC);
512-
if (tmp_list == NULL)
513-
break;
512+
if (tmp_list == NULL) {
513+
/*
514+
* If the malloc() fails, we won't drop all
515+
* dentries, and unmounting is likely to trigger
516+
* a 'Dentry still in use' error.
517+
*/
518+
cifs_tcon_dbg(VFS, "Out of memory while dropping dentries\n");
519+
spin_unlock(&cfids->cfid_list_lock);
520+
spin_unlock(&cifs_sb->tlink_tree_lock);
521+
goto done;
522+
}
514523
spin_lock(&cfid->fid_lock);
515524
tmp_list->dentry = cfid->dentry;
516525
cfid->dentry = NULL;
@@ -522,6 +531,7 @@ void close_all_cached_dirs(struct cifs_sb_info *cifs_sb)
522531
}
523532
spin_unlock(&cifs_sb->tlink_tree_lock);
524533

534+
done:
525535
list_for_each_entry_safe(tmp_list, q, &entry, entry) {
526536
list_del(&tmp_list->entry);
527537
dput(tmp_list->dentry);

0 commit comments

Comments
 (0)