git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_linus' of git://linuxtv.org/mchehab/for_linus
[pandora-kernel.git]
/
fs
/
ext3
/
inode.c
diff --git
a/fs/ext3/inode.c
b/fs/ext3/inode.c
index
04da6ac
..
12661e1
100644
(file)
--- 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,
return bh;
if (buffer_uptodate(bh))
return bh;
return bh;
if (buffer_uptodate(bh))
return bh;
- ll_rw_block(READ
_META
, 1, &bh);
+ ll_rw_block(READ
| REQ_META | REQ_PRIO
, 1, &bh);
wait_on_buffer(bh);
if (buffer_uptodate(bh))
return bh;
wait_on_buffer(bh);
if (buffer_uptodate(bh))
return bh;
@@
-2807,7
+2807,7
@@
make_io:
trace_ext3_load_inode(inode);
get_bh(bh);
bh->b_end_io = end_buffer_read_sync;
trace_ext3_load_inode(inode);
get_bh(bh);
bh->b_end_io = end_buffer_read_sync;
- submit_bh(READ
_META
, bh);
+ submit_bh(READ
| REQ_META | REQ_PRIO
, bh);
wait_on_buffer(bh);
if (!buffer_uptodate(bh)) {
ext3_error(inode->i_sb, "ext3_get_inode_loc",
wait_on_buffer(bh);
if (!buffer_uptodate(bh)) {
ext3_error(inode->i_sb, "ext3_get_inode_loc",