diff options
author | David Howells <dhowells@redhat.com> | 2012-06-25 07:55:37 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 08:38:34 -0400 |
commit | 9249e17fe094d853d1ef7475dd559a2cc7e23d42 (patch) | |
tree | fa80a6044c14b38994d232c0e05cb7365800adf2 /fs/gfs2 | |
parent | f015f1267b23d3530d3f874243fb83cb5f443005 (diff) |
VFS: Pass mount flags to sget()
Pass mount flags to sget() so that it can use them in initialising a new
superblock before the set function is called. They could also be passed to the
compare function.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/ops_fstype.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index b8c250fc4922..6c906078f657 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
@@ -1286,7 +1286,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, | |||
1286 | error = -EBUSY; | 1286 | error = -EBUSY; |
1287 | goto error_bdev; | 1287 | goto error_bdev; |
1288 | } | 1288 | } |
1289 | s = sget(fs_type, test_gfs2_super, set_gfs2_super, bdev); | 1289 | s = sget(fs_type, test_gfs2_super, set_gfs2_super, flags, bdev); |
1290 | mutex_unlock(&bdev->bd_fsfreeze_mutex); | 1290 | mutex_unlock(&bdev->bd_fsfreeze_mutex); |
1291 | error = PTR_ERR(s); | 1291 | error = PTR_ERR(s); |
1292 | if (IS_ERR(s)) | 1292 | if (IS_ERR(s)) |
@@ -1316,7 +1316,6 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags, | |||
1316 | } else { | 1316 | } else { |
1317 | char b[BDEVNAME_SIZE]; | 1317 | char b[BDEVNAME_SIZE]; |
1318 | 1318 | ||
1319 | s->s_flags = flags; | ||
1320 | s->s_mode = mode; | 1319 | s->s_mode = mode; |
1321 | strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id)); | 1320 | strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id)); |
1322 | sb_set_blocksize(s, block_size(bdev)); | 1321 | sb_set_blocksize(s, block_size(bdev)); |
@@ -1360,7 +1359,7 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type, | |||
1360 | dev_name, error); | 1359 | dev_name, error); |
1361 | return ERR_PTR(error); | 1360 | return ERR_PTR(error); |
1362 | } | 1361 | } |
1363 | s = sget(&gfs2_fs_type, test_gfs2_super, set_meta_super, | 1362 | s = sget(&gfs2_fs_type, test_gfs2_super, set_meta_super, flags, |
1364 | path.dentry->d_inode->i_sb->s_bdev); | 1363 | path.dentry->d_inode->i_sb->s_bdev); |
1365 | path_put(&path); | 1364 | path_put(&path); |
1366 | if (IS_ERR(s)) { | 1365 | if (IS_ERR(s)) { |