Hi, On Wed, 24 Jun 2009 18:14:35 +0900, Jiro SEKIBA <[email protected]> wrote: > Oops! > > Sorry for the trivial error. > > Here is a new patch to meet the coding style(I hope). > > thanks > > regards, > -- > Jiro SEKIBA <[email protected]> > > Signed-off-by: Jiro SEKIBA <[email protected]> > > --- > fs/nilfs2/super.c | 26 +++++++++++++++++++++++++- > 1 files changed, 25 insertions(+), 1 deletions(-) > > diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c > index ab785f8..aa6b881 100644 > --- a/fs/nilfs2/super.c > +++ b/fs/nilfs2/super.c > @@ -50,6 +50,8 @@ > #include <linux/writeback.h> > #include <linux/kobject.h> > #include <linux/exportfs.h> > +#include <linux/seq_file.h> > +#include <linux/mount.h> > #include "nilfs.h" > #include "mdt.h" > #include "alloc.h" > @@ -537,6 +539,28 @@ static int nilfs_statfs(struct dentry *dentry, struct > kstatfs *buf) > return 0; > } > > +static int nilfs_show_options(struct seq_file *seq, struct vfsmount *vfs) > +{ > + struct super_block *sb = vfs->mnt_sb; > + struct nilfs_sb_info *sbi = NILFS_SB(sb); > + > + if (!nilfs_test_opt(sbi, BARRIER)) > + seq_printf(seq, ",barrier=off"); > + if (nilfs_test_opt(sbi, SNAPSHOT)) > + seq_printf(seq, ",cp=%llu", > + (unsigned long long int)sbi->s_snapshot_cno); > + if (nilfs_test_opt(sbi, ERRORS_CONT)) > + seq_printf(seq, ",errors=continue"); > + if (nilfs_test_opt(sbi, ERRORS_RO)) > + seq_printf(seq, ",errors=remount-ro"); > + if (nilfs_test_opt(sbi, ERRORS_PANIC)) > + seq_printf(seq, ",errors=panic"); > + if (nilfs_test_opt(sbi, STRICT_ORDER)) > + seq_printf(seq, ",order=strict"); > + > + return 0; > +} > + > static struct super_operations nilfs_sops = { > .alloc_inode = nilfs_alloc_inode, > .destroy_inode = nilfs_destroy_inode, > @@ -554,7 +578,7 @@ static struct super_operations nilfs_sops = { > .remount_fs = nilfs_remount, > .clear_inode = nilfs_clear_inode, > /* .umount_begin */ > - /* .show_options */ > + .show_options = nilfs_show_options > }; > > static struct inode * > -- > 1.5.6.5 >
Looks good to me! I've tested the patch. One thing, I noticed that the "errors=continue" option looks verbose in default mode. We don't have to emphasize such a subsidiary option when it is selected by default. I think the "errors=continue" option is just the case. So, I removed the corresponding part as I attached below. I'll queue it for 2.6.32. Thank you for your help. Ryusuke Konishi --- From: Jiro SEKIBA <[email protected]> Date: Wed, 24 Jun 2009 20:06:34 +0900 Subject: [PATCH] nilfs2: implement nilfs_show_options to display mount options in /proc/mounts This is a patch to display mount options in procfs. Mount options will show up in the /proc/mounts as other fs does. ... /dev/sda6 /mnt nilfs2 ro,relatime,barrier=off,cp=3,order=strict 0 0 ... Signed-off-by: Jiro SEKIBA <[email protected]> Signed-off-by: Ryusuke Konishi <[email protected]> --- fs/nilfs2/super.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index ab785f8..0b09569 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c @@ -50,6 +50,8 @@ #include <linux/writeback.h> #include <linux/kobject.h> #include <linux/exportfs.h> +#include <linux/seq_file.h> +#include <linux/mount.h> #include "nilfs.h" #include "mdt.h" #include "alloc.h" @@ -537,6 +539,26 @@ static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf) return 0; } +static int nilfs_show_options(struct seq_file *seq, struct vfsmount *vfs) +{ + struct super_block *sb = vfs->mnt_sb; + struct nilfs_sb_info *sbi = NILFS_SB(sb); + + if (!nilfs_test_opt(sbi, BARRIER)) + seq_printf(seq, ",barrier=off"); + if (nilfs_test_opt(sbi, SNAPSHOT)) + seq_printf(seq, ",cp=%llu", + (unsigned long long int)sbi->s_snapshot_cno); + if (nilfs_test_opt(sbi, ERRORS_RO)) + seq_printf(seq, ",errors=remount-ro"); + if (nilfs_test_opt(sbi, ERRORS_PANIC)) + seq_printf(seq, ",errors=panic"); + if (nilfs_test_opt(sbi, STRICT_ORDER)) + seq_printf(seq, ",order=strict"); + + return 0; +} + static struct super_operations nilfs_sops = { .alloc_inode = nilfs_alloc_inode, .destroy_inode = nilfs_destroy_inode, @@ -554,7 +576,7 @@ static struct super_operations nilfs_sops = { .remount_fs = nilfs_remount, .clear_inode = nilfs_clear_inode, /* .umount_begin */ - /* .show_options */ + .show_options = nilfs_show_options }; static struct inode * -- 1.6.2 _______________________________________________ users mailing list [email protected] https://www.nilfs.org/mailman/listinfo/users
