lkml.org 
[lkml]   [2010]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 25/34] union-mount: Implement union mount
    Date
    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 <vaurora@redhat.com>
    ---
    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


    \
     
     \ /
      Last update: 2010-09-17 00:21    [W:3.575 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site