Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs pile 1 from Al Viro:
 "Unfortunately, this merge window it'll have a be a lot of small piles -
  my fault, actually, for not keeping #for-next in anything that would
  resemble a sane shape ;-/

  This pile: assorted fixes (the first 3 are -stable fodder, IMO) and
  cleanups + %pd/%pD formats (dentry/file pathname, up to 4 last
  components) + several long-standing patches from various folks.

  There definitely will be a lot more (starting with Miklos'
  check_submount_and_drop() series)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
  direct-io: Handle O_(D)SYNC AIO
  direct-io: Implement generic deferred AIO completions
  add formats for dentry/file pathnames
  kvm eventfd: switch to fdget
  powerpc kvm: use fdget
  switch fchmod() to fdget
  switch epoll_ctl() to fdget
  switch copy_module_from_fd() to fdget
  git simplify nilfs check for busy subtree
  ibmasmfs: don't bother passing superblock when not needed
  don't pass superblock to hypfs_{mkdir,create*}
  don't pass superblock to hypfs_diag_create_files
  don't pass superblock to hypfs_vm_create_files()
  oprofile: get rid of pointless forward declarations of struct super_block
  oprofilefs_create_...() do not need superblock argument
  oprofilefs_mkdir() doesn't need superblock argument
  don't bother with passing superblock to oprofile_create_stats_files()
  oprofile: don't bother with passing superblock to ->create_files()
  don't bother passing sb to oprofile_create_files()
  coh901318: don't open-code simple_read_from_buffer()
  ...

1 files changed, 7 insertions, 19 deletions

diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index af3ba0478cdf..7ac2a122ca1d 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -994,23 +994,16 @@ static int nilfs_attach_snapshot(struct super_block *s, __u64 cno,
         return ret;
 }
 
-static int nilfs_tree_was_touched(struct dentry *root_dentry)
-{
-        return d_count(root_dentry) > 1;
-}
-
 /**
- * nilfs_try_to_shrink_tree() - try to shrink dentries of a checkpoint
+ * nilfs_tree_is_busy() - try to shrink dentries of a checkpoint
  * @root_dentry: root dentry of the tree to be shrunk
  *
  * This function returns true if the tree was in-use.
  */
-static int nilfs_try_to_shrink_tree(struct dentry *root_dentry)
+static bool nilfs_tree_is_busy(struct dentry *root_dentry)
 {
-        if (have_submounts(root_dentry))
-                return true;
         shrink_dcache_parent(root_dentry);
-        return nilfs_tree_was_touched(root_dentry);
+        return d_count(root_dentry) > 1;
 }
 
 int nilfs_checkpoint_is_mounted(struct super_block *sb, __u64 cno)
@@ -1034,8 +1027,7 @@ int nilfs_checkpoint_is_mounted(struct super_block *sb, __u64 cno)
                 if (inode) {
                         dentry = d_find_alias(inode);
                         if (dentry) {
-                                if (nilfs_tree_was_touched(dentry))
-                                        ret = nilfs_try_to_shrink_tree(dentry);
+                                ret = nilfs_tree_is_busy(dentry);
                                 dput(dentry);
                         }
                         iput(inode);
@@ -1331,11 +1323,8 @@ nilfs_mount(struct file_system_type *fs_type, int flags,
 
                 s->s_flags |= MS_ACTIVE;
         } else if (!sd.cno) {
-                int busy = false;
-
-                if (nilfs_tree_was_touched(s->s_root)) {
-                        busy = nilfs_try_to_shrink_tree(s->s_root);
-                        if (busy && (flags ^ s->s_flags) & MS_RDONLY) {
+                if (nilfs_tree_is_busy(s->s_root)) {
+                        if ((flags ^ s->s_flags) & MS_RDONLY) {
                                 printk(KERN_ERR "NILFS: the device already "
                                        "has a %s mount.\n",
                                        (s->s_flags & MS_RDONLY) ?
@@ -1343,8 +1332,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags,
                                 err = -EBUSY;
                                 goto failed_super;
                         }
-                }
-                if (!busy) {
+                } else {
                         /*
                          * Try remount to setup mount states if the current
                          * tree is not mounted and only snapshots use this sb.