Author: ktdreyer Update of /cvs/free/rpms/openafs/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv26537 Modified Files: openafs.init openafs.spec Added Files: openafs-1.6.0-setserverprefs.patch openafs-1.6.0-xstat-cm-test.patch Log Message: * Mon Jan 16 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 0:1.6.1-0.pre1.1 - Log an error if we couldn't load the kernel module (RF BZ #2006) - Fix setserverprefs for vlservers (http://gerrit.openafs.org/5465) - Fix xstat_cm_test (http://gerrit.openafs.org/5237) openafs-1.6.0-setserverprefs.patch: afs_pioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE openafs-1.6.0-setserverprefs.patch --- commit 552d59186b135af55eeaa6136a9cbb8965dd2f04 Author: Jeffrey Altman <jaltman(a)your-file-system.com&gt; Date: Mon Sep 19 10:35:11 2011 -0400 Fix input size computation in SetSPrefs pioctl Patchset 718f85a8b69a78ac77beb5c8471af20657be2a53 contained a small typo that prevents the SetSPrefs pioctl processing from functioning in all cases. fs setserverprefs continues to work for non-DB preference lists because fs.c pokeServers() attempts to try the old SetSPrefs33 pioctl in the non-DB server case. Change-Id: I2e06dccb51c53ba312418fb5f51be3d621a2004c Reviewed-on: http://gerrit.openafs.org/5465 Reviewed-by: Derrick Brashear <shadow(a)dementix.org&gt; Tested-by: BuildBot <buildbot(a)rampaginggeek.com&gt; diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index 2d46ac2..cf432d6 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -4022,7 +4022,7 @@ DECL_PIOCTL(PSetSPrefs) ssp = (struct setspref *)ainPtr; if (ainSize < (sizeof(struct setspref) - + sizeof(struct spref) * ssp->num_servers-1)) + + sizeof(struct spref) * (ssp->num_servers-1))) return EINVAL; afs_setsprefs(&(ssp->servers[0]), ssp->num_servers, openafs-1.6.0-xstat-cm-test.patch: afs_osi.h | 6 ++++++ afs_stats.h | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) --- NEW FILE openafs-1.6.0-xstat-cm-test.patch --- commit 130144850c6d05bc69e06257a5d7219eb98697d8 Author: Michael Meffie <mmeffie(a)sinenomine.net&gt; Date: Fri Aug 12 14:29:48 2011 -0400 xstat: cm xstat time values are 32 bit The kernel space cm xstat time structures are implemented as 32 bit values in memory and on the wire. Define the client side xstat userspace structures as 32 bit time values as well to avoid size mismatches on systems with native 64 bit time values. Change-Id: I857ea48bf8e12ec006ef24affb2e65a105ce27bb Reviewed-on: http://gerrit.openafs.org/5237 Tested-by: BuildBot <buildbot(a)rampaginggeek.com&gt; Reviewed-by: Jeffrey Altman <jaltman(a)openafs.org&gt; Reviewed-by: Derrick Brashear <shadow(a)dementix.org&gt; diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h index 3205a7b..6dd7e61 100644 --- a/src/afs/afs_osi.h +++ b/src/afs/afs_osi.h @@ -179,10 +179,16 @@ typedef struct { afs_int32 tv_sec; afs_int32 tv_usec; } osi_timeval_t; +typedef struct { + afs_int32 tv_sec; + afs_int32 tv_usec; +} osi_timeval32_t; #elif defined(AFS_SUN5_ENV) typedef struct timeval32 osi_timeval_t; +typedef struct timeval32 osi_timeval32_t; #else typedef struct timeval osi_timeval_t; +typedef struct timeval osi_timeval32_t; #endif /* AFS_SGI61_ENV */ #ifndef UKERNEL diff --git a/src/afs/afs_stats.h b/src/afs/afs_stats.h index 661e283..60f2e93 100644 --- a/src/afs/afs_stats.h +++ b/src/afs/afs_stats.h @@ -43,7 +43,10 @@ #define AFS_STATS(arg) arg #ifndef KERNEL /* NOTE: Ensure this is the same size in user and kernel mode. */ -typedef struct timeval osi_timeval_t; +typedef struct { + afs_int32 tv_sec; + afs_int32 tv_usec; +} osi_timeval32_t; #endif /* !KERNEL */ #define XSTATS_DECLS struct afs_stats_opTimingData *opP = NULL; \ @@ -888,10 +891,10 @@ struct afs_stats_CMPerf { struct afs_stats_opTimingData { afs_int32 numOps; /*Number of operations executed */ afs_int32 numSuccesses; /*Number of successful ops */ - osi_timeval_t sumTime; /*Sum of sample timings */ - osi_timeval_t sqrTime; /*Sum of squares of sample timings */ - osi_timeval_t minTime; /*Minimum timing value observed */ - osi_timeval_t maxTime; /*Minimum timing value observed */ + osi_timeval32_t sumTime; /*Sum of sample timings */ + osi_timeval32_t sqrTime; /*Sum of squares of sample timings */ + osi_timeval32_t minTime; /*Minimum timing value observed */ + osi_timeval32_t maxTime; /*Minimum timing value observed */ }; /* @@ -914,10 +917,10 @@ struct afs_stats_opTimingData { struct afs_stats_xferData { afs_int32 numXfers; /*Number of successful xfers */ afs_int32 numSuccesses; /*Number of successful xfers */ - osi_timeval_t sumTime; /*Sum of timing values */ - osi_timeval_t sqrTime; /*Sum of squares of timing values */ - osi_timeval_t minTime; /*Minimum xfer time recorded */ - osi_timeval_t maxTime; /*Maximum xfer time recorded */ + osi_timeval32_t sumTime; /*Sum of timing values */ + osi_timeval32_t sqrTime; /*Sum of squares of timing values */ + osi_timeval32_t minTime; /*Minimum xfer time recorded */ + osi_timeval32_t maxTime; /*Maximum xfer time recorded */ afs_int32 sumBytes; /*Sum of KBytes transferred */ afs_int32 minBytes; /*Minimum value observed */ afs_int32 maxBytes; /*Maximum value observed */ Index: openafs.init =================================================================== RCS file: /cvs/free/rpms/openafs/devel/openafs.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openafs.init 30 Jun 2010 18:31:08 -0000 1.2 +++ openafs.init 16 Jan 2012 22:03:25 -0000 1.3 @@ -79,7 +79,10 @@ action $"Loading AFS kernel module: " /sbin/modprobe openafs RETVAL=$? - [ $RETVAL -eq 0 ] || return $RETVAL + if [ $RETVAL -ne 0 ] ; then + logger -p daemon.error "OpenAFS Kernel Module didn't load in the init script. Do you have it installed?" + return $RETVAL + fi touch /var/lock/subsys/openafs Index: openafs.spec =================================================================== RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- openafs.spec 6 Jan 2012 23:40:41 -0000 1.14 +++ openafs.spec 16 Jan 2012 22:03:25 -0000 1.15 @@ -15,7 +15,7 @@ Summary: Enterprise Network File System Name: openafs Version: 1.6.1 -Release: 0.%{pre}%{?dist} +Release: 0.%{pre}.1%{?dist} License: IBM Group: System Environment/Daemons URL: http://www.openafs.org @@ -32,6 +32,10 @@ Patch0: openafs-1.6.0-fPIC.patch +# Already merged in master, awaiting 1.6. +Patch1: openafs-1.6.0-setserverprefs.patch +Patch2: openafs-1.6.0-xstat-cm-test.patch + %description The AFS distributed filesystem. AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. @@ -97,6 +101,8 @@ # This changes osconf.m4 to build with -fPIC on i386 and x86_64 %patch0 +# These patches are already merged in master. + # Convert the licese to UTF-8 mv src/LICENSE src/LICENSE~ iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE @@ -321,6 +327,11 @@ %{_datadir}/openafs/C/afszcm.cat %changelog +* Mon Jan 16 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 0:1.6.1-0.pre1.1 +- Log an error if we couldn't load the kernel module (RF BZ #2006) +- Fix setserverprefs for vlservers (http://gerrit.openafs.org/5465) +- Fix xstat_cm_test (http://gerrit.openafs.org/5237) + * Fri Jan 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 0:1.6.1-0.pre1 - Update to OpenAFS 1.6.1 pre-release 1