]> git.baikalelectronics.ru Git - kernel.git/commit
nfsd: Add a struct nfs4_file field to struct nfs4_stid
authorTrond Myklebust <trond.myklebust@primarydata.com>
Wed, 30 Jul 2014 01:34:08 +0000 (21:34 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Thu, 31 Jul 2014 16:51:34 +0000 (12:51 -0400)
commit8a4ab906ebed3bc060d39f8eee1185903c1b1898
tree865bd5d31dccec6f6ff9d71534e83dad10e9e215
parent8791ab0e774cec7203d8ecf4920c568d0a64773d
nfsd: Add a struct nfs4_file field to struct nfs4_stid

All stateids are associated with a nfs4_file. Let's consolidate.
Replace delegation->dl_file with the dl_stid.sc_file, and
nfs4_ol_stateid->st_file with st_stid.sc_file.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4callback.c
fs/nfsd/nfs4state.c
fs/nfsd/state.h