X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=fs%2Fsuper.c;h=a3bc935069d9d5c643657793602ea42201263ed4;hb=ceb736c395058699dc82e5efdb2a9279a5b29451;hp=0902cfa6a12efd21e4ebd52a39333b7f9d6270eb;hpb=b9541d94bcd2f23a069dbe84830fef1bbcd643f0;p=deliverable%2Flinux.git

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)
 
 		/* caches are now gone, we can safely kill the shrinker now */
 		unregister_shrinker(&s->s_shrink);
-
-		/*
-		 * We need to call rcu_barrier so all the delayed rcu free
-		 * inodes are flushed before we release the fs module.
-		 */
-		rcu_barrier();
 		put_filesystem(fs);
 		put_super(s);
 	} else {
@@ -871,7 +865,7 @@ int get_anon_bdev(dev_t *p)
 	else if (error)
 		return -EAGAIN;
 
-	if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) {
+	if ((dev & MAX_IDR_MASK) == (1 << MINORBITS)) {
 		spin_lock(&unnamed_dev_lock);
 		ida_remove(&unnamed_dev_ida, dev);
 		if (unnamed_dev_start > dev)