From 63b960bdb5dbe3d323b8e8141d36c4189e551436 Mon Sep 17 00:00:00 2001
From: Ayan George <ayan@ayan.net>
Date: Wed, 21 Sep 2011 10:02:13 +0200
Subject: [PATCH] --- yaml --- r: 273831 b: refs/heads/master c:
 4c823cc3d568277aa6340d8df6981e34f4c4dee5 h: refs/heads/master i:   273829:
 c4751f191c363d187d485169df8287264147cb6f   273827:
 efcaf7bedf368fe00a8290bd9f57e820e67fe16f   273823:
 9ed03d56b4878629693d2f88ce91622d0391d5e8 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/loop.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4cd8495e75e0..b9959e8249b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a9c594422ecad912d6470888acdee9a1236ad68
+refs/heads/master: 4c823cc3d568277aa6340d8df6981e34f4c4dee5
diff --git a/trunk/drivers/block/loop.c b/trunk/drivers/block/loop.c
index c2ce03cf3a58..9b2f5d3c19ab 100644
--- a/trunk/drivers/block/loop.c
+++ b/trunk/drivers/block/loop.c
@@ -1051,10 +1051,11 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
 	return err;
 }
 
-static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
+static int loop_clr_fd(struct loop_device *lo)
 {
 	struct file *filp = lo->lo_backing_file;
 	gfp_t gfp = lo->old_gfp_mask;
+	struct block_device *bdev = lo->lo_device;
 
 	if (lo->lo_state != Lo_bound)
 		return -ENXIO;
@@ -1372,7 +1373,7 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode,
 		break;
 	case LOOP_CLR_FD:
 		/* loop_clr_fd would have unlocked lo_ctl_mutex on success */
-		err = loop_clr_fd(lo, bdev);
+		err = loop_clr_fd(lo);
 		if (!err)
 			goto out_unlocked;
 		break;
@@ -1583,7 +1584,7 @@ static int lo_release(struct gendisk *disk, fmode_t mode)
 		 * In autoclear mode, stop the loop thread
 		 * and remove configuration after last close.
 		 */
-		err = loop_clr_fd(lo, lo->lo_device);
+		err = loop_clr_fd(lo);
 		if (!err)
 			goto out_unlocked;
 	} else {