Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] knfsd: remove noise about filehandle being uptodate

Browse Source 
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>
This commit is contained in:
NeilBrown 2006-06-30 01:56:11 -07:00 committed by Linus Torvalds
parent 4bdff8c095
commit 4c9608b2f2
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfsd/nfsfh.c
View File

@ -461,7 +461,7 @@ fh_update(struct svc_fh *fhp)
} else { } else {
int size; int size;
if (fhp->fh_handle.fh_fileid_type != 0) if (fhp->fh_handle.fh_fileid_type != 0)
goto out_uptodate; goto out;
datap = fhp->fh_handle.fh_auth+ datap = fhp->fh_handle.fh_auth+
fhp->fh_handle.fh_size/4 -1; fhp->fh_handle.fh_size/4 -1;
size = (fhp->fh_maxsize - fhp->fh_handle.fh_size)/4; size = (fhp->fh_maxsize - fhp->fh_handle.fh_size)/4;
@ -481,10 +481,6 @@ out_negative:
printk(KERN_ERR "fh_update: %s/%s still negative!\n", printk(KERN_ERR "fh_update: %s/%s still negative!\n",
dentry->d_parent->d_name.name, dentry->d_name.name); dentry->d_parent->d_name.name, dentry->d_name.name);
goto out; 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;
} }
/* /*