Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1673128

[PATCH] ext4: Return EIO on read error in ext4_find_entry

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Previously, a read error would be ignored and we would eventually return
NULL from ext4_find_entry, which signals "no such file or directory". We
should be returning EIO.

Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
---
 fs/ext4/namei.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 404256caf9cf..6fa17e9f7b6d 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1428,11 +1428,11 @@ static struct buffer_head * ext4_find_entry (struct inode *dir,
 			goto next;
 		wait_on_buffer(bh);
 		if (!buffer_uptodate(bh)) {
-			/* read error, skip block & hope for the best */
 			EXT4_ERROR_INODE(dir, "reading directory lblock %lu",
 					 (unsigned long) block);
 			brelse(bh);
-			goto next;
+			ret = ERR_PTR(-EIO);
+			goto cleanup_and_exit;
 		}
 		if (!buffer_verified(bh) &&
 		    !is_dx_internal_node(dir, block,
-- 
2.13.1.611.g7e3b11ae1-goog

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] ext4: Return EIO on read error in ext4_find_entry Khazhismel Kumykov <khazhy@google.com> - 2017-06-23 01:30 +0200
  Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Theodore Ts'o <tytso@mit.edu> - 2017-06-23 06:50 +0200
    Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Andreas Dilger <adilger@dilger.ca> - 2017-06-23 09:00 +0200
      Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Theodore Ts'o <tytso@mit.edu> - 2017-06-23 14:30 +0200
        Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Andreas Dilger <adilger@dilger.ca> - 2017-06-23 23:40 +0200
          Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Khazhismel Kumykov <khazhy@google.com> - 2017-06-24 00:40 +0200
            Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Theodore Ts'o <tytso@mit.edu> - 2017-06-24 01:30 +0200
              Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Andreas Dilger <adilger@dilger.ca> - 2017-06-24 01:40 +0200
                Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Theodore Ts'o <tytso@mit.edu> - 2017-06-24 02:30 +0200
                Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Tahsin Erdogan <tahsin@google.com> - 2017-06-26 21:30 +0200
                Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Andreas Dilger <adilger@dilger.ca> - 2017-06-26 22:50 +0200
        Re: [PATCH] ext4: Return EIO on read error in ext4_find_entry Pavel Machek <pavel@ucw.cz> - 2017-06-28 00:00 +0200

csiph-web