diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 20:06:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 20:06:35 -0800 |
| commit | ad0d9da164cb52e62637e427517b2060dc956a2d (patch) | |
| tree | 38883fca586da266024357ae86f296b5478b13a4 /fs/ext4 | |
| parent | 8129bac60f30936d2339535841db5b66d0520a67 (diff) | |
| parent | a4bbf53d88c728da9ff6c316b1e4ded63a8f3940 (diff) | |
| download | linux-ad0d9da164cb52e62637e427517b2060dc956a2d.tar.bz2 | |
Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
Pull fsverity updates from Eric Biggers:
"The main change this cycle is to stop using the PG_error flag to track
verity failures, and instead just track failures at the bio level.
This follows a similar fscrypt change that went into 6.1, and it is a
step towards freeing up PG_error for other uses.
There's also one other small cleanup"
* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
fsverity: simplify fsverity_get_digest()
fsverity: stop using PG_error to track error status
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/readpage.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c index 773176e7f9f5..d5266932ce6c 100644 --- a/fs/ext4/readpage.c +++ b/fs/ext4/readpage.c @@ -75,14 +75,10 @@ static void __read_end_io(struct bio *bio) bio_for_each_segment_all(bv, bio, iter_all) { page = bv->bv_page; - /* PG_error was set if verity failed. */ - if (bio->bi_status || PageError(page)) { + if (bio->bi_status) ClearPageUptodate(page); - /* will re-read again later */ - ClearPageError(page); - } else { + else SetPageUptodate(page); - } unlock_page(page); } if (bio->bi_private) |