diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-12-08 21:32:45 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-06 23:19:54 -0500 |
| commit | 34c80b1d93e6e20ca9dea0baf583a5b5510d92d4 (patch) | |
| tree | 7dcbf0a4e09464247e6992c8f44fcc872867bd3a /fs/ocfs2 | |
| parent | a6322de67b58a00e3a783ad9c87c2a11b2d67b47 (diff) | |
| download | kernel_goldelico_gta04-34c80b1d93e6e20ca9dea0baf583a5b5510d92d4.zip kernel_goldelico_gta04-34c80b1d93e6e20ca9dea0baf583a5b5510d92d4.tar.gz kernel_goldelico_gta04-34c80b1d93e6e20ca9dea0baf583a5b5510d92d4.tar.bz2 | |
vfs: switch ->show_options() to struct dentry *
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/super.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index c05ff25..604e12c 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -108,7 +108,7 @@ static int ocfs2_parse_options(struct super_block *sb, char *options, int is_remount); static int ocfs2_check_set_options(struct super_block *sb, struct mount_options *options); -static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt); +static int ocfs2_show_options(struct seq_file *s, struct dentry *root); static void ocfs2_put_super(struct super_block *sb); static int ocfs2_mount_volume(struct super_block *sb); static int ocfs2_remount(struct super_block *sb, int *flags, char *data); @@ -1533,9 +1533,9 @@ bail: return status; } -static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt) +static int ocfs2_show_options(struct seq_file *s, struct dentry *root) { - struct ocfs2_super *osb = OCFS2_SB(mnt->mnt_sb); + struct ocfs2_super *osb = OCFS2_SB(root->d_sb); unsigned long opts = osb->s_mount_opt; unsigned int local_alloc_megs; @@ -1567,8 +1567,7 @@ static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt) if (osb->preferred_slot != OCFS2_INVALID_SLOT) seq_printf(s, ",preferred_slot=%d", osb->preferred_slot); - if (!(mnt->mnt_flags & MNT_NOATIME) && !(mnt->mnt_flags & MNT_RELATIME)) - seq_printf(s, ",atime_quantum=%u", osb->s_atime_quantum); + seq_printf(s, ",atime_quantum=%u", osb->s_atime_quantum); if (osb->osb_commit_interval) seq_printf(s, ",commit=%u", |