nfsd4: use a single struct file for delegations
authorJ. Bruce Fields <bfields@redhat.com>
Sun, 31 Oct 2010 03:35:04 +0000 (23:35 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Tue, 4 Jan 2011 21:49:27 +0000 (16:49 -0500)
When we converted to sharing struct filess between nfs4 opens I went too
far and also used the same mechanism for delegations.  But keeping
a reference to the struct file ensures it will outlast the lease, and
allows us to remove the lease with the same file as we added it.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4state.c
fs/nfsd/state.h

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