mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
[PATCH] nfsd4: clean up settattr code
Clean up some unnecessary special-casing in the setattr code.. Signed-off-by: Fred Isaman <iisaman@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
34081efc12
commit
5274881992
1 changed files with 1 additions and 9 deletions
|
@ -594,10 +594,6 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_se
|
||||||
{
|
{
|
||||||
int status = nfs_ok;
|
int status = nfs_ok;
|
||||||
|
|
||||||
if (!current_fh->fh_dentry)
|
|
||||||
return nfserr_nofilehandle;
|
|
||||||
|
|
||||||
status = nfs_ok;
|
|
||||||
if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
|
if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
|
||||||
nfs4_lock_state();
|
nfs4_lock_state();
|
||||||
status = nfs4_preprocess_stateid_op(current_fh,
|
status = nfs4_preprocess_stateid_op(current_fh,
|
||||||
|
@ -799,17 +795,13 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
|
||||||
/* All operations except RENEW, SETCLIENTID, RESTOREFH
|
/* All operations except RENEW, SETCLIENTID, RESTOREFH
|
||||||
* SETCLIENTID_CONFIRM, PUTFH and PUTROOTFH
|
* SETCLIENTID_CONFIRM, PUTFH and PUTROOTFH
|
||||||
* require a valid current filehandle
|
* require a valid current filehandle
|
||||||
*
|
|
||||||
* SETATTR NOFILEHANDLE error handled in nfsd4_setattr
|
|
||||||
* due to required returned bitmap argument
|
|
||||||
*/
|
*/
|
||||||
if ((!current_fh->fh_dentry) &&
|
if ((!current_fh->fh_dentry) &&
|
||||||
!((op->opnum == OP_PUTFH) || (op->opnum == OP_PUTROOTFH) ||
|
!((op->opnum == OP_PUTFH) || (op->opnum == OP_PUTROOTFH) ||
|
||||||
(op->opnum == OP_SETCLIENTID) ||
|
(op->opnum == OP_SETCLIENTID) ||
|
||||||
(op->opnum == OP_SETCLIENTID_CONFIRM) ||
|
(op->opnum == OP_SETCLIENTID_CONFIRM) ||
|
||||||
(op->opnum == OP_RENEW) || (op->opnum == OP_RESTOREFH) ||
|
(op->opnum == OP_RENEW) || (op->opnum == OP_RESTOREFH) ||
|
||||||
(op->opnum == OP_RELEASE_LOCKOWNER) ||
|
(op->opnum == OP_RELEASE_LOCKOWNER))) {
|
||||||
(op->opnum == OP_SETATTR))) {
|
|
||||||
op->status = nfserr_nofilehandle;
|
op->status = nfserr_nofilehandle;
|
||||||
goto encode_op;
|
goto encode_op;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue