diff options
author | Dmitry Monakhov <dmonakhov@openvz.org> | 2014-04-21 14:38:14 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2014-04-21 14:38:14 -0400 |
commit | 236f5ecb4a5876977837376729a7599cc1ab2cc3 (patch) | |
tree | db7ff74917eb549cf1748a76e040ec89f0f33680 /fs | |
parent | 202ee5df38b33f7ea28286807a0b548b49613194 (diff) |
ext4: remove obsoleted check
BH can not be NULL at this point, ext4_read_dirblock() always return
non null value, and we already have done all necessery checks.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/namei.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 1cb84f78909e..a683f958f128 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c | |||
@@ -2510,8 +2510,7 @@ static int empty_dir(struct inode *inode) | |||
2510 | ext4_rec_len_from_disk(de1->rec_len, sb->s_blocksize); | 2510 | ext4_rec_len_from_disk(de1->rec_len, sb->s_blocksize); |
2511 | de = ext4_next_entry(de1, sb->s_blocksize); | 2511 | de = ext4_next_entry(de1, sb->s_blocksize); |
2512 | while (offset < inode->i_size) { | 2512 | while (offset < inode->i_size) { |
2513 | if (!bh || | 2513 | if ((void *) de >= (void *) (bh->b_data+sb->s_blocksize)) { |
2514 | (void *) de >= (void *) (bh->b_data+sb->s_blocksize)) { | ||
2515 | unsigned int lblock; | 2514 | unsigned int lblock; |
2516 | err = 0; | 2515 | err = 0; |
2517 | brelse(bh); | 2516 | brelse(bh); |