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/netns.h | |
parent | c7d565fbc846a5e1f0bc6afa4e122943db276a23 (diff) | |
parent | e796f49d826aadb856981c751efc086c6ce11a77 (diff) |
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'fs/lockd/netns.h')
-rw-r--r-- | fs/lockd/netns.h | 2 |
1 files changed, 1 insertions, 1 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 |