Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d57c0a6 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

f2fs: Move err variable to function scope in f2fs_fill_dentries() 



This is preparation for the following backported fixes.  It was done
upstream as part of commit e1293bdfa01d "f2fs: plug readahead IO in
readdir()", the rest of which does not seem suitable for stable.

Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Chao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f483142

fs/f2fs/dir.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -785,6 +785,7 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, 
	struct f2fs_dir_entry *de = NULL;

	struct f2fs_dir_entry *de = NULL;

	struct fscrypt_str de_name = FSTR_INIT(NULL, 0);

	struct fscrypt_str de_name = FSTR_INIT(NULL, 0);

	struct f2fs_sb_info *sbi = F2FS_I_SB(d->inode);

	struct f2fs_sb_info *sbi = F2FS_I_SB(d->inode);

	int err = 0;





	bit_pos = ((unsigned long)ctx->pos % d->max);

	bit_pos = ((unsigned long)ctx->pos % d->max);
@@ -807,7 +808,6 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, 




		if (f2fs_encrypted_inode(d->inode)) {

		if (f2fs_encrypted_inode(d->inode)) {

			int save_len = fstr->len;

			int save_len = fstr->len;

			int err;





			err = fscrypt_fname_disk_to_usr(d->inode,

			err = fscrypt_fname_disk_to_usr(d->inode,

						(u32)de->hash_code, 0,

						(u32)de->hash_code, 0,
@@ -829,7 +829,8 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, 
		bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len));

		bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len));

		ctx->pos = start_pos + bit_pos;

		ctx->pos = start_pos + bit_pos;

	}

	}

	return 0;

out:

	return err;

}

}





static int f2fs_readdir(struct file *file, struct dir_context *ctx)

static int f2fs_readdir(struct file *file, struct dir_context *ctx)