4 files changed, 6 insertions, 20 deletions

diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c
index c115eac4b4cf..05f5ee1f0705 100644
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -355,19 +355,9 @@ out:
 }
 EXPORT_SYMBOL(fscrypt_get_encryption_info);
 
-void fscrypt_put_encryption_info(struct inode *inode, struct fscrypt_info *ci)
+void fscrypt_put_encryption_info(struct inode *inode)
 {
-        struct fscrypt_info *prev;
-
-        if (ci == NULL)
-                ci = READ_ONCE(inode->i_crypt_info);
-        if (ci == NULL)
-                return;
-
-        prev = cmpxchg(&inode->i_crypt_info, ci, NULL);
-        if (prev != ci)
-                return;
-
-        put_crypt_info(ci);
+        put_crypt_info(inode->i_crypt_info);
+        inode->i_crypt_info = NULL;
 }
 EXPORT_SYMBOL(fscrypt_put_encryption_info);
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 7c46693a14d7..152d05d983f6 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1069,9 +1069,7 @@ void ext4_clear_inode(struct inode *inode)
                 jbd2_free_inode(EXT4_I(inode)->jinode);
                 EXT4_I(inode)->jinode = NULL;
         }
-#ifdef CONFIG_EXT4_FS_ENCRYPTION
-        fscrypt_put_encryption_info(inode, NULL);
-#endif
+        fscrypt_put_encryption_info(inode);
 }
 
 static struct inode *ext4_nfs_get_inode(struct super_block *sb,
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index b4c4f2b25304..22a5607a0518 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -569,7 +569,7 @@ no_delete:
                         !exist_written_data(sbi, inode->i_ino, ORPHAN_INO));
         }
 out_clear:
-        fscrypt_put_encryption_info(inode, NULL);
+        fscrypt_put_encryption_info(inode);
         clear_inode(inode);
 }
 
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 0beb285b143d..b16ef162344a 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -379,9 +379,7 @@ out:
         }
 done:
         clear_inode(inode);
-#ifdef CONFIG_UBIFS_FS_ENCRYPTION
-        fscrypt_put_encryption_info(inode, NULL);
-#endif
+        fscrypt_put_encryption_info(inode);
 }
 
 static void ubifs_dirty_inode(struct inode *inode, int flags)