Merge tag 'pwm/for-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[deliverable/linux.git] / fs / f2fs / inode.c

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index d4477073dbb03344ba331c4a75b8fec569261b62..cb269c46ac254ff6f508f9bd21a79028d3ae754e 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -389,10 +389,7 @@ no_delete:
                }
        }
 out_clear:
-#ifdef CONFIG_F2FS_FS_ENCRYPTION
-       if (fi->i_crypt_info)
-               f2fs_free_encryption_info(inode, fi->i_crypt_info);
-#endif
+       fscrypt_put_encryption_info(inode, NULL);
        clear_inode(inode);
 }