lkml.org 
[lkml]   [2006]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[RFC][PATCH 26/27] Originally from: Herbert Poetzl <>
    From
    Date


    Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
    ---

    lxc-dave/fs/namespace.c | 45 ++++++++++++++++++++++++---------------------
    1 files changed, 24 insertions(+), 21 deletions(-)

    diff -puN fs/namespace.c~D6-proc-show-ro-attr fs/namespace.c
    --- lxc/fs/namespace.c~D6-proc-show-ro-attr 2006-07-12 11:09:32.000000000 -0700
    +++ lxc-dave/fs/namespace.c 2006-07-12 11:09:44.000000000 -0700
    @@ -374,24 +374,22 @@ static int show_vfsmnt(struct seq_file *
    {
    struct vfsmount *mnt = v;
    int err = 0;
    + int i;
    static struct proc_fs_info {
    - int flag;
    - char *str;
    + int s_flag;
    + int mnt_flag;
    + char *set_str;
    + char *unset_str;
    } fs_info[] = {
    - { MS_SYNCHRONOUS, ",sync" },
    - { MS_DIRSYNC, ",dirsync" },
    - { MS_MANDLOCK, ",mand" },
    - { 0, NULL }
    - };
    - static struct proc_fs_info mnt_info[] = {
    - { MNT_NOSUID, ",nosuid" },
    - { MNT_NODEV, ",nodev" },
    - { MNT_NOEXEC, ",noexec" },
    - { MNT_NOATIME, ",noatime" },
    - { MNT_NODIRATIME, ",nodiratime" },
    - { 0, NULL }
    + { MS_SYNCHRONOUS, 0, ",sync", NULL },
    + { MS_DIRSYNC, 0, ",dirsync", NULL },
    + { MS_MANDLOCK, 0, ",mand", NULL },
    + { 0, MNT_NOSUID, ",nosuid", NULL },
    + { 0, MNT_NODEV, ",nodev", NULL },
    + { 0, MNT_NOEXEC, ",noexec", NULL },
    + { 0, MNT_NOATIME, ",noatime", NULL },
    + { 0, MNT_NODIRATIME, ",nodiratime", NULL }
    };
    - struct proc_fs_info *fs_infop;

    mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
    seq_putc(m, ' ');
    @@ -399,13 +397,18 @@ static int show_vfsmnt(struct seq_file *
    seq_putc(m, ' ');
    mangle(m, mnt->mnt_sb->s_type->name);
    seq_puts(m, mnt->mnt_sb->s_flags & MS_RDONLY ? " ro" : " rw");
    - for (fs_infop = fs_info; fs_infop->flag; fs_infop++) {
    - if (mnt->mnt_sb->s_flags & fs_infop->flag)
    - seq_puts(m, fs_infop->str);
    - }
    - for (fs_infop = mnt_info; fs_infop->flag; fs_infop++) {
    + for (i = 0; i < ARRAY_SIZE(fs_info); i++) {
    + struct proc_fs_info *fs_infop = &fs_info[i];
    + char *str = NULL;
    + if ((mnt->mnt_sb->s_flags & fs_infop->s_flag) ||
    + mnt_flag_set(mnt, fs_infop->mnt_flag))
    + str = fs_infop->set_str;
    + else
    + str = fs_infop->unset_str;
    +
    if (mnt->mnt_flags & fs_infop->flag)
    - seq_puts(m, fs_infop->str);
    + if (str)
    + seq_puts(m, str);
    }
    if (mnt->mnt_sb->s_op->show_options)
    err = mnt->mnt_sb->s_op->show_options(m, mnt);
    _
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-07-12 20:23    [W:0.024 / U:0.368 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site