From: Christoph Hellwig <hch@lst.de>
Date: Sun, 27 Mar 2022 07:27:35 +0000 (+0200)
Subject: mm: use bdev_is_zoned in claim_swapfile
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d543d2858222b5d7644adcc2096bd1ccffade1a7;p=users%2Fhch%2Fblock.git

mm: use bdev_is_zoned in claim_swapfile

Use the bdev based helper instead of poking into the queue.

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

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 63c61f8b2611..4c7537162af5 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2761,7 +2761,7 @@ static int claim_swapfile(struct swap_info_struct *p, struct inode *inode)
 		 * write only restriction.  Hence zoned block devices are not
 		 * suitable for swapping.  Disallow them here.
 		 */
-		if (blk_queue_is_zoned(p->bdev->bd_disk->queue))
+		if (bdev_is_zoned(p->bdev))
 			return -EINVAL;
 		p->flags |= SWP_BLKDEV;
 	} else if (S_ISREG(inode->i_mode)) {