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/gfs2 | |
parent | a6322de67b58a00e3a783ad9c87c2a11b2d67b47 (diff) |
vfs: switch ->show_options() to struct dentry *
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/super.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 9e89d94be003..10c7733a899b 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
@@ -1284,18 +1284,18 @@ static int is_ancestor(const struct dentry *d1, const struct dentry *d2) | |||
1284 | /** | 1284 | /** |
1285 | * gfs2_show_options - Show mount options for /proc/mounts | 1285 | * gfs2_show_options - Show mount options for /proc/mounts |
1286 | * @s: seq_file structure | 1286 | * @s: seq_file structure |
1287 | * @mnt: vfsmount | 1287 | * @root: root of this (sub)tree |
1288 | * | 1288 | * |
1289 | * Returns: 0 on success or error code | 1289 | * Returns: 0 on success or error code |
1290 | */ | 1290 | */ |
1291 | 1291 | ||
1292 | static int gfs2_show_options(struct seq_file *s, struct vfsmount *mnt) | 1292 | static int gfs2_show_options(struct seq_file *s, struct dentry *root) |
1293 | { | 1293 | { |
1294 | struct gfs2_sbd *sdp = mnt->mnt_sb->s_fs_info; | 1294 | struct gfs2_sbd *sdp = root->d_sb->s_fs_info; |
1295 | struct gfs2_args *args = &sdp->sd_args; | 1295 | struct gfs2_args *args = &sdp->sd_args; |
1296 | int val; | 1296 | int val; |
1297 | 1297 | ||
1298 | if (is_ancestor(mnt->mnt_root, sdp->sd_master_dir)) | 1298 | if (is_ancestor(root, sdp->sd_master_dir)) |
1299 | seq_printf(s, ",meta"); | 1299 | seq_printf(s, ",meta"); |
1300 | if (args->ar_lockproto[0]) | 1300 | if (args->ar_lockproto[0]) |
1301 | seq_printf(s, ",lockproto=%s", args->ar_lockproto); | 1301 | seq_printf(s, ",lockproto=%s", args->ar_lockproto); |