diff options
| author |   Theodore Ts'o <tytso@mit.edu> | 2014-08-29 20:51:32 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-08-29 20:51:32 -0400 |
| commit | 1056008226769fe982236c26038a095aeb47714b (patch) | |
| tree | 28a89f23fb0bcb514083c0e8dbb21ed4c6259d66 /fs/ext4/namei.c | |
| parent | ext4: convert ext4_dx_find_entry() to use the ERR_PTR convention (diff) | |
| download | linux-dev-1056008226769fe982236c26038a095aeb47714b.tar.xz linux-dev-1056008226769fe982236c26038a095aeb47714b.zip | |
ext4: convert ext4_getblk() to use the ERR_PTR convention
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/namei.c')
| -rw-r--r-- | fs/ext4/namei.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 1421ec1cd7e4..26f114b1e4d6 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1226,8 +1226,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, buffer */ int num = 0; ext4_lblk_t nblocks; - int i, err = 0; - int namelen; + int i, namelen; *res_dir = NULL; sb = dir->i_sb; @@ -1293,10 +1292,10 @@ restart: break; } num++; - bh = ext4_getblk(NULL, dir, b++, 0, &err); - if (unlikely(err)) { + bh = ext4_getblk(NULL, dir, b++, 0); + if (unlikely(IS_ERR(bh))) { if (ra_max == 0) - return ERR_PTR(err); + return bh; break; } bh_use[ra_max] = bh; |