Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-linus

[linux-2.6-block.git] / fs / ubifs / crypto.c

diff --git a/fs/ubifs/crypto.c b/fs/ubifs/crypto.c
index 616a688f5d8fd738369b96de15a0c6f27689dce8..55c508fe8131577e77aae83865cee6b4effc0513 100644 (file)
--- a/fs/ubifs/crypto.c
+++ b/fs/ubifs/crypto.c
@@ -24,14 +24,6 @@ static bool ubifs_crypt_empty_dir(struct inode *inode)
        return ubifs_check_dir_empty(inode) == 0;
 }
 
-static unsigned int ubifs_crypt_max_namelen(struct inode *inode)
-{
-       if (S_ISLNK(inode->i_mode))
-               return UBIFS_MAX_INO_DATA;
-       else
-               return UBIFS_MAX_NLEN;
-}
-
 int ubifs_encrypt(const struct inode *inode, struct ubifs_data_node *dn,
                  unsigned int in_len, unsigned int *out_len, int block)
 {
@@ -89,5 +81,5 @@ const struct fscrypt_operations ubifs_crypt_operations = {
        .get_context            = ubifs_crypt_get_context,
        .set_context            = ubifs_crypt_set_context,
        .empty_dir              = ubifs_crypt_empty_dir,
-       .max_namelen            = ubifs_crypt_max_namelen,
+       .max_namelen            = UBIFS_MAX_NLEN,
 };