git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
fs
/
lockd
/
netns.h
diff --git
a/fs/lockd/netns.h
b/fs/lockd/netns.h
index
ce227e0
..
4eee248
100644
(file)
--- a/
fs/lockd/netns.h
+++ b/
fs/lockd/netns.h
@@
-1,10
+1,17
@@
#ifndef __LOCKD_NETNS_H__
#define __LOCKD_NETNS_H__
#ifndef __LOCKD_NETNS_H__
#define __LOCKD_NETNS_H__
+#include <linux/fs.h>
#include <net/netns/generic.h>
struct lockd_net {
unsigned int nlmsvc_users;
#include <net/netns/generic.h>
struct lockd_net {
unsigned int nlmsvc_users;
+ unsigned long next_gc;
+ unsigned long nrhosts;
+
+ struct delayed_work grace_period_end;
+ struct lock_manager lockd_manager;
+ struct list_head grace_list;
};
extern int lockd_net_id;
};
extern int lockd_net_id;