From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Sep 2011 20:20:21 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: v3.1-rc7~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=fed678dc8a8b839c8189b5d889a94e865cd327dd;hp=-c

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

* 'for-linus' of git://git.kernel.dk/linux-block:
  floppy: use del_timer_sync() in init cleanup
  blk-cgroup: be able to remove the record of unplugged device
  block: Don't check QUEUE_FLAG_SAME_COMP in __blk_complete_request
  mm: Add comment explaining task state setting in bdi_forker_thread()
  mm: Cleanup clearing of BDI_pending bit in bdi_forker_thread()
  block: simplify force plug flush code a little bit
  block: change force plug flush call order
  block: Fix queue_flag update when rq_affinity goes from 2 to 1
  block: separate priority boosting from REQ_META
  block: remove READ_META and WRITE_META
  xen-blkback: fixed indentation and comments
  xen-blkback: Don't disconnect backend until state switched to XenbusStateClosed.
---

fed678dc8a8b839c8189b5d889a94e865cd327dd
diff --combined fs/ext4/inode.c
index 18d2558b7624,c7cbb3d85d9e..986e2388f031
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@@ -121,6 -121,9 +121,6 @@@ void ext4_evict_inode(struct inode *ino
  
  	trace_ext4_evict_inode(inode);
  
 -	mutex_lock(&inode->i_mutex);
 -	ext4_flush_completed_IO(inode);
 -	mutex_unlock(&inode->i_mutex);
  	ext4_ioend_wait(inode);
  
  	if (inode->i_nlink) {
@@@ -647,7 -650,7 +647,7 @@@ struct buffer_head *ext4_bread(handle_
  		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 -3301,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,
diff --combined include/linux/fs.h
index c2bd68f2277a,eae44c981173..277f497923a2
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -162,10 -162,8 +162,8 @@@ struct inodes_stat_t 
  #define READA			RWA_MASK
  
  #define READ_SYNC		(READ | REQ_SYNC)
- #define READ_META		(READ | REQ_META)
  #define WRITE_SYNC		(WRITE | REQ_SYNC | REQ_NOIDLE)
  #define WRITE_ODIRECT		(WRITE | REQ_SYNC)
- #define WRITE_META		(WRITE | REQ_META)
  #define WRITE_FLUSH		(WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FLUSH)
  #define WRITE_FUA		(WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FUA)
  #define WRITE_FLUSH_FUA		(WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FLUSH | REQ_FUA)
@@@ -2318,11 -2316,6 +2316,11 @@@ extern struct inode * iget5_locked(stru
  extern struct inode * iget_locked(struct super_block *, unsigned long);
  extern int insert_inode_locked4(struct inode *, unsigned long, int (*test)(struct inode *, void *), void *);
  extern int insert_inode_locked(struct inode *);
 +#ifdef CONFIG_DEBUG_LOCK_ALLOC
 +extern void lockdep_annotate_inode_mutex_key(struct inode *inode);
 +#else
 +static inline void lockdep_annotate_inode_mutex_key(struct inode *inode) { };
 +#endif
  extern void unlock_new_inode(struct inode *);
  extern unsigned int get_next_ino(void);