* [merged mm-stable] udf-replace-ll_rw_block.patch removed from -mm tree
@ 2022-09-12 3:30 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2022-09-12 3:30 UTC (permalink / raw)
To: mm-commits, hch, yi.zhang, akpm
The quilt patch titled
Subject: udf: replace ll_rw_block()
has been removed from the -mm tree. Its filename was
udf-replace-ll_rw_block.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Zhang Yi <yi.zhang@huawei.com>
Subject: udf: replace ll_rw_block()
Date: Thu, 1 Sep 2022 21:35:01 +0800
ll_rw_block() is not safe for the sync read path because it cannot
guarantee that submitting read IO if the buffer has been locked. We
could get false positive EIO after wait_on_buffer() if the buffer has
been locked by others. So stop using ll_rw_block(). We also switch to
new bh_readahead_batch() helper for the buffer array readahead path.
Link: https://lkml.kernel.org/r/20220901133505.2510834-11-yi.zhang@huawei.com
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/udf/dir.c | 2 +-
fs/udf/directory.c | 2 +-
fs/udf/inode.c | 8 +-------
3 files changed, 3 insertions(+), 9 deletions(-)
--- a/fs/udf/dir.c~udf-replace-ll_rw_block
+++ a/fs/udf/dir.c
@@ -130,7 +130,7 @@ static int udf_readdir(struct file *file
brelse(tmp);
}
if (num) {
- ll_rw_block(REQ_OP_READ | REQ_RAHEAD, num, bha);
+ bh_readahead_batch(num, bha, REQ_RAHEAD);
for (i = 0; i < num; i++)
brelse(bha[i]);
}
--- a/fs/udf/directory.c~udf-replace-ll_rw_block
+++ a/fs/udf/directory.c
@@ -89,7 +89,7 @@ struct fileIdentDesc *udf_fileident_read
brelse(tmp);
}
if (num) {
- ll_rw_block(REQ_OP_READ | REQ_RAHEAD, num, bha);
+ bh_readahead_batch(num, bha, REQ_RAHEAD);
for (i = 0; i < num; i++)
brelse(bha[i]);
}
--- a/fs/udf/inode.c~udf-replace-ll_rw_block
+++ a/fs/udf/inode.c
@@ -1211,13 +1211,7 @@ struct buffer_head *udf_bread(struct ino
if (!bh)
return NULL;
- if (buffer_uptodate(bh))
- return bh;
-
- ll_rw_block(REQ_OP_READ, 1, &bh);
-
- wait_on_buffer(bh);
- if (buffer_uptodate(bh))
+ if (bh_read(bh, 0) >= 0)
return bh;
brelse(bh);
_
Patches currently in -mm which might be from yi.zhang@huawei.com are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-09-12 3:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-12 3:30 [merged mm-stable] udf-replace-ll_rw_block.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.