summaryrefslogtreecommitdiffstats
path: root/fs/nfs/callback.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-01 16:17:31 -0700
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-01 16:17:31 -0700
commit9f62387d6e26532bcbfb15606956074192ee526a (patch)
tree9102b0babaa7918bcc87f11a8986deee092be908 /fs/nfs/callback.c
parent2afdfa5a846246de50e1881f71ba5c0aac0b415f (diff)
downloadop-kernel-dev-9f62387d6e26532bcbfb15606956074192ee526a.zip
op-kernel-dev-9f62387d6e26532bcbfb15606956074192ee526a.tar.gz
NFSv4: Fix up a merge conflict between migration and container changes
nfs_callback_tcpport is now per-net_namespace. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/callback.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud