From 2763c4a9410da465c4816f4e93ef76e4669493ca Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 7 Apr 2009 12:21:18 -0400 Subject: [PATCH] --- yaml --- r: 147813 b: refs/heads/master c: dd5cae6e9772ecc62fd374f7a8ec10eb51c96c4d h: refs/heads/master i: 147811: dd3f01c9ebef4019e94ec38d0c9830ca156c2fe0 v: v3 --- [refs] | 2 +- trunk/fs/namespace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f85061e85d9b..4b3bbff26657 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b857119538daac7118c1364d7ff3613f12b84d3 +refs/heads/master: dd5cae6e9772ecc62fd374f7a8ec10eb51c96c4d diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c index 134d494158d9..88a904d5aa23 100644 --- a/trunk/fs/namespace.c +++ b/trunk/fs/namespace.c @@ -1698,7 +1698,7 @@ int do_add_mount(struct vfsmount *newmnt, struct path *path, follow_down(&path->mnt, &path->dentry)) ; err = -EINVAL; - if (!check_mnt(path->mnt)) + if (!(mnt_flags & MNT_SHRINKABLE) && !check_mnt(path->mnt)) goto unlock; /* Refuse the same filesystem on the same mount point */