aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/super.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-10-02 11:49:41 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-10-02 11:49:41 -0400
commit3cf1e7bed4681bdb1c14b6e146ae9c0afb6c1552 (patch)
treeef994734707067f4d254219048e5fbc923fb61e3 /fs/gfs2/super.c
parent2e565bb69ce2184eabf4f43e64afc79c46f46204 (diff)
[GFS2] Remove duplicate sb reading code
For some reason we had two different sets of code for reading in the superblock. This removes one of them in favour of the other. Also we don't need the temporary buffer for the sb since we already have one in the gfs2 sb itself. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r--fs/gfs2/super.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index f6ce5e4eaf7e..6a78b1b32e25 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -180,7 +180,7 @@ static int end_bio_io_page(struct bio *bio, unsigned int bytes_done, int error)
180 return 0; 180 return 0;
181} 181}
182 182
183static struct page *gfs2_read_super(struct super_block *sb, sector_t sector) 183struct page *gfs2_read_super(struct super_block *sb, sector_t sector)
184{ 184{
185 struct page *page; 185 struct page *page;
186 struct bio *bio; 186 struct bio *bio;
@@ -205,7 +205,7 @@ static struct page *gfs2_read_super(struct super_block *sb, sector_t sector)
205 205
206 bio->bi_end_io = end_bio_io_page; 206 bio->bi_end_io = end_bio_io_page;
207 bio->bi_private = page; 207 bio->bi_private = page;
208 submit_bio(READ_SYNC, bio); 208 submit_bio(READ_SYNC | (1 << BIO_RW_META), bio);
209 wait_on_page_locked(page); 209 wait_on_page_locked(page);
210 bio_put(bio); 210 bio_put(bio);
211 if (!PageUptodate(page)) { 211 if (!PageUptodate(page)) {