lkml.org 
[lkml]   [2009]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/41] union-mount: Introduce MNT_UNION and MS_UNION flags
    Date
    From: Jan Blunck <jblunck@suse.de>

    Add per mountpoint flag for Union Mount support. You need additional patches
    to util-linux for that to work - see:

    git://git.kernel.org/pub/scm/utils/util-linux-ng/val/util-linux-ng.git

    Signed-off-by: Jan Blunck <jblunck@suse.de>
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Valerie Aurora <vaurora@redhat.com>
    ---
    fs/namespace.c | 5 ++++-
    include/linux/fs.h | 1 +
    include/linux/mount.h | 1 +
    3 files changed, 6 insertions(+), 1 deletions(-)

    diff --git a/fs/namespace.c b/fs/namespace.c
    index 4cd43ea..81b3188 100644
    --- a/fs/namespace.c
    +++ b/fs/namespace.c
    @@ -770,6 +770,7 @@ static void show_mnt_opts(struct seq_file *m, struct vfsmount *mnt)
    { MNT_NODIRATIME, ",nodiratime" },
    { MNT_RELATIME, ",relatime" },
    { MNT_STRICTATIME, ",strictatime" },
    + { MNT_UNION, ",union" },
    { 0, NULL }
    };
    const struct proc_fs_info *fs_infop;
    @@ -1925,10 +1926,12 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
    mnt_flags &= ~(MNT_RELATIME | MNT_NOATIME);
    if (flags & MS_RDONLY)
    mnt_flags |= MNT_READONLY;
    + if (flags & MS_UNION)
    + mnt_flags |= MNT_UNION;

    flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
    MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
    - MS_STRICTATIME);
    + MS_STRICTATIME | MS_UNION);

    /* ... and get the mountpoint */
    retval = kern_path(dir_name, LOOKUP_FOLLOW, &path);
    diff --git a/include/linux/fs.h b/include/linux/fs.h
    index d13de8a..efea78c 100644
    --- a/include/linux/fs.h
    +++ b/include/linux/fs.h
    @@ -188,6 +188,7 @@ struct inodes_stat_t {
    #define MS_REMOUNT 32 /* Alter flags of a mounted FS */
    #define MS_MANDLOCK 64 /* Allow mandatory locks on an FS */
    #define MS_DIRSYNC 128 /* Directory modifications are synchronous */
    +#define MS_UNION 256
    #define MS_NOATIME 1024 /* Do not update access times. */
    #define MS_NODIRATIME 2048 /* Do not update directory access times */
    #define MS_BIND 4096
    diff --git a/include/linux/mount.h b/include/linux/mount.h
    index 5d52753..e175c47 100644
    --- a/include/linux/mount.h
    +++ b/include/linux/mount.h
    @@ -35,6 +35,7 @@ struct mnt_namespace;
    #define MNT_SHARED 0x1000 /* if the vfsmount is a shared mount */
    #define MNT_UNBINDABLE 0x2000 /* if the vfsmount is a unbindable mount */
    #define MNT_PNODE_MASK 0x3000 /* propagation flag mask */
    +#define MNT_UNION 0x4000 /* if the vfsmount is a union mount */

    struct vfsmount {
    struct list_head mnt_hash;
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2009-10-21 21:47    [W:0.046 / U:30.144 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site