From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Apr 2013 02:16:20 +0000 (+1100)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: next-20130404~58
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3d82c8aa4dc9f2df228818f7c293199c0b82c6bd;p=karo-tx-linux.git

Merge remote-tracking branch 'block/for-next'

Conflicts:
	drivers/block/drbd/drbd_proc.c
---

3d82c8aa4dc9f2df228818f7c293199c0b82c6bd
diff --cc drivers/block/drbd/drbd_proc.c
index 928adb815b09,30fe0a57f5a0..bf31d41dbaad
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@@ -313,8 -313,14 +313,14 @@@ static int drbd_seq_show(struct seq_fil
  
  static int drbd_proc_open(struct inode *inode, struct file *file)
  {
- 	if (try_module_get(THIS_MODULE))
- 		return single_open(file, drbd_seq_show, PDE_DATA(inode));
+ 	int err;
+ 
+ 	if (try_module_get(THIS_MODULE)) {
 -		err = single_open(file, drbd_seq_show, PDE(inode)->data);
++		err = single_open(file, drbd_seq_show, PDE_DATA(inode));
+ 		if (err)
+ 			module_put(THIS_MODULE);
+ 		return err;
+ 	}
  	return -ENODEV;
  }