summaryrefslogtreecommitdiff
path: root/fs/ocfs2/dir.c
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2018-11-27 08:23:56 +0300
committerJoel Stanley <joel@jms.id.au>2018-11-27 08:24:09 +0300
commitd608acfd4ac3fe17f3081bee8fcd4dcd896c2ffa (patch)
treeade4450a72a2e358a1d2e5cde321de0097fb291c /fs/ocfs2/dir.c
parent62ccc3924eff37012bd0c227d8b7dc71188fc358 (diff)
parenta9da8725b7a744be3ff0ff44cab2547e4d1e6675 (diff)
downloadlinux-dev-4.18.tar.xz
Merge tag 'v4.18.20' into dev-4.18dev-4.18
This is the 4.18.20 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'fs/ocfs2/dir.c')
-rw-r--r--fs/ocfs2/dir.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index b048d4fa3959..c121abbdfc7d 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -1897,8 +1897,7 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,
/* On error, skip the f_pos to the
next block. */
ctx->pos = (ctx->pos | (sb->s_blocksize - 1)) + 1;
- brelse(bh);
- continue;
+ break;
}
if (le64_to_cpu(de->inode)) {
unsigned char d_type = DT_UNKNOWN;