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

diff --cc fs/namespace.c
index 7cd642409165738e59c97e9942fee19ad42d52fc,e6aed405611da3cccd359bdc545092d26765a393..f30ed401cc6d7a824ad5b19b21459cdfd3f0435f
--- 1/fs/namespace.c
--- 2/fs/namespace.c
+++ b/fs/namespace.c
@@@ -684,21 -669,14 +684,18 @@@ bool __is_local_mountpoint(struct dentr
        struct mount *mnt;
        bool is_covered = false;
  
-       if (!d_mountpoint(dentry))
-               goto out;
- 
        down_read(&namespace_sem);
 +      lock_ns_list(ns);
        list_for_each_entry(mnt, &ns->list, mnt_list) {
 +              if (mnt_is_cursor(mnt))
 +                      continue;
                is_covered = (mnt->mnt_mountpoint == dentry);
                if (is_covered)
                        break;
        }
 +      unlock_ns_list(ns);
        up_read(&namespace_sem);
- out:
+ 
        return is_covered;
  }
  

diff --cc fs/super.c
Simple merge