From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sat, 30 Oct 2010 11:35:11 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: v2.6.37-rc1~22^2~2
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=67577927e8d7a1f4b09b4992df640eadc6aacb36

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

67577927e8d7a1f4b09b4992df640eadc6aacb36
diff --cc drivers/mtd/mtd_blkdevs.c
index 63790e975d2,50ab431b24e..f9329794f3b
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@@ -185,19 -181,20 +185,20 @@@ static int blktrans_open(struct block_d
  	if (!dev)
  		return -ERESTARTSYS; /* FIXME: busy loop! -arnd*/
  
+ 	mutex_lock(&mtd_blkdevs_mutex);
  	mutex_lock(&dev->lock);
  
 -	if (!dev->mtd) {
 -		ret = -ENXIO;
 +	if (dev->open++)
  		goto unlock;
 -	}
  
 -	ret = !dev->open++ && dev->tr->open ? dev->tr->open(dev) : 0;
 +	kref_get(&dev->ref);
 +	__module_get(dev->tr->owner);
 +
 +	if (dev->mtd) {
 +		ret = dev->tr->open ? dev->tr->open(dev) : 0;
 +		__get_mtd_device(dev->mtd);
 +	}
  
 -	/* Take another reference on the device so it won't go away till
 -		last release */
 -	if (!ret)
 -		kref_get(&dev->ref);
  unlock:
  	mutex_unlock(&dev->lock);
  	blktrans_dev_put(dev);
@@@ -212,18 -210,16 +214,19 @@@ static int blktrans_release(struct gend
  	if (!dev)
  		return ret;
  
+ 	mutex_lock(&mtd_blkdevs_mutex);
  	mutex_lock(&dev->lock);
  
 -	/* Release one reference, we sure its not the last one here*/
 -	kref_put(&dev->ref, blktrans_dev_release);
 -
 -	if (!dev->mtd)
 +	if (--dev->open)
  		goto unlock;
  
 -	ret = !--dev->open && dev->tr->release ? dev->tr->release(dev) : 0;
 +	kref_put(&dev->ref, blktrans_dev_release);
 +	module_put(dev->tr->owner);
 +
 +	if (dev->mtd) {
 +		ret = dev->tr->release ? dev->tr->release(dev) : 0;
 +		__put_mtd_device(dev->mtd);
 +	}
  unlock:
  	mutex_unlock(&dev->lock);
  	blktrans_dev_put(dev);