Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/namespace.c b/fs/namespace.c
index e069a4c5e389..bf478addb852 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -459,9 +459,9 @@ int may_umount_tree(struct vfsmount *mnt)
         spin_unlock(&vfsmount_lock);
 
         if (actual_refs > minimum_refs)
-                return -EBUSY;
+                return 0;
 
-        return 0;
+        return 1;
 }
 
 EXPORT_SYMBOL(may_umount_tree);
@@ -481,10 +481,10 @@ EXPORT_SYMBOL(may_umount_tree);
  */
 int may_umount(struct vfsmount *mnt)
 {
-        int ret = 0;
+        int ret = 1;
         spin_lock(&vfsmount_lock);
         if (propagate_mount_busy(mnt, 2))
-                ret = -EBUSY;
+                ret = 0;
         spin_unlock(&vfsmount_lock);
         return ret;
 }