]> git.openpandora.org Git - pandora-kernel.git/commitdiff
nfsd4: add common dl_stid field to delegation
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 8 Sep 2011 16:07:44 +0000 (12:07 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Tue, 13 Sep 2011 22:30:32 +0000 (18:30 -0400)
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4callback.c
fs/nfsd/nfs4state.c
fs/nfsd/state.h

Simple merge
Simple merge
diff --cc fs/nfsd/state.h
Simple merge