From: Jens Axboe Date: Tue, 9 May 2023 15:19:09 +0000 (-0600) Subject: block: mark bdev files as FMODE_NOWAIT if underlying device supports it X-Git-Tag: v6.6.17~4627^2~37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9833d8701028b5dd62895e68f4a280aad359172;p=platform%2Fkernel%2Flinux-rpi.git block: mark bdev files as FMODE_NOWAIT if underlying device supports it We set this unconditionally, but it really should be dependent on if the underlying device is nowait compliant. Cc: linux-block@vger.kernel.org Reviewed-by: Christoph Hellwig Link: https://lore.kernel.org/r/20230509151910.183637-3-axboe@kernel.dk Signed-off-by: Jens Axboe --- diff --git a/block/fops.c b/block/fops.c index d2e6be4..ab750e8 100644 --- a/block/fops.c +++ b/block/fops.c @@ -481,7 +481,7 @@ static int blkdev_open(struct inode *inode, struct file *filp) * during an unstable branch. */ filp->f_flags |= O_LARGEFILE; - filp->f_mode |= FMODE_NOWAIT | FMODE_BUF_RASYNC; + filp->f_mode |= FMODE_BUF_RASYNC; if (filp->f_flags & O_NDELAY) filp->f_mode |= FMODE_NDELAY; @@ -494,6 +494,9 @@ static int blkdev_open(struct inode *inode, struct file *filp) if (IS_ERR(bdev)) return PTR_ERR(bdev); + if (bdev_nowait(bdev)) + filp->f_mode |= FMODE_NOWAIT; + filp->private_data = bdev; filp->f_mapping = bdev->bd_inode->i_mapping; filp->f_wb_err = filemap_sample_wb_err(filp->f_mapping);