diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2009-06-10 10:31:45 +0100 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2009-06-10 10:31:45 +0100 |
| commit | 003dec8913d6bebb4ecc989ec04a235cf38f5ea9 (patch) | |
| tree | 5a062c995c471190d2148af21b42db0f9d4294b4 /fs | |
| parent | 40bc9a27e00d6c8c7e4dc2865c02d7402a950472 (diff) | |
| download | linux-3.10-003dec8913d6bebb4ecc989ec04a235cf38f5ea9.tar.gz linux-3.10-003dec8913d6bebb4ecc989ec04a235cf38f5ea9.tar.bz2 linux-3.10-003dec8913d6bebb4ecc989ec04a235cf38f5ea9.zip | |
GFS2: Merge gfs2_get_sb into gfs2_get_sb_meta
These don't need to be separate functions.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/ops_fstype.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index 9da161cbb30..f234aba36fb 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -1284,9 +1284,11 @@ static int set_meta_super(struct super_block *s, void *ptr) return -EINVAL; } -static struct super_block *get_gfs2_sb(const char *dev_name) +static int gfs2_get_sb_meta(struct file_system_type *fs_type, int flags, + const char *dev_name, void *data, struct vfsmount *mnt) { struct super_block *s; + struct gfs2_sbd *sdp; struct path path; int error; @@ -1294,21 +1296,11 @@ static struct super_block *get_gfs2_sb(const char *dev_name) if (error) { printk(KERN_WARNING "GFS2: path_lookup on %s returned error %d\n", dev_name, error); - return ERR_PTR(-ENOENT); + return error; } s = sget(&gfs2_fs_type, test_meta_super, set_meta_super, path.dentry->d_inode->i_sb->s_bdev); path_put(&path); - return s; -} - -static int gfs2_get_sb_meta(struct file_system_type *fs_type, int flags, - const char *dev_name, void *data, struct vfsmount *mnt) -{ - struct super_block *s; - struct gfs2_sbd *sdp; - - s = get_gfs2_sb(dev_name); if (IS_ERR(s)) { printk(KERN_WARNING "GFS2: gfs2 mount does not exist\n"); return PTR_ERR(s); |