Skip to content

Commit

Permalink
[PATCH] knfsd: remove noise about filehandle being uptodate
Browse files Browse the repository at this point in the history
There is a perfectly valid situation where fh_update gets called on an already
uptodate filehandle - in nfsd_create_v3 where a CREATE_UNCHECKED finds an
existing file and wants to just set the size.

We could possible optimise out the call in that case, but the only harm
involved is that fh_update prints a warning, so it is easier to remove the
warning.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
NeilBrown authored and Linus Torvalds committed Jun 30, 2006
1 parent 4bdff8c commit 4c9608b
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions fs/nfsd/nfsfh.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ fh_update(struct svc_fh *fhp)
} else {
int size;
if (fhp->fh_handle.fh_fileid_type != 0)
goto out_uptodate;
goto out;
datap = fhp->fh_handle.fh_auth+
fhp->fh_handle.fh_size/4 -1;
size = (fhp->fh_maxsize - fhp->fh_handle.fh_size)/4;
Expand All @@ -481,10 +481,6 @@ fh_update(struct svc_fh *fhp)
printk(KERN_ERR "fh_update: %s/%s still negative!\n",
dentry->d_parent->d_name.name, dentry->d_name.name);
goto out;
out_uptodate:
printk(KERN_ERR "fh_update: %s/%s already up-to-date!\n",
dentry->d_parent->d_name.name, dentry->d_name.name);
goto out;
}

/*
Expand Down

0 comments on commit 4c9608b

Please sign in to comment.