Merge tag 'devicetree-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[linux.git] / fs / crypto / hooks.c

diff --git a/fs/crypto/hooks.c b/fs/crypto/hooks.c
index bd525f7573a49ce4f238848596627095adf14cbf..bb3b7fcfdd48a3b60ef5ca637050f21dd12967d1 100644 (file)
--- a/fs/crypto/hooks.c
+++ b/fs/crypto/hooks.c
@@ -5,7 +5,6 @@
  * Encryption hooks for higher-level filesystem operations.
  */
 
-#include <linux/ratelimit.h>
 #include "fscrypt_private.h"
 
 /**
@@ -40,9 +39,9 @@ int fscrypt_file_open(struct inode *inode, struct file *filp)
        dir = dget_parent(file_dentry(filp));
        if (IS_ENCRYPTED(d_inode(dir)) &&
            !fscrypt_has_permitted_context(d_inode(dir), inode)) {
-               fscrypt_warn(inode->i_sb,
-                            "inconsistent encryption contexts: %lu/%lu",
-                            d_inode(dir)->i_ino, inode->i_ino);
+               fscrypt_warn(inode,
+                            "Inconsistent encryption context (parent directory: %lu)",
+                            d_inode(dir)->i_ino);
                err = -EPERM;
        }
        dput(dir);