Merge branch 'linus' into locking/core, to resolve conflicts

[linux-2.6-microblaze.git] / fs / crypto / keyinfo.c

diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c
index a386302..577dfaf 100644 (file)
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -374,7 +374,7 @@ void fscrypt_put_encryption_info(struct inode *inode, struct fscrypt_info *ci)
        struct fscrypt_info *prev;
 
        if (ci == NULL)
-               ci = ACCESS_ONCE(inode->i_crypt_info);
+               ci = READ_ONCE(inode->i_crypt_info);
        if (ci == NULL)
                return;