aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-08-23 08:49:55 -0400
committerJens Axboe <jaxboe@fusionio.com>2011-08-23 08:49:55 -0400
commit5dc06c5a70b79a323152bec7e55783e705767e63 (patch)
tree8f008edc8574ecda04ee6deb13d69b489e8250b6 /fs
parentfcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff)
block: remove READ_META and WRITE_META
Replace all occurnanced of the undocumented READ_META with READ | REQ_META and remove the unused WRITE_META define. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext3/inode.c4
-rw-r--r--fs/ext3/namei.c2
-rw-r--r--fs/ext4/inode.c4
-rw-r--r--fs/ext4/namei.c2
-rw-r--r--fs/gfs2/quota.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 04da6acde85..bba7b96e0d9 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1134,7 +1134,7 @@ struct buffer_head *ext3_bread(handle_t *handle, struct inode *inode,
1134 return bh; 1134 return bh;
1135 if (buffer_uptodate(bh)) 1135 if (buffer_uptodate(bh))
1136 return bh; 1136 return bh;
1137 ll_rw_block(READ_META, 1, &bh); 1137 ll_rw_block(READ | REQ_META, 1, &bh);
1138 wait_on_buffer(bh); 1138 wait_on_buffer(bh);
1139 if (buffer_uptodate(bh)) 1139 if (buffer_uptodate(bh))
1140 return bh; 1140 return bh;
@@ -2807,7 +2807,7 @@ make_io:
2807 trace_ext3_load_inode(inode); 2807 trace_ext3_load_inode(inode);
2808 get_bh(bh); 2808 get_bh(bh);
2809 bh->b_end_io = end_buffer_read_sync; 2809 bh->b_end_io = end_buffer_read_sync;
2810 submit_bh(READ_META, bh); 2810 submit_bh(READ | REQ_META, bh);
2811 wait_on_buffer(bh); 2811 wait_on_buffer(bh);
2812 if (!buffer_uptodate(bh)) { 2812 if (!buffer_uptodate(bh)) {
2813 ext3_error(inode->i_sb, "ext3_get_inode_loc", 2813 ext3_error(inode->i_sb, "ext3_get_inode_loc",
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 5571708b6a5..c7d4032aa82 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -922,7 +922,7 @@ restart:
922 bh = ext3_getblk(NULL, dir, b++, 0, &err); 922 bh = ext3_getblk(NULL, dir, b++, 0, &err);
923 bh_use[ra_max] = bh; 923 bh_use[ra_max] = bh;
924 if (bh) 924 if (bh)
925 ll_rw_block(READ_META, 1, &bh); 925 ll_rw_block(READ | REQ_META, 1, &bh);
926 } 926 }
927 } 927 }
928 if ((bh = bh_use[ra_ptr++]) == NULL) 928 if ((bh = bh_use[ra_ptr++]) == NULL)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index c4da98a959a..1dfa18feeb3 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -650,7 +650,7 @@ struct buffer_head *ext4_bread(handle_t *handle, struct inode *inode,
650 return bh; 650 return bh;
651 if (buffer_uptodate(bh)) 651 if (buffer_uptodate(bh))
652 return bh; 652 return bh;
653 ll_rw_block(READ_META, 1, &bh); 653 ll_rw_block(READ | REQ_META, 1, &bh);
654 wait_on_buffer(bh); 654 wait_on_buffer(bh);
655 if (buffer_uptodate(bh)) 655 if (buffer_uptodate(bh))
656 return bh; 656 return bh;
@@ -3301,7 +3301,7 @@ make_io:
3301 trace_ext4_load_inode(inode); 3301 trace_ext4_load_inode(inode);
3302 get_bh(bh); 3302 get_bh(bh);
3303 bh->b_end_io = end_buffer_read_sync; 3303 bh->b_end_io = end_buffer_read_sync;
3304 submit_bh(READ_META, bh); 3304 submit_bh(READ | REQ_META, bh);
3305 wait_on_buffer(bh); 3305 wait_on_buffer(bh);
3306 if (!buffer_uptodate(bh)) { 3306 if (!buffer_uptodate(bh)) {
3307 EXT4_ERROR_INODE_BLOCK(inode, block, 3307 EXT4_ERROR_INODE_BLOCK(inode, block,
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index f8068c7bae9..d36315ae629 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -922,7 +922,7 @@ restart:
922 bh = ext4_getblk(NULL, dir, b++, 0, &err); 922 bh = ext4_getblk(NULL, dir, b++, 0, &err);
923 bh_use[ra_max] = bh; 923 bh_use[ra_max] = bh;
924 if (bh) 924 if (bh)
925 ll_rw_block(READ_META, 1, &bh); 925 ll_rw_block(READ | REQ_META, 1, &bh);
926 } 926 }
927 } 927 }
928 if ((bh = bh_use[ra_ptr++]) == NULL) 928 if ((bh = bh_use[ra_ptr++]) == NULL)
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 42e8d23bc04..053434049db 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -709,7 +709,7 @@ get_a_page:
709 set_buffer_uptodate(bh); 709 set_buffer_uptodate(bh);
710 710
711 if (!buffer_uptodate(bh)) { 711 if (!buffer_uptodate(bh)) {
712 ll_rw_block(READ_META, 1, &bh); 712 ll_rw_block(READ | REQ_META, 1, &bh);
713 wait_on_buffer(bh); 713 wait_on_buffer(bh);
714 if (!buffer_uptodate(bh)) 714 if (!buffer_uptodate(bh))
715 goto unlock_out; 715 goto unlock_out;