From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 25/34] union-mount: Implement union mount Date: Thu, 16 Sep 2010 15:12:16 -0700 Message-ID: <1284675145-4391-26-git-send-email-vaurora@redhat.com> References: <1284675145-4391-1-git-send-email-vaurora@redhat.com> Cc: Miklos Szeredi , Christoph Hellwig , Andreas Gruenbacher , Nick Piggin , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Valerie Aurora To: Alexander Viro Return-path: Received: from mx1.redhat.com ([209.132.183.28]:22965 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756473Ab0IPWPJ (ORCPT ); Thu, 16 Sep 2010 18:15:09 -0400 In-Reply-To: <1284675145-4391-1-git-send-email-vaurora@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Up till this commit, mount with MS_UNION flag succeeded but didn't actually union the file systems. Now call the functions to check the source mounts and create/destroy the per-vfsmount union structures. Signed-off-by: Valerie Aurora --- fs/namespace.c | 13 ++++++++++++- fs/super.c | 1 + 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index e3629dd..6bbeb49 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1632,9 +1632,17 @@ static int attach_recursive_mnt(struct vfsmount *source_mnt, if (err) goto out; } + + /* parent_path means we are moving an existing unioned mount */ + if (!parent_path && IS_MNT_UNION(source_mnt)) { + err = prepare_mnt_union(source_mnt, path); + if (err) + goto out_cleanup_ids; + } + err = propagate_mnt(dest_mnt, dest_dentry, source_mnt, &tree_list); if (err) - goto out_cleanup_ids; + goto out_cleanup_union; spin_lock(&vfsmount_lock); @@ -1658,6 +1666,9 @@ static int attach_recursive_mnt(struct vfsmount *source_mnt, spin_unlock(&vfsmount_lock); return 0; + out_cleanup_union: + if (!parent_path && IS_MNT_UNION(source_mnt)) + cleanup_mnt_union(source_mnt); out_cleanup_ids: if (IS_MNT_SHARED(dest_mnt)) cleanup_group_ids(source_mnt, NULL); diff --git a/fs/super.c b/fs/super.c index 3f2df09..c376147 100644 --- a/fs/super.c +++ b/fs/super.c @@ -160,6 +160,7 @@ void deactivate_locked_super(struct super_block *s) if (atomic_dec_and_test(&s->s_active)) { fs->kill_sb(s); put_filesystem(fs); + put_union_sb(s); put_super(s); } else { up_write(&s->s_umount); -- 1.6.3.3