[PATCH 2.4] resend: SGI 901086: NFSv2 SETATTR current server time support

[Greg Banks <gnb@sgi.com>]

G'day,

This is a resend of the client portion of a patch I submitted
a while ago which got lost in the shuffle.  The serverside
half of the original patch went in some time ago, so this resend
is just the client half.

The patch is against 2.4.26.  A 2.6 patch follows shortly.

-----
SGI bug 901086.

In the NFSv3 RFC, the sattr3 structure passed in the SETATTR call allows
for the client to request that the mtime and/or atime of an inode be set
to the current server time, the given (client) time, or not changed.  The
set-to-current-server value is used when you run "touch file" on the client.

This is significant for two reasons.  First, if there is clock skew between
the client and server there are times when you want the server time.  Secondly, the filesystem permissions checks for the two cases are actually different:
setting to an explicit time requires the setting process to own the file (or
be root), but setting to the current time requires only that the file be
writable to the process (or the process be root).

The NFSv2 RFC defines no such encoding for the sattr structure.  However
Solaris and Irix machine obey a convention where passing the invalid value
mtime.useconds=1000000 means "set both mtime and atime to the current
server time".  The convention is documented in the book "NFS Illustrated"
by Brent Callaghan.  The patch below implements this convention for the
Linux client and server (hence multiple To:s).

Tested between ia64 Linux 2.4.21, Irix & Solaris.



--- /usr/tmp/TmpDir.24590-0/linux/linux/fs/nfs/nfs2xdr.c_1.11	Tue Sep 23 16:11:24 2003
+++ linux/fs/nfs/nfs2xdr.c	Tue Sep 23 16:11:00 2003
@@ -131,17 +131,33 @@
 	SATTR(p, attr, ATTR_GID, ia_gid);
 	SATTR(p, attr, ATTR_SIZE, ia_size);
 
-	if (attr->ia_valid & (ATTR_ATIME|ATTR_ATIME_SET)) {
+	if (attr->ia_valid & ATTR_ATIME_SET) {
 		*p++ = htonl(attr->ia_atime);
 		*p++ = 0;
+	} else if (attr->ia_valid & ATTR_ATIME) {
+	    	/*
+		 * Passing the invalid value useconds=1000000 is a
+		 * Sun convention for "set to current server time".
+		 * It's needed to make permissions checks for the
+		 * "touch" program across v2 mounts to Solaris and
+		 * Irix boxes work correctly. See description of
+		 * sattr in section 6.1 of "NFS Illustrated" by
+		 * Brent Callaghan, Addison-Wesley, ISBN 0-201-32750-5
+		 */
+		*p++ = htonl(attr->ia_atime);
+		*p++ = htonl(1000000);
 	} else {
 		*p++ = ~(u32) 0;
 		*p++ = ~(u32) 0;
 	}
 
-	if (attr->ia_valid & (ATTR_MTIME|ATTR_MTIME_SET)) {
+	if (attr->ia_valid & ATTR_MTIME_SET) {
 		*p++ = htonl(attr->ia_mtime);
 		*p++ = 0;
+	} else if (attr->ia_valid & ATTR_MTIME) {
+	    	/* See above comment about useconds=1000000. */
+		*p++ = htonl(attr->ia_mtime);
+		*p++ = htonl(1000000);
 	} else {
 		*p++ = ~(u32) 0;	
 		*p++ = ~(u32) 0;



Greg.
-- 
Greg Banks, R&D Software Engineer, SGI Australian Software Group.
I don't speak for SGI.


-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs