diff options
author | NeilBrown <neilb@suse.de> | 2006-06-30 04:56:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 14:25:40 -0400 |
commit | 4c9608b2f2f51e84eba72f4bf061d360259ce656 (patch) | |
tree | e77a19f0dfd21b2d6a67542ef032f3aa69cf8e4a /fs | |
parent | 4bdff8c0950afa6a3f2efec6cd15159d97fac1e6 (diff) |
[PATCH] knfsd: remove noise about filehandle being uptodate
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfsd/nfsfh.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 3f2ec2e6d06..e3f3bbea8ae 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c | |||
@@ -461,7 +461,7 @@ fh_update(struct svc_fh *fhp) | |||
461 | } else { | 461 | } else { |
462 | int size; | 462 | int size; |
463 | if (fhp->fh_handle.fh_fileid_type != 0) | 463 | if (fhp->fh_handle.fh_fileid_type != 0) |
464 | goto out_uptodate; | 464 | goto out; |
465 | datap = fhp->fh_handle.fh_auth+ | 465 | datap = fhp->fh_handle.fh_auth+ |
466 | fhp->fh_handle.fh_size/4 -1; | 466 | fhp->fh_handle.fh_size/4 -1; |
467 | size = (fhp->fh_maxsize - fhp->fh_handle.fh_size)/4; | 467 | size = (fhp->fh_maxsize - fhp->fh_handle.fh_size)/4; |
@@ -481,10 +481,6 @@ out_negative: | |||
481 | printk(KERN_ERR "fh_update: %s/%s still negative!\n", | 481 | printk(KERN_ERR "fh_update: %s/%s still negative!\n", |
482 | dentry->d_parent->d_name.name, dentry->d_name.name); | 482 | dentry->d_parent->d_name.name, dentry->d_name.name); |
483 | goto out; | 483 | goto out; |
484 | out_uptodate: | ||
485 | printk(KERN_ERR "fh_update: %s/%s already up-to-date!\n", | ||
486 | dentry->d_parent->d_name.name, dentry->d_name.name); | ||
487 | goto out; | ||
488 | } | 484 | } |
489 | 485 | ||
490 | /* | 486 | /* |