Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[mirror_ubuntu-bionic-kernel.git] / fs / f2fs / dir.c

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index cbf85f65ba63f0b4f0c98de9e7e6f94d975fb5b9..12b5836a1033f0ed7611dbd2fd776930e6a06035 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -813,12 +813,12 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,
 
                if (f2fs_encrypted_inode(d->inode)) {
                        int save_len = fstr->len;
-                       int ret;
+                       int err;
 
-                       ret = fscrypt_fname_disk_to_usr(d->inode,
+                       err = fscrypt_fname_disk_to_usr(d->inode,
                                                (u32)de->hash_code, 0,
                                                &de_name, fstr);
-                       if (ret < 0)
+                       if (err)
                                return true;
 
                        de_name = *fstr;