jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SOLARIS: Use vn_renamepath as early as possible

Browse Source 
Commit 6c509601 uses the vn_renamepath when we are building on Solaris
11. However, some recent patch level of Solaris 10 (more recent than
stock 10u10) has the same problem fixed by that commit, where
vn_setpath takes an additional argument. So instead, just test for the
existence of vn_renamepath itself, so we also use it on Solaris 10
when we can.

Thanks to Rich Sudlow for reporting this.

Change-Id: Ic1c0437d2438c6e19b8fff8278ecda9b96bd020b
Reviewed-on: http://gerrit.openafs.org/8920
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
This commit is contained in:
Andrew Deason 2013-01-18 14:27:16 -06:00 committed by Derrick Brashear
parent f6f145c90f
commit 1b63689b99
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acinclude.m4
View File

@ -405,6 +405,7 @@ case $system in
SOLARIS_UFSVFS_HAS_DQRWLOCK
SOLARIS_FS_HAS_FS_ROLLED
SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS
SOLARIS_HAVE_VN_RENAMEPATH
;;
*-sunos*)
MKAFS_OSTYPE=SUNOS

4
src/afs/SOLARIS/osi_vnodeops.c
View File

@ -1558,7 +1558,7 @@ gafs_rename(struct vcache *aodp, char *aname1,
if (avcp) {
struct vnode *vp = AFSTOV(avcp), *pvp = AFSTOV(andp);
# ifdef AFS_SUN511_ENV
# ifdef HAVE_VN_RENAMEPATH
vn_renamepath(pvp, vp, aname2, strlen(aname2));
# else
mutex_enter(&vp->v_lock);
@ -1568,7 +1568,7 @@ gafs_rename(struct vcache *aodp, char *aname1,
}
mutex_exit(&vp->v_lock);
vn_setpath(afs_globalVp, pvp, vp, aname2, strlen(aname2));
# endif /* !AFS_SUN511_ENV */
# endif /* !HAVE_VN_RENAMEPATH */
AFS_RELE(avcp);
}

35
src/cf/solaris-renamepath.m4 Normal file
View File

@ -0,0 +1,35 @@
dnl This checks for the existence of the vn_renamepath function, added in
dnl Solaris 11 and Solaris 10u8.
dnl
dnl Just trying to use the function is not sufficient for a configure test,
dnl since using an undeclared function is just a warning, and we want an error.
dnl Rather than try to rely on making warnings generate errors (which may
dnl change depending on what compiler version we're using, or in the future
dnl different compilers entirely), we detect the function by declaring an
dnl incompatible prototype. If that successfully compiles, vn_renamepath
dnl does not exist in the system headers, so we know it's not there. If it
dnl fails, we try to compile again without the incompatible prototype, to
dnl make sure we didn't fail for some other reason. If that succeeds, we know
dnl we have vn_renamepath available; if it fails, something else is wrong and
dnl we just try to proceed, assuming we don't have it.
dnl
AC_DEFUN([SOLARIS_HAVE_VN_RENAMEPATH],
[AC_CACHE_CHECK([for vn_renamepath],
[ac_cv_solaris_have_vn_renamepath],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#define _KERNEL
#include <sys/vnode.h>]],
[[void vn_renamepath(void);]])],
[ac_cv_solaris_have_vn_renamepath=no],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#define _KERNEL
#include <sys/vnode.h>]])],
[ac_cv_solaris_have_vn_renamepath=yes],
[ac_cv_solaris_have_vn_renamepath=no])])])
AS_IF([test "x$ac_cv_solaris_have_vn_renamepath" = "xyes"],
[AC_DEFINE([HAVE_VN_RENAMEPATH], [1],
[define if the function vn_renamepath exists])])])