Skip to content

Commit

Permalink
drivers/block/loop.c: remove unnecessary bdev argument from loop_clr_…
Browse files Browse the repository at this point in the history
…fd()

If the loop device is associated (lo->lo_state == Lo_bound), it will have
a valid bdev pointed to by lo->lo_device.  There is no reason to ever pass
an additional block_device pointer.

Signed-off-by: Ayan George <ayan.george@canonical.com>
Cc: Phillip Susi <psusi@cfl.rr.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@google.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Ayan George authored and Jens Axboe committed Sep 21, 2011
1 parent 8a9c594 commit 4c823cc
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/block/loop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 4c823cc

Please sign in to comment.