Re: kNFSd maintenance in 2.2.19pre

[Andrea Arcangeli]

On Thu, Dec 21, 2000 at 12:05:41PM +1100, Neil Brown wrote:
>  So, I have started putting some patches together and they can be
>  found at
>     http://www.cse.unsw.edu.au/~neilb/patches/knfsd-2.2/

I included the interesting ones in my tree.

Here two fixes against the vfs backport:

--- ./fs/nfsd/vfs.c.~1~	Fri Dec 29 18:02:01 2000
+++ ./fs/nfsd/vfs.c	Mon Jan  1 18:09:46 2001
@@ -1603,9 +1603,11 @@
 	eof = !cd.eob;
 
 	if (cd.offset) {
+#ifdef CONFIG_NFSD_V3
 		if (rqstp->rq_vers == 3)
 			(void)enc64(cd.offset, file.f_pos);
 		else
+#endif /* CONFIG_NFSD_V3 */
 			*cd.offset = htonl(file.f_pos);
 	}
 
@@ -1624,6 +1626,7 @@
 	return err;
 
 out_nfserr:
+	up(&inode->i_sem);
 	err = nfserrno(-err);
 	goto out_close;
 }

Andrea