nfs: disintegrate UAPI for nfs
J. Bruce Fields [Tue, 9 Oct 2012 22:35:22 +0000 (18:35 -0400)]
This is to complete part of the Userspace API (UAPI) disintegration for which
the preparatory patches were pulled recently.  After these patches, userspace
headers will be segregated into:

        include/uapi/linux/.../foo.h

for the userspace interface stuff, and:

        include/linux/.../foo.h

for the strictly kernel internal stuff.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1  2 
fs/locks.c
fs/nfsd/nfs4state.c
fs/nfsd/vfs.c

diff --cc fs/locks.c
Simple merge
Simple merge
diff --cc fs/nfsd/vfs.c
Simple merge