Branch b1_8_gate

b=17589

revert the previous patch because that is rejected by alexey.lyashkov.

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index e7d457c..e4d276f 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -2215,16 +2215,9 @@ void ll_umount_begin(struct super_block *sb)
 
         /* Really, we'd like to wait until there are no requests outstanding,
          * and then continue.  For now, we just invalidate the requests,
-         * sleep 1 second, and hope it is OK.
+         * schedule, and hope.
          */
-        if (atomic_read(&vfsmnt->mnt_count) > 2) {
-                cfs_schedule_timeout(CFS_TASK_INTERRUPTIBLE,
-                                     cfs_time_seconds(1));
-                if (atomic_read(&vfsmnt->mnt_count) > 2)
-                        LCONSOLE_WARN("Mount still busy with %d refs! You "
-                                      "may try to umount it a bit later\n",
-                                      atomic_read(&vfsmnt->mnt_count));
-        }
+        schedule();
 
         EXIT;
 }