From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Wed, 30 Jul 2014 01:34:08 +0000 (-0400)
Subject: nfsd: Add a struct nfs4_file field to struct nfs4_stid
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~101^2~75
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11b9164adad7cd119b82b1f2c911a6d9bc67f1cc;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed