diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 16:45:58 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 16:45:58 +0400 |
| commit | 59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266 (patch) | |
| tree | b913718405d44a921905ac71044fbde410256865 /fs/nfs/netns.h | |
| parent | 57bdfdd80077addf518a9b90c4a66890efc4f70e (diff) | |
| parent | 89abfab133ef1f5902abafb744df72793213ac19 (diff) | |
| download | linux-59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266.tar.xz | |
Merge branch 'master' into for-next
Conflicts:
include/linux/mmzone.h
Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'fs/nfs/netns.h')
| -rw-r--r-- | fs/nfs/netns.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/nfs/netns.h b/fs/nfs/netns.h index aa14ec303e94..8a6394edb8b0 100644 --- a/fs/nfs/netns.h +++ b/fs/nfs/netns.h @@ -1,3 +1,7 @@ +/* + * NFS-private data for each "struct net". Accessed with net_generic(). + */ + #ifndef __NFS_NETNS_H__ #define __NFS_NETNS_H__ @@ -20,6 +24,7 @@ struct nfs_net { struct idr cb_ident_idr; /* Protected by nfs_client_lock */ #endif spinlock_t nfs_client_lock; + struct timespec boot_time; }; extern int nfs_net_id; |