LockD: manage grace list per network namespace
authorStanislav Kinsbursky <skinsbursky@parallels.com>
Wed, 25 Jul 2012 12:57:13 +0000 (16:57 +0400)
committerJ. Bruce Fields <bfields@redhat.com>
Fri, 27 Jul 2012 20:49:22 +0000 (16:49 -0400)
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/lockd/grace.c
fs/lockd/netns.h
fs/lockd/svc.c

Simple merge
Simple merge
diff --cc fs/lockd/svc.c
Simple merge