diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-11-22 11:56:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-11-22 11:56:42 +1100 |
| commit | 98d4b10ee61601b236c34587a215cb86e69cf8ba (patch) | |
| tree | 43c6e0bb4608288b1e258e92973129582b2c8c75 /fs/lockd | |
| parent | c7d565fbc846a5e1f0bc6afa4e122943db276a23 (diff) | |
| parent | e796f49d826aadb856981c751efc086c6ce11a77 (diff) | |
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/netns.h | 2 | ||||
| -rw-r--r-- | fs/lockd/svc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/lockd/netns.h b/fs/lockd/netns.h index 5426189406c1..fb8cac88251a 100644 --- a/fs/lockd/netns.h +++ b/fs/lockd/netns.h @@ -15,6 +15,6 @@ struct lockd_net { struct list_head nsm_handles; }; -extern int lockd_net_id; +extern unsigned int lockd_net_id; #endif diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index fc4084ef4736..1c13dd80744f 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -57,7 +57,7 @@ static struct task_struct *nlmsvc_task; static struct svc_rqst *nlmsvc_rqst; unsigned long nlmsvc_timeout; -int lockd_net_id; +unsigned int lockd_net_id; /* * These can be set at insmod time (useful for NFS as root filesystem), |