diff options
author | Christoph Hellwig <hch@lst.de> | 2015-06-18 16:45:00 +0200 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2015-06-22 14:15:03 -0400 |
commit | af90f707fa6d54dbb725c4b919c976cd23cd07f2 (patch) | |
tree | c213e59eaf06df375269a1471670dc5df201d849 /fs/nfsd/xdr4.h | |
parent | a0649b2d3fffb1cde8745568c767f3a55a3462bc (diff) | |
download | op-kernel-dev-af90f707fa6d54dbb725c4b919c976cd23cd07f2.zip op-kernel-dev-af90f707fa6d54dbb725c4b919c976cd23cd07f2.tar.gz |
nfsd: take struct file setup fully into nfs4_preprocess_stateid_op
This patch changes nfs4_preprocess_stateid_op so it always returns
a valid struct file if it has been asked for that. For that we
now allocate a temporary struct file for special stateids, and check
permissions if we got the file structure from the stateid. This
ensures that all callers will get their handling of special stateids
right, and avoids code duplication.
There is a little wart in here because the read code needs to know
if we allocated a file structure so that it can copy around the
read-ahead parameters. In the long run we should probably aim to
cache full file structures used with special stateids instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/xdr4.h')
-rw-r--r-- | fs/nfsd/xdr4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index 2f8c092..9f99100 100644 --- a/fs/nfsd/xdr4.h +++ b/fs/nfsd/xdr4.h @@ -273,6 +273,7 @@ struct nfsd4_read { u32 rd_length; /* request */ int rd_vlen; struct file *rd_filp; + bool rd_tmp_file; struct svc_rqst *rd_rqstp; /* response */ struct svc_fh * rd_fhp; /* response */ |