diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 19:34:13 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 19:34:13 (GMT) |
| commit | 2b76db6a0f649f5a54805807d36d51b6e9e49089 (patch) | |
| tree | 1155e363d3ea5e416ac5627402dd862028db6907 /include/net | |
| parent | 53bf710832a7191e023e2bb1e333226e3115cfa0 (diff) | |
| parent | 50192abe02929586111fb33f216060a9341875f1 (diff) | |
| download | linux-2b76db6a0f649f5a54805807d36d51b6e9e49089.tar.xz | |
Merge tag 'for-linus-3.12-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p updates from Eric Van Hensbergen:
"Minor 9p fixes and tweaks for 3.12 merge window
The first fixes namespace issues which causes a kernel NULL pointer
dereference, the second fixes uevent handling to work better with
udev, and the third switches some code to use srlcpy instead of
strncpy in order to be safer.
All changes have been baking in for-next for at least 2 weeks"
* tag 'for-linus-3.12-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
fs/9p: avoid accessing utsname after namespace has been torn down
9p: send uevent after adding/removing mount_tag attribute
fs: 9p: use strlcpy instead of strncpy
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/9p/client.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/9p/client.h b/include/net/9p/client.h index 4c7c01a..c38a005 100644 --- a/include/net/9p/client.h +++ b/include/net/9p/client.h @@ -26,6 +26,8 @@ #ifndef NET_9P_CLIENT_H #define NET_9P_CLIENT_H +#include <linux/utsname.h> + /* Number of requests per row */ #define P9_ROW_MAXTAG 255 @@ -134,6 +136,7 @@ struct p9_req_t { * @tagpool - transaction id accounting for session * @reqs - 2D array of requests * @max_tag - current maximum tag id allocated + * @name - node name used as client id * * The client structure is used to keep track of various per-client * state that has been instantiated. @@ -164,6 +167,8 @@ struct p9_client { struct p9_idpool *tagpool; struct p9_req_t *reqs[P9_ROW_MAXTAG]; int max_tag; + + char name[__NEW_UTS_LEN + 1]; }; /** |