diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-10 16:09:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-10 16:09:11 -0700 |
commit | 4dbb29fe9dae033a375f231da9cc27aaa09d2580 (patch) | |
tree | 9bd4119cb712b2203e06da0fa79c4cb15148f2bd /fs/super.c | |
parent | 1c3837266214c1e6fbbb96ff36bee13e923057d8 (diff) | |
parent | cc23402c1c2de8b1815212f3924cdbc3cda02b94 (diff) | |
download | lwn-4dbb29fe9dae033a375f231da9cc27aaa09d2580.tar.gz lwn-4dbb29fe9dae033a375f231da9cc27aaa09d2580.zip |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
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
Diffstat (limited to 'fs/super.c')
-rw-r--r-- | fs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index bf3b7685b52a..904459b35119 100644 --- a/fs/super.c +++ b/fs/super.c @@ -361,7 +361,7 @@ EXPORT_SYMBOL(deactivate_locked_super); */ 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); deactivate_locked_super(s); } |