diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-10 10:19:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-10 10:19:28 +0100 |
| commit | d88f1f1fdb9f8f60602b406c89342e113a19df7f (patch) | |
| tree | 16da02010b66f7f54fde737c5c54e43980789f79 /fs/nfs/nfs3proc.c | |
| parent | 04860d48a8aba5b21ae5ba1f86b0d4e3bc628fff (diff) | |
| parent | cdb06e9d8f520c969676e7d6778cffe5894f079f (diff) | |
| download | blackbird-op-linux-d88f1f1fdb9f8f60602b406c89342e113a19df7f.tar.gz blackbird-op-linux-d88f1f1fdb9f8f60602b406c89342e113a19df7f.zip | |
Merge branch 'linus' into locking/core, to pick up fixes and dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfs/nfs3proc.c')
| -rw-r--r-- | fs/nfs/nfs3proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 49f848fd1f04..7327930ad970 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c @@ -873,7 +873,7 @@ static void nfs3_nlm_release_call(void *data) } } -const struct nlmclnt_operations nlmclnt_fl_close_lock_ops = { +static const struct nlmclnt_operations nlmclnt_fl_close_lock_ops = { .nlmclnt_alloc_call = nfs3_nlm_alloc_call, .nlmclnt_unlock_prepare = nfs3_nlm_unlock_prepare, .nlmclnt_release_call = nfs3_nlm_release_call, |
