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) | |
| download | linux-1c2150283cae895526d0db3953d13d139f4e7a03.tar.bz2 | |
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) &file->f_ra, file, index, 1); file->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT; - bh = ext4_bread(NULL, inode, map.m_lblk, 0, &err); + bh = ext4_bread(NULL, inode, map.m_lblk, 0); + if (IS_ERR(bh)) + return PTR_ERR(bh); } - /* - * We ignore I/O errors on directories so users have a chance - * of recovering data when there's a bad sector - */ if (!bh) { if (!dir_has_error) { EXT4_ERROR_FILE(file, 0, |