linux-next: manual merge of the akpm-current tree with the gfs2 tree

linux-next: manual merge of the akpm-current tree with the gfs2 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/fs-writeback.c between commit 774016b2d455 ("GFS2: journal data
writepages update") from the gfs2 tree and commit c830ee18343d ("bdi:
avoid oops on device removal") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/fs-writeback.c
index 648d5db14e2c,a16315957ef3..000000000000
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@@ -89,8 -89,14 +89,16 @@@ static inline struct inode *wb_inode(st
  #define CREATE_TRACE_POINTS
  #include <trace/events/writeback.h>
  
 +EXPORT_TRACEPOINT_SYMBOL_GPL(wbc_writepage);
 +
+ static void bdi_wakeup_thread(struct backing_dev_info *bdi)
+ {
+ 	spin_lock_bh(&bdi->wb_lock);
+ 	if (test_bit(BDI_registered, &bdi->state))
+ 		mod_delayed_work(bdi_wq, &bdi->wb.dwork, 0);
+ 	spin_unlock_bh(&bdi->wb_lock);
+ }
+ 
  static void bdi_queue_work(struct backing_dev_info *bdi,
  			   struct wb_writeback_work *work)
  {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]