leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Browse Source 
Pull vfs fixes from Al Viro:
 "A couple of trivial patches that fell through the cracks last cycle"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: fix indentation in deactivate_super()
  vfs: Remove duplicated d_mountpoint check in __is_local_mountpoint
This commit is contained in:
Linus Torvalds 2020-06-10 16:09:11 -07:00
commit 4dbb29fe9d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/namespace.c
View File

@ -684,9 +684,6 @@ bool __is_local_mountpoint(struct dentry *dentry)
struct mount *mnt; struct mount *mnt;
bool is_covered = false; bool is_covered = false;
if (!d_mountpoint(dentry))
goto out;
down_read(&namespace_sem); down_read(&namespace_sem);
lock_ns_list(ns); lock_ns_list(ns);
list_for_each_entry(mnt, &ns->list, mnt_list) { list_for_each_entry(mnt, &ns->list, mnt_list) {
@ -698,7 +695,7 @@ bool __is_local_mountpoint(struct dentry *dentry)
} }
unlock_ns_list(ns); unlock_ns_list(ns);
up_read(&namespace_sem); up_read(&namespace_sem);
out:
return is_covered; return is_covered;
} }

2
fs/super.c
View File

@ -361,7 +361,7 @@ EXPORT_SYMBOL(deactivate_locked_super);
*/ */
void deactivate_super(struct super_block *s) void deactivate_super(struct super_block *s)
{ {
if (!atomic_add_unless(&s->s_active, -1, 1)) { if (!atomic_add_unless(&s->s_active, -1, 1)) {
down_write(&s->s_umount); down_write(&s->s_umount);
deactivate_locked_super(s); deactivate_locked_super(s);
} }