f2fs: clean up error path in f2fs_readdir

PATCH New Chao Yu 1 participant 1 message Dec 1, 2015 F2FS file system

lore

Share & tools

lore

Chao Yu

author

2015-12-01 03:41 UTC #0 lore raw

PATCH 1/3 f2fs: clean up error path in f2fs_readdir

No logic changes, just clean up the error path.

Signed-off-by Chao Yu <[email protected]>

---
 fs/f2fs/dir.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

fs/f2fs/dir.c +5 -8

index 9de898d..6554fd5 100644
@@ -867,18 +867,15 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
 
 		make_dentry_ptr(inode, &d, (void *)dentry_blk, 1);
 
-		if (f2fs_fill_dentries(ctx, &d, n * NR_DENTRY_IN_BLOCK, &fstr))
-			goto stop;
+		if (f2fs_fill_dentries(ctx, &d, n * NR_DENTRY_IN_BLOCK, &fstr)) {
+			kunmap(dentry_page);
+			f2fs_put_page(dentry_page, 1);
+			break;
+		}
 
 		ctx->pos = (n + 1) * NR_DENTRY_IN_BLOCK;
 		kunmap(dentry_page);
 		f2fs_put_page(dentry_page, 1);
-		dentry_page = NULL;
-	}
-stop:
-	if (dentry_page && !IS_ERR(dentry_page)) {
-		kunmap(dentry_page);
-		f2fs_put_page(dentry_page, 1);
 	}
 out:
 	f2fs_fname_crypto_free_buffer(&fstr);

Signature · 1 line

2.6.3