diff options
Diffstat (limited to 'fs/super.c')
-rw-r--r-- | fs/super.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/super.c b/fs/super.c index 0902cfa6a12e..a3bc935069d9 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -307,12 +307,6 @@ void deactivate_locked_super(struct super_block *s) | |||
307 | 307 | ||
308 | /* caches are now gone, we can safely kill the shrinker now */ | 308 | /* caches are now gone, we can safely kill the shrinker now */ |
309 | unregister_shrinker(&s->s_shrink); | 309 | unregister_shrinker(&s->s_shrink); |
310 | |||
311 | /* | ||
312 | * We need to call rcu_barrier so all the delayed rcu free | ||
313 | * inodes are flushed before we release the fs module. | ||
314 | */ | ||
315 | rcu_barrier(); | ||
316 | put_filesystem(fs); | 310 | put_filesystem(fs); |
317 | put_super(s); | 311 | put_super(s); |
318 | } else { | 312 | } else { |
@@ -871,7 +865,7 @@ int get_anon_bdev(dev_t *p) | |||
871 | else if (error) | 865 | else if (error) |
872 | return -EAGAIN; | 866 | return -EAGAIN; |
873 | 867 | ||
874 | if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) { | 868 | if ((dev & MAX_IDR_MASK) == (1 << MINORBITS)) { |
875 | spin_lock(&unnamed_dev_lock); | 869 | spin_lock(&unnamed_dev_lock); |
876 | ida_remove(&unnamed_dev_ida, dev); | 870 | ida_remove(&unnamed_dev_ida, dev); |
877 | if (unnamed_dev_start > dev) | 871 | if (unnamed_dev_start > dev) |