]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
get rid of the second argument of shrink_submounts()
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 16 Mar 2013 18:39:34 +0000 (14:39 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Tue, 9 Apr 2013 18:12:53 +0000 (14:12 -0400)
... it's always &unmounted.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/namespace.c

index 0d91711a3160c380a08547dd05e8f2a9f8054057..c04afaf0e3dc08d06801c76b08e801376e2cee9f 100644 (file)
@@ -1184,7 +1184,7 @@ void umount_tree(struct mount *mnt, int propagate, struct list_head *kill)
        list_splice(&tmp_list, kill);
 }
 
-static void shrink_submounts(struct mount *mnt, struct list_head *umounts);
+static void shrink_submounts(struct mount *mnt);
 
 static int do_umount(struct mount *mnt, int flags)
 {
@@ -1262,7 +1262,7 @@ static int do_umount(struct mount *mnt, int flags)
        event++;
 
        if (!(flags & MNT_DETACH))
-               shrink_submounts(mnt, &unmounted);
+               shrink_submounts(mnt);
 
        retval = -EBUSY;
        if (flags & MNT_DETACH || !propagate_mount_busy(mnt, 2)) {
@@ -2145,7 +2145,7 @@ resume:
  *
  * vfsmount_lock must be held for write
  */
-static void shrink_submounts(struct mount *mnt, struct list_head *umounts)
+static void shrink_submounts(struct mount *mnt)
 {
        LIST_HEAD(graveyard);
        struct mount *m;
@@ -2156,7 +2156,7 @@ static void shrink_submounts(struct mount *mnt, struct list_head *umounts)
                        m = list_first_entry(&graveyard, struct mount,
                                                mnt_expire);
                        touch_mnt_namespace(m->mnt_ns);
-                       umount_tree(m, 1, umounts);
+                       umount_tree(m, 1, &unmounted);
                }
        }
 }