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/super.c | |
parent | a6322de67b58a00e3a783ad9c87c2a11b2d67b47 (diff) |
vfs: switch ->show_options() to struct dentry *
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2/super.c')
-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 c05ff25c356c..604e12c4e979 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, | |||
108 | int is_remount); | 108 | int is_remount); |
109 | static int ocfs2_check_set_options(struct super_block *sb, | 109 | static int ocfs2_check_set_options(struct super_block *sb, |
110 | struct mount_options *options); | 110 | struct mount_options *options); |
111 | static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt); | 111 | static int ocfs2_show_options(struct seq_file *s, struct dentry *root); |
112 | static void ocfs2_put_super(struct super_block *sb); | 112 | static void ocfs2_put_super(struct super_block *sb); |
113 | static int ocfs2_mount_volume(struct super_block *sb); | 113 | static int ocfs2_mount_volume(struct super_block *sb); |
114 | static int ocfs2_remount(struct super_block *sb, int *flags, char *data); | 114 | static int ocfs2_remount(struct super_block *sb, int *flags, char *data); |
@@ -1533,9 +1533,9 @@ bail: | |||
1533 | return status; | 1533 | return status; |
1534 | } | 1534 | } |
1535 | 1535 | ||
1536 | static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt) | 1536 | static int ocfs2_show_options(struct seq_file *s, struct dentry *root) |
1537 | { | 1537 | { |
1538 | struct ocfs2_super *osb = OCFS2_SB(mnt->mnt_sb); | 1538 | struct ocfs2_super *osb = OCFS2_SB(root->d_sb); |
1539 | unsigned long opts = osb->s_mount_opt; | 1539 | unsigned long opts = osb->s_mount_opt; |
1540 | unsigned int local_alloc_megs; | 1540 | unsigned int local_alloc_megs; |
1541 | 1541 | ||
@@ -1567,8 +1567,7 @@ static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt) | |||
1567 | if (osb->preferred_slot != OCFS2_INVALID_SLOT) | 1567 | if (osb->preferred_slot != OCFS2_INVALID_SLOT) |
1568 | seq_printf(s, ",preferred_slot=%d", osb->preferred_slot); | 1568 | seq_printf(s, ",preferred_slot=%d", osb->preferred_slot); |
1569 | 1569 | ||
1570 | if (!(mnt->mnt_flags & MNT_NOATIME) && !(mnt->mnt_flags & MNT_RELATIME)) | 1570 | seq_printf(s, ",atime_quantum=%u", osb->s_atime_quantum); |
1571 | seq_printf(s, ",atime_quantum=%u", osb->s_atime_quantum); | ||
1572 | 1571 | ||
1573 | if (osb->osb_commit_interval) | 1572 | if (osb->osb_commit_interval) |
1574 | seq_printf(s, ",commit=%u", | 1573 | seq_printf(s, ",commit=%u", |