From mboxrd@z Thu Jan 1 00:00:00 1970 From: Damien Le Moal Date: Fri, 15 Apr 2022 14:09:42 +0900 Subject: [Cluster-devel] [PATCH 10/27] mm: use bdev_is_zoned in claim_swapfile In-Reply-To: <20220415045258.199825-11-hch@lst.de> References: <20220415045258.199825-1-hch@lst.de> <20220415045258.199825-11-hch@lst.de> Message-ID: <62ebc311-e5ef-cea5-5236-0c83d1a3eb64@opensource.wdc.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On 4/15/22 13:52, Christoph Hellwig wrote: > Use the bdev based helper instead of poking into the queue. > > Signed-off-by: Christoph Hellwig > --- > mm/swapfile.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 63c61f8b26118..4c7537162af5e 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)) { Looks good. Reviewed-by: Damien Le Moal -- Damien Le Moal Western Digital Research