From: Viacheslav Dubeyko <Slava.Dubeyko@xxxxxxx>
This patch introduces CEPH_HIDDEN_DIR_NAME. It
declares name of the hidden directory .ceph in
the include/linux/ceph/ceph_fs.h instead of hiding
it in dir.c file. Also hardcoded length of the name
is changed on strlen(CEPH_HIDDEN_DIR_NAME).
Signed-off-by: Viacheslav Dubeyko <Slava.Dubeyko@xxxxxxx>
---
fs/ceph/dir.c | 10 ++++++++--
include/linux/ceph/ceph_fs.h | 2 ++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 0bf388e07a02..5151c614b5cb 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -782,10 +782,16 @@ struct dentry *ceph_finish_lookup(struct ceph_mds_request *req,
return dentry;
}
+static inline
+bool is_hidden_ceph_dir(struct dentry *dentry)
+{
+ size_t len = strlen(CEPH_HIDDEN_DIR_NAME);
+ return strncmp(dentry->d_name.name, CEPH_HIDDEN_DIR_NAME, len) == 0;
+}
+
static bool is_root_ceph_dentry(struct inode *inode, struct dentry *dentry)
{
- return ceph_ino(inode) == CEPH_INO_ROOT &&
- strncmp(dentry->d_name.name, ".ceph", 5) == 0;
+ return ceph_ino(inode) == CEPH_INO_ROOT && is_hidden_ceph_dir(dentry);
}
/*
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index 2d7d86f0290d..84a1391aab29 100644
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -31,6 +31,8 @@
#define CEPH_INO_CEPH 2 /* hidden .ceph dir */
#define CEPH_INO_GLOBAL_SNAPREALM 3 /* global dummy snaprealm */
+#define CEPH_HIDDEN_DIR_NAME ".ceph"
+
/* arbitrary limit on max # of monitors (cluster of 3 is typical) */
#define CEPH_MAX_MON 31
--
2.48.0
