提交 4c9608b2 编写于 作者: N NeilBrown 提交者: Linus Torvalds

[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: NNeil Brown <neilb@suse.de>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 4bdff8c0
...@@ -461,7 +461,7 @@ fh_update(struct svc_fh *fhp) ...@@ -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 @@ fh_update(struct svc_fh *fhp) ...@@ -481,10 +481,6 @@ fh_update(struct svc_fh *fhp)
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;
} }
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册