mm: cleanup claim_swapfile

Use blkdev_get_by_dev instead of bdgrab + blkdev_get.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 12f59e641b5e295cf3c97eb0e8bed962af1e4d35..7438c4affc75fa820010a3f52e9974be101296ae 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2920,10 +2920,10 @@ static int claim_swapfile(struct swap_info_struct *p, struct inode *inode)
        int error;
 
        if (S_ISBLK(inode->i_mode)) {
-               p->bdev = bdgrab(I_BDEV(inode));
-               error = blkdev_get(p->bdev,
+               p->bdev = blkdev_get_by_dev(inode->i_rdev,
                                   FMODE_READ | FMODE_WRITE | FMODE_EXCL, p);
-               if (error < 0) {
+               if (IS_ERR(p->bdev)) {
+                       error = PTR_ERR(p->bdev);
                        p->bdev = NULL;
                        return error;
                }