* conf/mount/mount_aix.c (mount_aix3): minor cleanup of filehandle

copying code.

diff --git a/ChangeLog b/ChangeLog
index 72ca0b9632c98464d9acaea27816a67ab61d94f5..0b89c7a27c57c89c457ecf6638a827638a379c98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-24  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * conf/mount/mount_aix.c (mount_aix3): minor cleanup of filehandle
+       copying code.
+
 2005-06-23  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * conf/nfs_prot/nfs_prot_hpux.h: add extern for h_errno, which may

diff --git a/conf/mount/mount_aix.c b/conf/mount/mount_aix.c
index 1c731aaf70b5bb7e18cfbdf4a812fc4449896d48..bbb00e3f0fe3b85ddafc85bf9f07947996c3f329 100644 (file)
--- a/conf/mount/mount_aix.c
+++ b/conf/mount/mount_aix.c
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: mount_aix.c,v 1.14 2005/06/23 20:02:40 ezk Exp $
+ * $Id: mount_aix.c,v 1.15 2005/06/25 02:25:37 ezk Exp $
  *
  */
 
@@ -121,7 +121,7 @@ mount_aix3(char *fsname, char *dir, int flags, int type, void *data, char *mnt_o
 #endif /* DEBUG */
 
 #ifdef MOUNT_TYPE_NFS3_BIS
- retry_ibm_stupid_service_pack:
+ retry_ibm_buggy_service_pack:
 #endif /* MOUNT_TYPE_NFS3_BIS */
   switch (aix_type) {
 
@@ -145,7 +145,7 @@ mount_aix3(char *fsname, char *dir, int flags, int type, void *data, char *mnt_o
     v2args.numclust = v3args->numclust;
     v2args.biods = v3args->biods;
 #else /* not AIX_52 */
-    memmove(v2args.fh.x, ((fhandle_t *)v3args->fh)->x, FHSIZE);
+    memmove((voidp) v2args.fh.x, v3args->fh, FHSIZE);
 #endif /* not AIX_52 */
     v2args.flags = v3args->flags;
     v2args.wsize = v3args->wsize;
@@ -233,7 +233,7 @@ mount_aix3(char *fsname, char *dir, int flags, int type, void *data, char *mnt_o
 #ifdef DEBUG
       dlog("mount_aix3: retrying with alternate nfs3_args structure");
 #endif /* DEBUG */
-      goto retry_ibm_stupid_service_pack;
+      goto retry_ibm_buggy_service_pack;
     }
 #endif /* MOUNT_TYPE_NFS3_BIS */
   }