diff options
author | Theodore Ts'o <tytso@mit.edu> | 2014-08-29 20:52:15 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2014-08-29 20:52:15 -0400 |
commit | 1c2150283cae895526d0db3953d13d139f4e7a03 (patch) | |
tree | 056daeae23f869aab5bbaec535ebe3eee5f19c35 /fs/ext4/dir.c | |
parent | 1056008226769fe982236c26038a095aeb47714b (diff) |
ext4: convert ext4_bread() to use the ERR_PTR convention
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/dir.c')
-rw-r--r-- | fs/ext4/dir.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 0bb3f9ea0832..c24143ea9c08 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c | |||
@@ -151,13 +151,11 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) | |||
151 | &file->f_ra, file, | 151 | &file->f_ra, file, |
152 | index, 1); | 152 | index, 1); |
153 | file->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT; | 153 | file->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT; |
154 | bh = ext4_bread(NULL, inode, map.m_lblk, 0, &err); | 154 | bh = ext4_bread(NULL, inode, map.m_lblk, 0); |
155 | if (IS_ERR(bh)) | ||
156 | return PTR_ERR(bh); | ||
155 | } | 157 | } |
156 | 158 | ||
157 | /* | ||
158 | * We ignore I/O errors on directories so users have a chance | ||
159 | * of recovering data when there's a bad sector | ||
160 | */ | ||
161 | if (!bh) { | 159 | if (!bh) { |
162 | if (!dir_has_error) { | 160 | if (!dir_has_error) { |
163 | EXT4_ERROR_FILE(file, 0, | 161 | EXT4_ERROR_FILE(file, 0, |