From: Christoph Hellwig <hch@lst.de>
Date: Mon, 21 Sep 2020 07:19:54 +0000 (+0200)
Subject: mm: cleanup claim_swapfile
X-Git-Tag: baikal/aarch64/sdk6.1~8205^2~68
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=686046e61ef9d1567e34d9d86aa405b0c183c7bb;p=kernel.git

mm: cleanup claim_swapfile

Use blkdev_get_by_dev instead of bdgrab + blkdev_get.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 12f59e641b5e2..7438c4affc75f 100644
--- 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;
 		}