summaryrefslogtreecommitdiffstats
path: root/fs/kernfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-12 21:57:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-12 21:57:02 -0500
commitaee3bfa3307cd0da2126bdc0ea359dabea5ee8f7 (patch)
tree3d35c69e8fa835098bb90f77f30abed120681651 /fs/kernfs
parentc597b6bcd5c624534afc3df65cdc42bb05173bca (diff)
parent415b6f19e87e350b13585591859d4fdf50772229 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking updates from Davic Miller: 1) Support busy polling generically, for all NAPI drivers. From Eric Dumazet. 2) Add byte/packet counter support to nft_ct, from Floriani Westphal. 3) Add RSS/XPS support to mvneta driver, from Gregory Clement. 4) Implement IPV6_HDRINCL socket option for raw sockets, from Hannes Frederic Sowa. 5) Add support for T6 adapter to cxgb4 driver, from Hariprasad Shenai. 6) Add support for VLAN device bridging to mlxsw switch driver, from Ido Schimmel. 7) Add driver for Netronome NFP4000/NFP6000, from Jakub Kicinski. 8) Provide hwmon interface to mlxsw switch driver, from Jiri Pirko. 9) Reorganize wireless drivers into per-vendor directories just like we do for ethernet drivers. From Kalle Valo. 10) Provide a way for administrators "destroy" connected sockets via the SOCK_DESTROY socket netlink diag operation. From Lorenzo Colitti. 11) Add support to add/remove multicast routes via netlink, from Nikolay Aleksandrov. 12) Make TCP keepalive settings per-namespace, from Nikolay Borisov. 13) Add forwarding and packet duplication facilities to nf_tables, from Pablo Neira Ayuso. 14) Dead route support in MPLS, from Roopa Prabhu. 15) TSO support for thunderx chips, from Sunil Goutham. 16) Add driver for IBM's System i/p VNIC protocol, from Thomas Falcon. 17) Rationalize, consolidate, and more completely document the checksum offloading facilities in the networking stack. From Tom Herbert. 18) Support aborting an ongoing scan in mac80211/cfg80211, from Vidyullatha Kanchanapally. 19) Use per-bucket spinlock for bpf hash facility, from Tom Leiming. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1375 commits) net: bnxt: always return values from _bnxt_get_max_rings net: bpf: reject invalid shifts phonet: properly unshare skbs in phonet_rcv() dwc_eth_qos: Fix dma address for multi-fragment skbs phy: remove an unneeded condition mdio: remove an unneed condition mdio_bus: NULL dereference on allocation error net: Fix typo in netdev_intersect_features net: freescale: mac-fec: Fix build error from phy_device API change net: freescale: ucc_geth: Fix build error from phy_device API change bonding: Prevent IPv6 link local address on enslaved devices IB/mlx5: Add flow steering support net/mlx5_core: Export flow steering API net/mlx5_core: Make ipv4/ipv6 location more clear net/mlx5_core: Enable flow steering support for the IB driver net/mlx5_core: Initialize namespaces only when supported by device net/mlx5_core: Set priority attributes net/mlx5_core: Connect flow tables net/mlx5_core: Introduce modify flow table command net/mlx5_core: Managing root flow table ...
Diffstat (limited to 'fs/kernfs')
-rw-r--r--fs/kernfs/dir.c46
1 files changed, 46 insertions, 0 deletions
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 91e004518237..742bf4a230e8 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -694,6 +694,29 @@ static struct kernfs_node *kernfs_find_ns(struct kernfs_node *parent,
694 return NULL; 694 return NULL;
695} 695}
696 696
697static struct kernfs_node *kernfs_walk_ns(struct kernfs_node *parent,
698 const unsigned char *path,
699 const void *ns)
700{
701 static char path_buf[PATH_MAX]; /* protected by kernfs_mutex */
702 size_t len = strlcpy(path_buf, path, PATH_MAX);
703 char *p = path_buf;
704 char *name;
705
706 lockdep_assert_held(&kernfs_mutex);
707
708 if (len >= PATH_MAX)
709 return NULL;
710
711 while ((name = strsep(&p, "/")) && parent) {
712 if (*name == '\0')
713 continue;
714 parent = kernfs_find_ns(parent, name, ns);
715 }
716
717 return parent;
718}
719
697/** 720/**
698 * kernfs_find_and_get_ns - find and get kernfs_node with the given name 721 * kernfs_find_and_get_ns - find and get kernfs_node with the given name
699 * @parent: kernfs_node to search under 722 * @parent: kernfs_node to search under
@@ -719,6 +742,29 @@ struct kernfs_node *kernfs_find_and_get_ns(struct kernfs_node *parent,
719EXPORT_SYMBOL_GPL(kernfs_find_and_get_ns); 742EXPORT_SYMBOL_GPL(kernfs_find_and_get_ns);
720 743
721/** 744/**
745 * kernfs_walk_and_get_ns - find and get kernfs_node with the given path
746 * @parent: kernfs_node to search under
747 * @path: path to look for
748 * @ns: the namespace tag to use
749 *
750 * Look for kernfs_node with path @path under @parent and get a reference
751 * if found. This function may sleep and returns pointer to the found
752 * kernfs_node on success, %NULL on failure.
753 */
754struct kernfs_node *kernfs_walk_and_get_ns(struct kernfs_node *parent,
755 const char *path, const void *ns)
756{
757 struct kernfs_node *kn;
758
759 mutex_lock(&kernfs_mutex);
760 kn = kernfs_walk_ns(parent, path, ns);
761 kernfs_get(kn);
762 mutex_unlock(&kernfs_mutex);
763
764 return kn;
765}
766
767/**
722 * kernfs_create_root - create a new kernfs hierarchy 768 * kernfs_create_root - create a new kernfs hierarchy
723 * @scops: optional syscall operations for the hierarchy 769 * @scops: optional syscall operations for the hierarchy
724 * @flags: KERNFS_ROOT_* flags 770 * @flags: KERNFS_ROOT_* flags