projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
fs
/
nfs
/
netns.h
diff --git
a/fs/nfs/netns.h
b/fs/nfs/netns.h
index 0539de1b8d1fe3477500b400ff2b9b6d5781b984..8ee1fab832686ed068468c5de8b12789af8a6371 100644
(file)
--- a/
fs/nfs/netns.h
+++ b/
fs/nfs/netns.h
@@
-5,6
+5,7
@@
#ifndef __NFS_NETNS_H__
#define __NFS_NETNS_H__
#ifndef __NFS_NETNS_H__
#define __NFS_NETNS_H__
+#include <linux/nfs4.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
@@
-22,6
+23,9
@@
struct nfs_net {
struct list_head nfs_volume_list;
#if IS_ENABLED(CONFIG_NFS_V4)
struct idr cb_ident_idr; /* Protected by nfs_client_lock */
struct list_head nfs_volume_list;
#if IS_ENABLED(CONFIG_NFS_V4)
struct idr cb_ident_idr; /* Protected by nfs_client_lock */
+ unsigned short nfs_callback_tcpport;
+ unsigned short nfs_callback_tcpport6;
+ int cb_users[NFS4_MAX_MINOR_VERSION + 1];
#endif
spinlock_t nfs_client_lock;
struct timespec boot_time;
#endif
spinlock_t nfs_client_lock;
struct timespec boot_time;