aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-03-16 14:39:34 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-04-09 14:12:53 -0400
commitb54b9be7824d84158cd90305820e2c3914f74ad9 (patch)
tree049c2913948eca238f64354a1921a62d5cbf2f5d /fs
parente3197d83d6f5b9bd0e57a05592437ffa459ee106 (diff)
get rid of the second argument of shrink_submounts()
... it's always &unmounted. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namespace.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 0d91711a3160..c04afaf0e3dc 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1184,7 +1184,7 @@ void umount_tree(struct mount *mnt, int propagate, struct list_head *kill)
1184 list_splice(&tmp_list, kill); 1184 list_splice(&tmp_list, kill);
1185} 1185}
1186 1186
1187static void shrink_submounts(struct mount *mnt, struct list_head *umounts); 1187static void shrink_submounts(struct mount *mnt);
1188 1188
1189static int do_umount(struct mount *mnt, int flags) 1189static int do_umount(struct mount *mnt, int flags)
1190{ 1190{
@@ -1262,7 +1262,7 @@ static int do_umount(struct mount *mnt, int flags)
1262 event++; 1262 event++;
1263 1263
1264 if (!(flags & MNT_DETACH)) 1264 if (!(flags & MNT_DETACH))
1265 shrink_submounts(mnt, &unmounted); 1265 shrink_submounts(mnt);
1266 1266
1267 retval = -EBUSY; 1267 retval = -EBUSY;
1268 if (flags & MNT_DETACH || !propagate_mount_busy(mnt, 2)) { 1268 if (flags & MNT_DETACH || !propagate_mount_busy(mnt, 2)) {
@@ -2145,7 +2145,7 @@ resume:
2145 * 2145 *
2146 * vfsmount_lock must be held for write 2146 * vfsmount_lock must be held for write
2147 */ 2147 */
2148static void shrink_submounts(struct mount *mnt, struct list_head *umounts) 2148static void shrink_submounts(struct mount *mnt)
2149{ 2149{
2150 LIST_HEAD(graveyard); 2150 LIST_HEAD(graveyard);
2151 struct mount *m; 2151 struct mount *m;
@@ -2156,7 +2156,7 @@ static void shrink_submounts(struct mount *mnt, struct list_head *umounts)
2156 m = list_first_entry(&graveyard, struct mount, 2156 m = list_first_entry(&graveyard, struct mount,
2157 mnt_expire); 2157 mnt_expire);
2158 touch_mnt_namespace(m->mnt_ns); 2158 touch_mnt_namespace(m->mnt_ns);
2159 umount_tree(m, 1, umounts); 2159 umount_tree(m, 1, &unmounted);
2160 } 2160 }
2161 } 2161 }
2162} 2162}