---

yaml --- r: 233639 b: refs/heads/master c: 3c522ce h: refs/heads/master i: 233637: 3089ab0 233635: 0aef3c8 233631: 55df1d4 v: v3
git-mirror · Feb 24, 2011 · af51f25 · af51f25
1 parent 07d43ea
commit af51f25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcace5ac85c628af21878a1fa151e5e6403fb8eb
+refs/heads/master: 3c522cedb572bb8d2e4867f358bdaa7d0c53d88c
diff --git a/trunk/block/ioctl.c b/trunk/block/ioctl.c
@@ -294,9 +294,11 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
 			return -EINVAL;
 		if (get_user(n, (int __user *) arg))
 			return -EFAULT;
-		if (!(mode & FMODE_EXCL) &&
-		    blkdev_get(bdev, mode | FMODE_EXCL, &bdev) < 0)
-			return -EBUSY;
+		if (!(mode & FMODE_EXCL)) {
+			bdgrab(bdev);
+			if (blkdev_get(bdev, mode | FMODE_EXCL, &bdev) < 0)
+				return -EBUSY;
+		}
 		ret = set_blocksize(bdev, n);
 		if (!(mode & FMODE_EXCL))
 			blkdev_put(bdev, mode | FMODE_EXCL);