[PATCH 003 of 14] knfsd: Remove noise about filehandle being uptodate.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 <[email protected]>

### Diffstat output
 ./fs/nfsd/nfsfh.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff .prev/fs/nfsd/nfsfh.c ./fs/nfsd/nfsfh.c
--- .prev/fs/nfsd/nfsfh.c	2006-06-27 12:15:18.000000000 +1000
+++ ./fs/nfsd/nfsfh.c	2006-06-27 12:16:05.000000000 +1000
@@ -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;
@@ -481,10 +481,6 @@ out_negative:
 	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;
 }
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux