aboutsummaryrefslogtreecommitdiffstats
path: root/fs/kernfs/dir.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2016-01-15 12:30:14 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-07 23:21:35 -0500
commite56ed358afd81554e668aaa974d3f9ed201fa10d (patch)
treee5a9a4f215f796ed52d3431353b6eb9a28203a9e /fs/kernfs/dir.c
parent388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95 (diff)
kernfs: make kernfs_walk_ns() use kernfs_pr_cont_buf[]
kernfs_walk_ns() uses a static path_buf[PATH_MAX] to separate out path components. Keeping around the 4k buffer just for kernfs_walk_ns() is wasteful. This patch makes it piggyback on kernfs_pr_cont_buf[] instead. This requires kernfs_walk_ns() to hold kernfs_rename_lock. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/kernfs/dir.c')
-rw-r--r--fs/kernfs/dir.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 996b7742c90b..118d033bcbbc 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -691,15 +691,22 @@ static struct kernfs_node *kernfs_walk_ns(struct kernfs_node *parent,
691 const unsigned char *path, 691 const unsigned char *path,
692 const void *ns) 692 const void *ns)
693{ 693{
694 static char path_buf[PATH_MAX]; /* protected by kernfs_mutex */ 694 size_t len;
695 size_t len = strlcpy(path_buf, path, PATH_MAX); 695 char *p, *name;
696 char *p = path_buf;
697 char *name;
698 696
699 lockdep_assert_held(&kernfs_mutex); 697 lockdep_assert_held(&kernfs_mutex);
700 698
701 if (len >= PATH_MAX) 699 /* grab kernfs_rename_lock to piggy back on kernfs_pr_cont_buf */
700 spin_lock_irq(&kernfs_rename_lock);
701
702 len = strlcpy(kernfs_pr_cont_buf, path, sizeof(kernfs_pr_cont_buf));
703
704 if (len >= sizeof(kernfs_pr_cont_buf)) {
705 spin_unlock_irq(&kernfs_rename_lock);
702 return NULL; 706 return NULL;
707 }
708
709 p = kernfs_pr_cont_buf;
703 710
704 while ((name = strsep(&p, "/")) && parent) { 711 while ((name = strsep(&p, "/")) && parent) {
705 if (*name == '\0') 712 if (*name == '\0')
@@ -707,6 +714,8 @@ static struct kernfs_node *kernfs_walk_ns(struct kernfs_node *parent,
707 parent = kernfs_find_ns(parent, name, ns); 714 parent = kernfs_find_ns(parent, name, ns);
708 } 715 }
709 716
717 spin_unlock_irq(&kernfs_rename_lock);
718
710 return parent; 719 return parent;
711} 720}
712 721