summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorDmitry Monakhov <dmonakhov@openvz.org>2014-04-21 14:38:14 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-04-21 14:38:14 -0400
commit236f5ecb4a5876977837376729a7599cc1ab2cc3 (patch)
treedb7ff74917eb549cf1748a76e040ec89f0f33680 /fs/ext4
parent202ee5df38b33f7ea28286807a0b548b49613194 (diff)
downloadop-kernel-dev-236f5ecb4a5876977837376729a7599cc1ab2cc3.zip
op-kernel-dev-236f5ecb4a5876977837376729a7599cc1ab2cc3.tar.gz
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/ext4')
-rw-r--r--fs/ext4/namei.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 1cb84f7..a683f95 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2510,8 +2510,7 @@ static int empty_dir(struct inode *inode)
ext4_rec_len_from_disk(de1->rec_len, sb->s_blocksize);
de = ext4_next_entry(de1, sb->s_blocksize);
while (offset < inode->i_size) {
- if (!bh ||
- (void *) de >= (void *) (bh->b_data+sb->s_blocksize)) {
+ if ((void *) de >= (void *) (bh->b_data+sb->s_blocksize)) {
unsigned int lblock;
err = 0;
brelse(bh);
OpenPOWER on IntegriCloud