summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/crypto/fname.c11
-rw-r--r--include/linux/fscrypt.h11
2 files changed, 11 insertions, 11 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c
index 6eb434363ff2..bce476dc2c65 100644
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
@@ -14,6 +14,17 @@
#include <linux/ratelimit.h>
#include "fscrypt_private.h"
+static inline bool fscrypt_is_dot_dotdot(const struct qstr *str)
+{
+ if (str->len == 1 && str->name[0] == '.')
+ return true;
+
+ if (str->len == 2 && str->name[0] == '.' && str->name[1] == '.')
+ return true;
+
+ return false;
+}
+
/**
* fname_encrypt() - encrypt a filename
*
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
index b03cb23728ea..f71d6326936e 100644
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
@@ -53,17 +53,6 @@ struct fscrypt_name {
#define fname_name(p) ((p)->disk_name.name)
#define fname_len(p) ((p)->disk_name.len)
-static inline bool fscrypt_is_dot_dotdot(const struct qstr *str)
-{
- if (str->len == 1 && str->name[0] == '.')
- return true;
-
- if (str->len == 2 && str->name[0] == '.' && str->name[1] == '.')
- return true;
-
- return false;
-}
-
#if __FS_HAS_ENCRYPTION
#include <linux/fscrypt_supp.h>
#else