diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:07:41 +0200 | 
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:07:41 +0200 | 
| commit | 8efc59ad6764ade520012cb192cd484e5191cd9c (patch) | |
| tree | d2465d91ebb2652e35cd08f715fc202b3f9e042a /fs/ext4/inode.c | |
| parent | 6f6184a9d01880a3e21349544f73b3720ce5e152 (diff) | |
| parent | 492c4a0df11573e141a2decc6012b3bddd14a11e (diff) | |
| download | olio-linux-3.10-8efc59ad6764ade520012cb192cd484e5191cd9c.tar.xz olio-linux-3.10-8efc59ad6764ade520012cb192cd484e5191cd9c.zip  | |
Merge branch 'sirf/cleanup' into next/cleanup
Diffstat (limited to 'fs/ext4/inode.c')
| -rw-r--r-- | fs/ext4/inode.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 18d2558b762..986e2388f03 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -647,7 +647,7 @@ struct buffer_head *ext4_bread(handle_t *handle, struct inode *inode,  		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; @@ -3298,7 +3298,7 @@ make_io:  		trace_ext4_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)) {  			EXT4_ERROR_INODE_BLOCK(inode, block,  |