aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2016-08-10 11:23:44 -0400
committerTejun Heo <tj@kernel.org>2016-08-10 11:23:44 -0400
commitbb09c8634b1e484b8840fb2384d55739bfcb68bd (patch)
treedc5676528fbdd8a6da63825112988cd8f4a2d542
parent3abb1d90f5d930c6183534a624aa0158a71bc5eb (diff)
kernfs: remove kernfs_path_len()
It doesn't have any in-kernel user and the same result can be obtained from kernfs_path(@kn, NULL, 0). Remove it. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Serge Hallyn <serge.hallyn@ubuntu.com>
-rw-r--r--fs/kernfs/dir.c23
-rw-r--r--include/linux/kernfs.h4
2 files changed, 0 insertions, 27 deletions
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 09242aaa8829..6e7fd37615f8 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -180,29 +180,6 @@ int kernfs_name(struct kernfs_node *kn, char *buf, size_t buflen)
180} 180}
181 181
182/** 182/**
183 * kernfs_path_len - determine the length of the full path of a given node
184 * @kn: kernfs_node of interest
185 *
186 * The returned length doesn't include the space for the terminating '\0'.
187 */
188size_t kernfs_path_len(struct kernfs_node *kn)
189{
190 size_t len = 0;
191 unsigned long flags;
192
193 spin_lock_irqsave(&kernfs_rename_lock, flags);
194
195 do {
196 len += strlen(kn->name) + 1;
197 kn = kn->parent;
198 } while (kn && kn->parent);
199
200 spin_unlock_irqrestore(&kernfs_rename_lock, flags);
201
202 return len;
203}
204
205/**
206 * kernfs_path_from_node - build path of node @to relative to @from. 183 * kernfs_path_from_node - build path of node @to relative to @from.
207 * @from: parent kernfs_node relative to which we need to build the path 184 * @from: parent kernfs_node relative to which we need to build the path
208 * @to: kernfs_node of interest 185 * @to: kernfs_node of interest
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index 4a02b1b49821..7056238fd9f5 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -269,7 +269,6 @@ static inline bool kernfs_ns_enabled(struct kernfs_node *kn)
269} 269}
270 270
271int kernfs_name(struct kernfs_node *kn, char *buf, size_t buflen); 271int kernfs_name(struct kernfs_node *kn, char *buf, size_t buflen);
272size_t kernfs_path_len(struct kernfs_node *kn);
273int kernfs_path_from_node(struct kernfs_node *root_kn, struct kernfs_node *kn, 272int kernfs_path_from_node(struct kernfs_node *root_kn, struct kernfs_node *kn,
274 char *buf, size_t buflen); 273 char *buf, size_t buflen);
275void pr_cont_kernfs_name(struct kernfs_node *kn); 274void pr_cont_kernfs_name(struct kernfs_node *kn);
@@ -340,9 +339,6 @@ static inline bool kernfs_ns_enabled(struct kernfs_node *kn)
340static inline int kernfs_name(struct kernfs_node *kn, char *buf, size_t buflen) 339static inline int kernfs_name(struct kernfs_node *kn, char *buf, size_t buflen)
341{ return -ENOSYS; } 340{ return -ENOSYS; }
342 341
343static inline size_t kernfs_path_len(struct kernfs_node *kn)
344{ return 0; }
345
346static inline int kernfs_path_from_node(struct kernfs_node *root_kn, 342static inline int kernfs_path_from_node(struct kernfs_node *root_kn,
347 struct kernfs_node *kn, 343 struct kernfs_node *kn,
348 char *buf, size_t buflen) 344 char *buf, size_t buflen)