rpms/nfs-utils/devel nfs-utils-1.1.1-mount-relatime.patch, NONE, 1.1 nfs-utils.spec, 1.163, 1.164

[Steve Dickson (steved)]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv795

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.1-mount-relatime.patch 
Log Message:
- Added in relatime mount option so mount.nfs stays
  compatible with the mount command in util-linux-ng (bz 274301)


nfs-utils-1.1.1-mount-relatime.patch:

--- NEW FILE nfs-utils-1.1.1-mount-relatime.patch ---
commit b5651e42cedc2b91aba87ea30520884d7f43b36f
Author: Steve Dickson <steved at redhat.com>
Date:   Thu Jan 24 17:02:08 2008 -0500

    Added in relatime mount option so mount.nfs stays
    compatible with the mount command in util-linux-ng
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff -up nfs-utils-1.1.1/utils/mount/mount.c.orig nfs-utils-1.1.1/utils/mount/mount.c
--- nfs-utils-1.1.1/utils/mount/mount.c.orig	2007-10-18 23:07:28.000000000 -0400
+++ nfs-utils-1.1.1/utils/mount/mount.c	2008-01-24 16:46:03.000000000 -0500
@@ -130,6 +130,12 @@ static const struct opt_map opt_map[] = 
   { "diratime", 0, 1, MS_NODIRATIME },  /* Update dir access times */
   { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
 #endif
+#ifdef MS_RELATIME
+  { "relatime", 0, 0, MS_RELATIME },   /* Update access times relative to
+                      mtime/ctime */
+  { "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard
+                      to mtime/ctime */
+#endif
   { NULL,	0, 0, 0		}
 };
 
diff -up nfs-utils-1.1.1/utils/mount/mount_constants.h.orig nfs-utils-1.1.1/utils/mount/mount_constants.h
--- nfs-utils-1.1.1/utils/mount/mount_constants.h.orig	2007-10-18 23:07:28.000000000 -0400
+++ nfs-utils-1.1.1/utils/mount/mount_constants.h	2008-01-24 16:47:07.000000000 -0500
@@ -39,7 +39,10 @@ if we have a stack or plain mount - moun
 #ifndef MS_VERBOSE
 #define MS_VERBOSE	0x8000	/* 32768 */
 #endif
-
+#ifndef MS_RELATIME
+#define MS_RELATIME 0x200000 /* 200000: Update access times relative
+                                  to mtime/ctime */
+#endif
 /*
  * NFS fs-specific mount option flags
  *


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- nfs-utils.spec	22 Jan 2008 19:36:09 -0000	1.163
+++ nfs-utils.spec	24 Jan 2008 22:14:04 -0000	1.164
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -43,6 +43,7 @@
 Patch103: nfs-utils-1.1.1-mount-rm-mountprog.patch
 Patch104: nfs-utils-1.1.1-xlog-valist.patch
 Patch105: nfs-utils-1.1.1-mountd-crossmnt.patch
+Patch106: nfs-utils-1.1.1-mount-relatime.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -110,6 +111,7 @@
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
+%patch106 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -273,6 +275,10 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Thu Jan 24 2008 Steve Dickson <steved at redhat.com>  1.1.1-3
+- Added in relatime mount option so mount.nfs stays
+  compatible with the mount command in util-linux-ng (bz 274301)
+
 * Tue Jan 22 2008 Steve Dickson <steved at redhat.com>  1.1.1-2
 - Added -S/--since to the nfsstat(1) manpage
 - The wording in the exportfs man page can be a bit confusing, implying