From 83021bfaf1a78bd125c27f7326ec3ad6e2e9971c Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sat, 4 Jul 2009 14:25:10 -0700 Subject: [PATCH] Imported Upstream version 1.4.11~pre3 --- .gitignore | 67 +++++++ acinclude.m4 | 2 + aclocal.m4 | 1 + configure | 222 ++++++++++++++++++++++- configure-libafs | 222 ++++++++++++++++++++++- configure-libafs.in | 6 +- configure.in | 6 +- doc/man-pages/.gitignore | 9 + doc/xml/AdminGuide/.gitignore | 9 + doc/xml/QuickStartUnix/.cvsignore | 4 + doc/xml/QuickStartUnix/.gitignore | 9 + doc/xml/UserGuide/.gitignore | 9 + src/.gitignore | 6 + src/JAVA/classes/.gitignore | 6 + src/afs/.gitignore | 9 + src/afs/LINUX/.gitignore | 5 + src/afs/LINUX/osi_file.c | 11 +- src/afs/LINUX/osi_groups.c | 24 +-- src/afs/LINUX/osi_vnodeops.c | 82 +++++---- src/afs/VNOPS/afs_vnop_create.c | 4 +- src/afs/VNOPS/afs_vnop_dirops.c | 6 +- src/afs/VNOPS/afs_vnop_flock.c | 6 +- src/afs/VNOPS/afs_vnop_link.c | 4 +- src/afs/VNOPS/afs_vnop_lookup.c | 4 +- src/afs/VNOPS/afs_vnop_remove.c | 4 +- src/afs/VNOPS/afs_vnop_rename.c | 4 +- src/afs/VNOPS/afs_vnop_symlink.c | 4 +- src/afs/afs.h | 6 +- src/afs/afs_analyze.c | 6 +- src/afs/afs_conn.c | 26 +-- src/afs/afs_dcache.c | 4 +- src/afs/afs_init.c | 6 +- src/afs/afs_osi.c | 6 +- src/afs/afs_pioctl.c | 22 +-- src/afs/afs_prototypes.h | 12 +- src/afs/afs_segments.c | 6 +- src/afs/afs_server.c | 14 +- src/afs/afs_user.c | 10 +- src/afs/afs_util.c | 4 +- src/afs/afs_vcache.c | 14 +- src/afs/afs_volume.c | 6 +- src/afsd/.gitignore | 7 + src/afsmonitor/.gitignore | 5 + src/afsweb/apache_includes/1.2/httpd.h | 4 +- src/afsweb/apache_includes/1.3.1/httpd.h | 4 +- src/afsweb/apache_includes/1.3.6/httpd.h | 4 +- src/aklog/.gitignore | 7 + src/auth/.gitignore | 10 + src/auth/ktc.c | 4 +- src/bozo/.gitignore | 10 + src/bu_utils/.gitignore | 5 + src/bubasics/.gitignore | 12 ++ src/bucoord/.gitignore | 7 + src/budb/.gitignore | 9 + src/butc/.gitignore | 6 + src/cf/linux-test4.m4 | 20 ++ src/cf/solaris-solookup.m4 | 17 ++ src/cmd/.gitignore | 6 + src/comerr/.gitignore | 6 + src/config/.gitignore | 17 ++ src/config/afsconfig.h.in | 6 + src/config/param.i386_fbsd_61.h | 6 + src/des/.gitignore | 18 ++ src/dir/test/.gitignore | 5 + src/export/.gitignore | 8 + src/finale/.gitignore | 5 + src/fsint/.gitignore | 10 + src/fsprobe/.gitignore | 5 + src/gtx/.gitignore | 5 + src/kauth/.gitignore | 20 ++ src/kopenafs/.gitignore | 6 + src/libadmin/adminutil/.gitignore | 22 +++ src/libadmin/samples/.gitignore | 25 +++ src/libadmin/test/.gitignore | 5 + src/libafs/.gitignore | 26 +++ src/libuafs/.gitignore | 27 +++ src/log/.gitignore | 8 + src/packaging/Debian/.gitignore | 5 + src/packaging/RedHat/.gitignore | 5 + src/packaging/RedHat/openafs.spec.in | 7 +- src/pam/.gitignore | 5 + src/platform/SOLARIS/.gitignore | 5 + src/ptserver/.gitignore | 16 ++ src/rx/.gitignore | 7 + src/rx/SOLARIS/rx_knet.c | 28 ++- src/rxdebug/.gitignore | 6 + src/rxgen/.gitignore | 5 + src/rxkad/.gitignore | 11 ++ src/rxstat/.gitignore | 5 + src/scout/.gitignore | 5 + src/sys/.gitignore | 12 ++ src/tbudb/.gitignore | 9 + src/tbutc/.gitignore | 5 + src/tests/.gitignore | 74 ++++++++ src/tests/OpenAFS/.gitignore | 5 + src/tools/install/.gitignore | 5 + src/tptserver/.gitignore | 14 ++ src/tsalvaged/.gitignore | 7 + src/tubik/.gitignore | 11 ++ src/tviced/.gitignore | 6 + src/tvlserver/.gitignore | 11 ++ src/tvolser/.gitignore | 8 + src/ubik/.gitignore | 12 ++ src/update/.gitignore | 7 + src/uss/.gitignore | 5 + src/util/.gitignore | 6 + src/venus/.gitignore | 12 ++ src/venus/kdump.c | 14 +- src/venus/test/.gitignore | 8 + src/vfsck/.gitignore | 5 + src/viced/.gitignore | 8 + src/viced/afsfileprocs.c | 6 +- src/vlserver/.gitignore | 11 ++ src/vol/.gitignore | 9 + src/vol/vnode.h | 10 +- src/volser/.gitignore | 11 ++ src/volser/dumpstuff.c | 6 +- src/xstat/.gitignore | 6 + 118 files changed, 1497 insertions(+), 170 deletions(-) create mode 100644 .gitignore create mode 100644 doc/man-pages/.gitignore create mode 100644 doc/xml/AdminGuide/.gitignore create mode 100644 doc/xml/QuickStartUnix/.cvsignore create mode 100644 doc/xml/QuickStartUnix/.gitignore create mode 100644 doc/xml/UserGuide/.gitignore create mode 100644 src/.gitignore create mode 100644 src/JAVA/classes/.gitignore create mode 100644 src/afs/.gitignore create mode 100644 src/afs/LINUX/.gitignore create mode 100644 src/afsd/.gitignore create mode 100644 src/afsmonitor/.gitignore create mode 100644 src/aklog/.gitignore create mode 100644 src/auth/.gitignore create mode 100644 src/bozo/.gitignore create mode 100644 src/bu_utils/.gitignore create mode 100644 src/bubasics/.gitignore create mode 100644 src/bucoord/.gitignore create mode 100644 src/budb/.gitignore create mode 100644 src/butc/.gitignore create mode 100644 src/cf/solaris-solookup.m4 create mode 100644 src/cmd/.gitignore create mode 100644 src/comerr/.gitignore create mode 100644 src/config/.gitignore create mode 100644 src/des/.gitignore create mode 100644 src/dir/test/.gitignore create mode 100644 src/export/.gitignore create mode 100644 src/finale/.gitignore create mode 100644 src/fsint/.gitignore create mode 100644 src/fsprobe/.gitignore create mode 100644 src/gtx/.gitignore create mode 100644 src/kauth/.gitignore create mode 100644 src/kopenafs/.gitignore create mode 100644 src/libadmin/adminutil/.gitignore create mode 100644 src/libadmin/samples/.gitignore create mode 100644 src/libadmin/test/.gitignore create mode 100644 src/libafs/.gitignore create mode 100644 src/libuafs/.gitignore create mode 100644 src/log/.gitignore create mode 100644 src/packaging/Debian/.gitignore create mode 100644 src/packaging/RedHat/.gitignore create mode 100644 src/pam/.gitignore create mode 100644 src/platform/SOLARIS/.gitignore create mode 100644 src/ptserver/.gitignore create mode 100644 src/rx/.gitignore create mode 100644 src/rxdebug/.gitignore create mode 100644 src/rxgen/.gitignore create mode 100644 src/rxkad/.gitignore create mode 100644 src/rxstat/.gitignore create mode 100644 src/scout/.gitignore create mode 100644 src/sys/.gitignore create mode 100644 src/tbudb/.gitignore create mode 100644 src/tbutc/.gitignore create mode 100644 src/tests/.gitignore create mode 100644 src/tests/OpenAFS/.gitignore create mode 100644 src/tools/install/.gitignore create mode 100644 src/tptserver/.gitignore create mode 100644 src/tsalvaged/.gitignore create mode 100644 src/tubik/.gitignore create mode 100644 src/tviced/.gitignore create mode 100644 src/tvlserver/.gitignore create mode 100644 src/tvolser/.gitignore create mode 100644 src/ubik/.gitignore create mode 100644 src/update/.gitignore create mode 100644 src/uss/.gitignore create mode 100644 src/util/.gitignore create mode 100644 src/venus/.gitignore create mode 100644 src/venus/test/.gitignore create mode 100644 src/vfsck/.gitignore create mode 100644 src/viced/.gitignore create mode 100644 src/vlserver/.gitignore create mode 100644 src/vol/.gitignore create mode 100644 src/volser/.gitignore create mode 100644 src/xstat/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..10709171e --- /dev/null +++ b/.gitignore @@ -0,0 +1,67 @@ +# +# This is the root .gitignore for OpenAFS. +# +# Please don't add files that are generated in specific subdirectories +# here. This file should only contain rules for the entire tree, +# and entries specific to the top level directory. +# +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +# General rules + +.* +*.orig +*.rej +*.o +*.a +*.so +*.sl +*.so.* +*.xdr.c +*.cs.c +*.ss.c +*~ +lex.yy.c +y.tab.c +y.tab.h +Makefile +RX_component_version_number.c +AFS_component_version_number.c +AFS_component_version_number.h + +!.gitignore +!.cvsignore +!.splintrc + +# Top level files +/aclocal.m4 +/config.log +/config.cache +/config.status +/configure +/configure-libafs +/include +/lib +/autom4te.cache +/ID +/TAGS +/NTLang.bat +/NTMakefile +/golast.bat + +# Destination build directories +/amd64_linux26 +/hp_ux102 +/hp_ux110 +/i386_linux22 +/i386_linux24 +/i386_linux26 +/i386_umlinux22 +/i386_umlinux24 +/parisc_linux24 +/sgi_65 +/sun4x_56 +/sun4x_57 + diff --git a/acinclude.m4 b/acinclude.m4 index bf59b5b65..dda4ae1bb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -285,6 +285,7 @@ case $system in SOLARIS_UFSVFS_HAS_DQRWLOCK SOLARIS_PROC_HAS_P_COREFILE SOLARIS_FS_HAS_FS_ROLLED + SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS ;; *-sunos*) MKAFS_OSTYPE=SUNOS @@ -773,6 +774,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) LINUX_KERNEL_PAGE_FOLLOW_LINK LINUX_KERNEL_HLIST_UNHASHED LINUX_KEY_TYPE_H_EXISTS + LINUX_EXPORTS_KEY_TYPE_KEYRING LINUX_NEED_RHCONFIG LINUX_RECALC_SIGPENDING_ARG_TYPE LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_PARENT diff --git a/aclocal.m4 b/aclocal.m4 index 5fe1d31d6..65140aaec 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -883,4 +883,5 @@ m4_include([src/cf/ressearch.m4]) m4_include([src/cf/solaris-dqrwlock.m4]) m4_include([src/cf/solaris-fs-rolled.m4]) m4_include([src/cf/solaris-pcorefile.m4]) +m4_include([src/cf/solaris-solookup.m4]) m4_include([acinclude.m4]) diff --git a/configure b/configure index e05657764..0d336f86a 100755 --- a/configure +++ b/configure @@ -2192,7 +2192,7 @@ fi # Define the identity of the package. PACKAGE=openafs - VERSION=1.4.11pre1 + VERSION=1.4.11pre3 cat >>confdefs.h <<_ACEOF @@ -2340,10 +2340,10 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' ac_config_headers="$ac_config_headers src/config/afsconfig.h" -MACOS_VERSION=1.4.11fc1 +MACOS_VERSION=1.4.11fc3 LINUX_PKGVER=1.4.11 #LINUX_PKGREL=1.1 -LINUX_PKGREL=0.pre1 +LINUX_PKGREL=0.pre3 @@ -6131,6 +6131,86 @@ cat >>confdefs.h <<\_ACEOF #define STRUCT_FS_HAS_FS_ROLLED 1 _ACEOF +fi + + +{ echo "$as_me:$LINENO: checking whether solookup takes a sockparams" >&5 +echo $ECHO_N "checking whether solookup takes a sockparams... $ECHO_C" >&6; } +if test "${ac_cv_solaris_solookup_takes_sockparams+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _KERNEL +#include +#include +int +main () +{ +struct sockparams *sp; +(void) solookup(AF_INET, SOCK_DGRAM, 0, &sp); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_solaris_solookup_takes_sockparams=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_solaris_solookup_takes_sockparams=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +{ echo "$as_me:$LINENO: result: $ac_cv_solaris_solookup_takes_sockparams" >&5 +echo "${ECHO_T}$ac_cv_solaris_solookup_takes_sockparams" >&6; } +if test "$ac_cv_solaris_solookup_takes_sockparams" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define SOLOOKUP_TAKES_SOCKPARAMS 1 +_ACEOF + fi ;; @@ -13209,6 +13289,142 @@ echo "${ECHO_T}$ac_cv_linux_key_type_h_exists" >&6; } cat >>confdefs.h <<\_ACEOF #define KEY_TYPE_H_EXISTS 1 +_ACEOF + + fi + + { echo "$as_me:$LINENO: checking for exported key_type_keyring" >&5 +echo $ECHO_N "checking for exported key_type_keyring... $ECHO_C" >&6; } + if test "${ac_cv_linux_exports_key_type_keyring+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + + if test $AFS_SYSKVERS -ge 26 ; then + rm -fr conftest.dir + if test "x$ac_linux_kbuild_requires_extra_cflags" = "xyes" ; then + CFLAGS_PREFIX='EXTRA_' + fi + if mkdir conftest.dir && + cat >conftest.dir/Makefile <<_ACEOF && +${CFLAGS_PREFIX}CFLAGS += $CPPFLAGS + +obj-m += conftest.o +_ACEOF + cat >conftest.dir/conftest.c <<\_ACEOF && +/* confdefs.h */ +_ACEOF + cat confdefs.h >>conftest.dir/conftest.c && + cat >>conftest.dir/conftest.c <<\_ACEOF && +/* end confdefs.h */ +#include + +#ifdef KEY_TYPE_H_EXISTS +#include +#endif +#include + +void conftest(void) +{ + +printk("%s", key_type_keyring.name); + +} + +MODULE_LICENSE("http://www.openafs.org/dl/license10.html"); +_ACEOF + echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 && + make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err && + ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1 + then ac_cv_linux_exports_key_type_keyring=yes + else + sed '/^ *+/d' conftest.err >&5 + echo "$as_me: failed using Makefile:" >&5 + sed 's/^/| /' conftest.dir/Makefile >&5 + echo "$as_me: and program was:" >&5 + sed 's/^/| /' conftest.dir/conftest.c >&5 + ac_cv_linux_exports_key_type_keyring=no + fi; rm -fr conftest.err conftest.dir + else + + ac_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-I$LINUX_KERNEL_PATH/include -D__KERNEL__ -Werror-implicit-function-declaration $CPPFLAGS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + +#ifdef KEY_TYPE_H_EXISTS +#include +#endif +#include +int +main () +{ + +printk("%s", key_type_keyring.name); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_linux_exports_key_type_keyring=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_linux_exports_key_type_keyring=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" + fi +fi + + { echo "$as_me:$LINENO: result: $ac_cv_linux_exports_key_type_keyring" >&5 +echo "${ECHO_T}$ac_cv_linux_exports_key_type_keyring" >&6; } + if test "x$ac_cv_linux_exports_key_type_keyring" = "xyes"; then + +cat >>confdefs.h <<\_ACEOF +#define EXPORTED_KEY_TYPE_KEYRING 1 _ACEOF fi diff --git a/configure-libafs b/configure-libafs index 6c4f79a36..52f779d8f 100755 --- a/configure-libafs +++ b/configure-libafs @@ -2191,7 +2191,7 @@ fi # Define the identity of the package. PACKAGE=openafs-libafs - VERSION=1.4.11pre1 + VERSION=1.4.11pre3 cat >>confdefs.h <<_ACEOF @@ -2339,10 +2339,10 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' ac_config_headers="$ac_config_headers src/config/afsconfig.h" -MACOS_VERSION=1.4.11fc1 +MACOS_VERSION=1.4.11fc3 LINUX_PKGVER=1.4.11 #LINUX_PKGREL=1.1 -LINUX_PKGREL=0.pre1 +LINUX_PKGREL=0.pre3 @@ -6083,6 +6083,86 @@ cat >>confdefs.h <<\_ACEOF #define STRUCT_FS_HAS_FS_ROLLED 1 _ACEOF +fi + + +{ echo "$as_me:$LINENO: checking whether solookup takes a sockparams" >&5 +echo $ECHO_N "checking whether solookup takes a sockparams... $ECHO_C" >&6; } +if test "${ac_cv_solaris_solookup_takes_sockparams+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _KERNEL +#include +#include +int +main () +{ +struct sockparams *sp; +(void) solookup(AF_INET, SOCK_DGRAM, 0, &sp); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_solaris_solookup_takes_sockparams=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_solaris_solookup_takes_sockparams=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +{ echo "$as_me:$LINENO: result: $ac_cv_solaris_solookup_takes_sockparams" >&5 +echo "${ECHO_T}$ac_cv_solaris_solookup_takes_sockparams" >&6; } +if test "$ac_cv_solaris_solookup_takes_sockparams" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define SOLOOKUP_TAKES_SOCKPARAMS 1 +_ACEOF + fi ;; @@ -13160,6 +13240,142 @@ echo "${ECHO_T}$ac_cv_linux_key_type_h_exists" >&6; } cat >>confdefs.h <<\_ACEOF #define KEY_TYPE_H_EXISTS 1 +_ACEOF + + fi + + { echo "$as_me:$LINENO: checking for exported key_type_keyring" >&5 +echo $ECHO_N "checking for exported key_type_keyring... $ECHO_C" >&6; } + if test "${ac_cv_linux_exports_key_type_keyring+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + + if test $AFS_SYSKVERS -ge 26 ; then + rm -fr conftest.dir + if test "x$ac_linux_kbuild_requires_extra_cflags" = "xyes" ; then + CFLAGS_PREFIX='EXTRA_' + fi + if mkdir conftest.dir && + cat >conftest.dir/Makefile <<_ACEOF && +${CFLAGS_PREFIX}CFLAGS += $CPPFLAGS + +obj-m += conftest.o +_ACEOF + cat >conftest.dir/conftest.c <<\_ACEOF && +/* confdefs.h */ +_ACEOF + cat confdefs.h >>conftest.dir/conftest.c && + cat >>conftest.dir/conftest.c <<\_ACEOF && +/* end confdefs.h */ +#include + +#ifdef KEY_TYPE_H_EXISTS +#include +#endif +#include + +void conftest(void) +{ + +printk("%s", key_type_keyring.name); + +} + +MODULE_LICENSE("http://www.openafs.org/dl/license10.html"); +_ACEOF + echo make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 && + make -C $LINUX_KERNEL_BUILD M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&5 2>conftest.err && + ! grep -i "WARNING: .* undefined!$" conftest.err >/dev/null 2>&1 + then ac_cv_linux_exports_key_type_keyring=yes + else + sed '/^ *+/d' conftest.err >&5 + echo "$as_me: failed using Makefile:" >&5 + sed 's/^/| /' conftest.dir/Makefile >&5 + echo "$as_me: and program was:" >&5 + sed 's/^/| /' conftest.dir/conftest.c >&5 + ac_cv_linux_exports_key_type_keyring=no + fi; rm -fr conftest.err conftest.dir + else + + ac_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-I$LINUX_KERNEL_PATH/include -D__KERNEL__ -Werror-implicit-function-declaration $CPPFLAGS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + +#ifdef KEY_TYPE_H_EXISTS +#include +#endif +#include +int +main () +{ + +printk("%s", key_type_keyring.name); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_linux_exports_key_type_keyring=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_linux_exports_key_type_keyring=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$ac_save_CPPFLAGS" + fi +fi + + { echo "$as_me:$LINENO: result: $ac_cv_linux_exports_key_type_keyring" >&5 +echo "${ECHO_T}$ac_cv_linux_exports_key_type_keyring" >&6; } + if test "x$ac_cv_linux_exports_key_type_keyring" = "xyes"; then + +cat >>confdefs.h <<\_ACEOF +#define EXPORTED_KEY_TYPE_KEYRING 1 _ACEOF fi diff --git a/configure-libafs.in b/configure-libafs.in index 0f7161e71..9935df42e 100644 --- a/configure-libafs.in +++ b/configure-libafs.in @@ -1,10 +1,10 @@ AC_INIT(src/libafs/Makefile.common.in) -AM_INIT_AUTOMAKE(openafs-libafs,1.4.11pre1) +AM_INIT_AUTOMAKE(openafs-libafs,1.4.11pre3) AC_CONFIG_HEADER(src/config/afsconfig.h) -MACOS_VERSION=1.4.11fc1 +MACOS_VERSION=1.4.11fc3 LINUX_PKGVER=1.4.11 #LINUX_PKGREL=1.1 -LINUX_PKGREL=0.pre1 +LINUX_PKGREL=0.pre3 AC_SUBST(MACOS_VERSION) AC_SUBST(LINUX_PKGVER) diff --git a/configure.in b/configure.in index b16e04648..963454f66 100644 --- a/configure.in +++ b/configure.in @@ -1,10 +1,10 @@ AC_INIT(src/config/stds.h) -AM_INIT_AUTOMAKE(openafs,1.4.11pre1) +AM_INIT_AUTOMAKE(openafs,1.4.11pre3) AC_CONFIG_HEADER(src/config/afsconfig.h) -MACOS_VERSION=1.4.11fc1 +MACOS_VERSION=1.4.11fc3 LINUX_PKGVER=1.4.11 #LINUX_PKGREL=1.1 -LINUX_PKGREL=0.pre1 +LINUX_PKGREL=0.pre3 AC_SUBST(MACOS_VERSION) AC_SUBST(LINUX_PKGVER) diff --git a/doc/man-pages/.gitignore b/doc/man-pages/.gitignore new file mode 100644 index 000000000..03bf4c938 --- /dev/null +++ b/doc/man-pages/.gitignore @@ -0,0 +1,9 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +html +install-man +man1 +man5 +man8 diff --git a/doc/xml/AdminGuide/.gitignore b/doc/xml/AdminGuide/.gitignore new file mode 100644 index 000000000..0e5cde877 --- /dev/null +++ b/doc/xml/AdminGuide/.gitignore @@ -0,0 +1,9 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +*.html +*.pdf +version.xml + +!Makefile diff --git a/doc/xml/QuickStartUnix/.cvsignore b/doc/xml/QuickStartUnix/.cvsignore new file mode 100644 index 000000000..1f0ab98b8 --- /dev/null +++ b/doc/xml/QuickStartUnix/.cvsignore @@ -0,0 +1,4 @@ +Makefile +*.html +*.pdf +version.xml diff --git a/doc/xml/QuickStartUnix/.gitignore b/doc/xml/QuickStartUnix/.gitignore new file mode 100644 index 000000000..0e5cde877 --- /dev/null +++ b/doc/xml/QuickStartUnix/.gitignore @@ -0,0 +1,9 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +*.html +*.pdf +version.xml + +!Makefile diff --git a/doc/xml/UserGuide/.gitignore b/doc/xml/UserGuide/.gitignore new file mode 100644 index 000000000..0e5cde877 --- /dev/null +++ b/doc/xml/UserGuide/.gitignore @@ -0,0 +1,9 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +*.html +*.pdf +version.xml + +!Makefile diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 000000000..58fd35e39 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/helper-splint.sh +/dauth diff --git a/src/JAVA/classes/.gitignore b/src/JAVA/classes/.gitignore new file mode 100644 index 000000000..33530066e --- /dev/null +++ b/src/JAVA/classes/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +!.classpath +!.project diff --git a/src/afs/.gitignore b/src/afs/.gitignore new file mode 100644 index 000000000..18354e53f --- /dev/null +++ b/src/afs/.gitignore @@ -0,0 +1,9 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/afs_trace.h +/afs_trace.msf +/afszcm.cat +/unified_afs.c +/unified_afs.h diff --git a/src/afs/LINUX/.gitignore b/src/afs/LINUX/.gitignore new file mode 100644 index 000000000..21263a094 --- /dev/null +++ b/src/afs/LINUX/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/osi_vfs.h diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c index a09a0670e..8b251ab2c 100644 --- a/src/afs/LINUX/osi_file.c +++ b/src/afs/LINUX/osi_file.c @@ -11,7 +11,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/LINUX/osi_file.c,v 1.19.2.19 2009/01/15 13:27:43 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/LINUX/osi_file.c,v 1.19.2.20 2009/06/22 15:25:43 shadow Exp $"); #ifdef AFS_LINUX24_ENV #include "h/module.h" /* early to avoid printf->printk mapping */ @@ -234,9 +234,14 @@ osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize) code = inode_change_ok(inode, &newattrs); if (!code) #ifdef INODE_SETATTR_NOT_VOID - code = inode_setattr(inode, &newattrs); +#if defined(AFS_LINUX26_ENV) + if (inode->i_op && inode->i_op->setattr) + code = inode->i_op->setattr(afile->filp->f_dentry, &newattrs); + else +#endif + code = inode_setattr(inode, &newattrs); #else - inode_setattr(inode, &newattrs); + inode_setattr(inode, &newattrs); #endif unlock_kernel(); if (!code) diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c index 3c5988522..9d3034ad4 100644 --- a/src/afs/LINUX/osi_groups.c +++ b/src/afs/LINUX/osi_groups.c @@ -20,7 +20,7 @@ #endif RCSID - ("$Header: /cvs/openafs/src/afs/LINUX/osi_groups.c,v 1.25.2.20 2009/03/23 15:17:02 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/LINUX/osi_groups.c,v 1.25.2.22 2009/07/01 20:57:15 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" @@ -228,7 +228,7 @@ extern struct key_type key_type_keyring __attribute__((weak)); static struct key_type *__key_type_keyring = &key_type_keyring; static int -install_session_keyring(struct task_struct *task, struct key *keyring) +install_session_keyring(struct key *keyring) { struct key *old; char desc[20]; @@ -242,21 +242,21 @@ install_session_keyring(struct task_struct *task, struct key *keyring) /* create an empty session keyring */ not_in_quota = KEY_ALLOC_IN_QUOTA; - sprintf(desc, "_ses.%u", task->tgid); + sprintf(desc, "_ses.%u", current->tgid); #if defined(KEY_ALLOC_NEEDS_STRUCT_TASK) keyring = key_alloc(__key_type_keyring, desc, - task_uid(task), task_gid(task), task, + current_uid(), current_gid(), current, (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL, not_in_quota); #elif defined(KEY_ALLOC_NEEDS_CRED) keyring = key_alloc(__key_type_keyring, desc, - task_uid(task), task_gid(task), current_cred(), + current_uid(), current_gid(), current_cred(), (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL, not_in_quota); #else keyring = key_alloc(__key_type_keyring, desc, - task_uid(task), task_gid(task), + current_uid(), current_gid(), (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_ALL, not_in_quota); #endif @@ -273,11 +273,11 @@ install_session_keyring(struct task_struct *task, struct key *keyring) } /* install the keyring */ - spin_lock_irq(&task->sighand->siglock); - old = task_session_keyring(task); + spin_lock_irq(¤t->sighand->siglock); + old = task_session_keyring(current); smp_wmb(); - task_session_keyring(task) = keyring; - spin_unlock_irq(&task->sighand->siglock); + task_session_keyring(current) = keyring; + spin_unlock_irq(¤t->sighand->siglock); if (old) key_put(old); @@ -340,7 +340,7 @@ setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag, #ifdef LINUX_KEYRING_SUPPORT if (code == 0) { - (void) install_session_keyring(current, NULL); + (void) install_session_keyring(NULL); if (current_session_keyring()) { struct key *key; @@ -635,6 +635,7 @@ extern rwlock_t tasklist_lock __attribute__((weak)); void osi_keyring_init(void) { +#if !defined(EXPORTED_KEY_TYPE_KEYRING) struct task_struct *p; /* If we can't lock the tasklist, either with its explicit lock, @@ -673,6 +674,7 @@ void osi_keyring_init(void) rcu_read_unlock(); # endif } +#endif #endif register_key_type(&key_type_afs_pag); diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index 00f24272c..612589b66 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -22,7 +22,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.81.2.82 2009/06/03 05:41:59 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.81.2.83 2009/07/03 13:18:32 shadow Exp $"); #include "afs/sysincludes.h" #include "afsincludes.h" @@ -58,6 +58,22 @@ extern struct vcache *afs_globalVp; extern int afs_notify_change(struct dentry *dp, struct iattr *iattrp); + +/* This function converts a positive error code from AFS into a negative + * code suitable for passing into the Linux VFS layer. It checks that the + * error code is within the permissable bounds for the ERR_PTR mechanism. + * + * _All_ error codes which come from the AFS layer should be passed through + * this function before being returned to the kernel. + */ + +static inline int afs_convert_code(int code) { + if ((code >= 0) && (code <= MAX_ERRNO)) + return -code; + else + return -EIO; +} + static ssize_t afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp) { @@ -77,7 +93,7 @@ afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp) code = afs_VerifyVCache(vcp, &treq); if (code) - code = -code; + code = afs_convert_code(code); else { osi_FlushPages(vcp, credp); /* ensure stale pages are gone */ AFS_GUNLOCK(); @@ -127,7 +143,7 @@ afs_linux_write(struct file *fp, const char *buf, size_t count, loff_t * offp) afs_FakeOpen(vcp); ReleaseWriteLock(&vcp->lock); if (code) - code = -code; + code = afs_convert_code(code); else { AFS_GUNLOCK(); #ifdef DO_SYNC_READ @@ -182,19 +198,25 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir) code = afs_InitReq(&treq, credp); crfree(credp); - if (code) + if (code) { + code = afs_convert_code(code); goto out1; + } afs_InitFakeStat(&fakestat); code = afs_EvalFakeStat(&avc, &fakestat, &treq); - if (code) + if (code) { + code = afs_convert_code(code); goto out; + } /* update the cache entry */ tagain: code = afs_VerifyVCache(avc, &treq); - if (code) + if (code) { + code = afs_convert_code(code); goto out; + } /* get a reference to the entire directory */ tdc = afs_GetDCache(avc, (afs_size_t) 0, &treq, &origOffset, &tlen, 1); @@ -375,7 +397,7 @@ out: return code; out_err: - code = -code; + code = afs_convert_code(code); goto out; } @@ -397,7 +419,7 @@ afs_linux_open(struct inode *ip, struct file *fp) #endif crfree(credp); - return -code; + return afs_convert_code(code); } static int @@ -418,7 +440,7 @@ afs_linux_release(struct inode *ip, struct file *fp) #endif crfree(credp); - return -code; + return afs_convert_code(code); } static int @@ -442,7 +464,7 @@ afs_linux_fsync(struct file *fp, struct dentry *dp) unlock_kernel(); #endif crfree(credp); - return -code; + return afs_convert_code(code); } @@ -502,7 +524,7 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp) flp->fl_end = flock.l_start + flock.l_len; crfree(credp); - return -code; + return afs_convert_code(code); } #ifdef STRUCT_FILE_OPERATIONS_HAS_FLOCK @@ -552,7 +574,7 @@ afs_linux_flock(struct file *fp, int cmd, struct file_lock *flp) { flp->fl_pid = flock.l_pid; crfree(credp); - return -code; + return afs_convert_code(code); } #endif @@ -600,7 +622,7 @@ out: AFS_GUNLOCK(); crfree(credp); - return -code; + return afs_convert_code(code); } #if !defined(AFS_LINUX24_ENV) @@ -757,7 +779,7 @@ afs_linux_revalidate(struct dentry *dp) #endif crfree(credp); - return -code; + return afs_convert_code(code); } #if defined(AFS_LINUX26_ENV) @@ -1008,7 +1030,7 @@ afs_linux_create(struct inode *dip, struct dentry *dp, int mode) unlock_kernel(); #endif crfree(credp); - return -code; + return afs_convert_code(code); } /* afs_linux_lookup */ @@ -1090,14 +1112,12 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,10) if (code == ENOENT) return ERR_PTR(0); - else if ((code >= 0) && (code <= MAX_ERRNO)) - return ERR_PTR(-code); - else - return ERR_PTR(-EIO); + else + return ERR_PTR(afs_convert_code(code)); #else if (code == ENOENT) code = 0; - return -code; + return afs_convert_code(code); #endif } @@ -1119,7 +1139,7 @@ afs_linux_link(struct dentry *olddp, struct inode *dip, struct dentry *newdp) AFS_GUNLOCK(); crfree(credp); - return -code; + return afs_convert_code(code); } static int @@ -1199,7 +1219,7 @@ out: unlock_kernel(); #endif crfree(credp); - return -code; + return afs_convert_code(code); } @@ -1221,7 +1241,7 @@ afs_linux_symlink(struct inode *dip, struct dentry *dp, const char *target) code = afs_symlink(VTOAFS(dip), name, &vattr, target, credp); AFS_GUNLOCK(); crfree(credp); - return -code; + return afs_convert_code(code); } static int @@ -1258,7 +1278,7 @@ afs_linux_mkdir(struct inode *dip, struct dentry *dp, int mode) unlock_kernel(); #endif crfree(credp); - return -code; + return afs_convert_code(code); } static int @@ -1287,7 +1307,7 @@ afs_linux_rmdir(struct inode *dip, struct dentry *dp) } crfree(credp); - return -code; + return afs_convert_code(code); } @@ -1336,7 +1356,7 @@ afs_linux_rename(struct inode *oldip, struct dentry *olddp, #endif crfree(credp); - return -code; + return afs_convert_code(code); } @@ -1359,7 +1379,7 @@ afs_linux_ireadlink(struct inode *ip, char *target, int maxlen, uio_seg_t seg) if (!code) return maxlen - tuio.uio_resid; else - return -code; + return afs_convert_code(code); } #if !defined(USABLE_KERNEL_PAGE_SYMLINK_CACHE) @@ -1538,7 +1558,7 @@ afs_linux_readpage(struct file *fp, struct page *pp) } crfree(credp); - return -code; + return afs_convert_code(code); } @@ -1601,7 +1621,7 @@ afs_linux_writepage_sync(struct inode *ip, struct page *pp, if (!afs_InitReq(&treq, credp)) code = afs_DoPartialWrite(vcp, &treq); } - code = code ? -code : count - tuio.uio_resid; + code = code ? afs_convert_code(code) : count - tuio.uio_resid; vcp->states &= ~CPageWrite; ReleaseWriteLock(&vcp->lock); @@ -1714,7 +1734,7 @@ afs_linux_updatepage(struct file *fp, struct page *pp, unsigned long offset, ReleaseWriteLock(&vcp->lock); } - code = code ? -code : count - tuio.uio_resid; + code = code ? afs_convert_code(code) : count - tuio.uio_resid; afs_Trace4(afs_iclSetp, CM_TRACE_UPDATEPAGE, ICL_TYPE_POINTER, vcp, ICL_TYPE_POINTER, pp, ICL_TYPE_INT32, page_count(pp), ICL_TYPE_INT32, code); @@ -1752,7 +1772,7 @@ afs_linux_permission(struct inode *ip, int mode) AFS_GUNLOCK(); crfree(credp); - return -code; + return afs_convert_code(code); } #if defined(AFS_LINUX24_ENV) && !(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) && defined(HAVE_WRITE_BEGIN)) diff --git a/src/afs/VNOPS/afs_vnop_create.c b/src/afs/VNOPS/afs_vnop_create.c index 3fd21586d..61b551c84 100644 --- a/src/afs/VNOPS/afs_vnop_create.c +++ b/src/afs/VNOPS/afs_vnop_create.c @@ -17,7 +17,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_create.c,v 1.16.2.11 2008/12/29 21:26:25 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_create.c,v 1.16.2.12 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -45,7 +45,7 @@ afs_create(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, afs_int32 origCBs, origZaps, finalZaps; struct vrequest treq; register afs_int32 code; - register struct conn *tc; + register struct afs_conn *tc; struct VenusFid newFid; struct AFSStoreStatus InStatus; struct AFSFetchStatus OutFidStatus, OutDirStatus; diff --git a/src/afs/VNOPS/afs_vnop_dirops.c b/src/afs/VNOPS/afs_vnop_dirops.c index aa481ecb0..a0dcd7ef4 100644 --- a/src/afs/VNOPS/afs_vnop_dirops.c +++ b/src/afs/VNOPS/afs_vnop_dirops.c @@ -21,7 +21,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_dirops.c,v 1.14.2.6 2007/12/08 18:00:45 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_dirops.c,v 1.14.2.7 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -41,7 +41,7 @@ afs_mkdir(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, { struct vrequest treq; register afs_int32 code; - register struct conn *tc; + register struct afs_conn *tc; struct VenusFid newFid; register struct dcache *tdc; afs_size_t offset, len; @@ -176,7 +176,7 @@ afs_rmdir(OSI_VC_DECL(adp), char *aname, struct AFS_UCRED *acred) register struct dcache *tdc; register struct vcache *tvc = NULL; register afs_int32 code; - register struct conn *tc; + register struct afs_conn *tc; afs_size_t offset, len; struct AFSFetchStatus OutDirStatus; struct AFSVolSync tsync; diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c index 9029e19f8..fd7e0dac4 100644 --- a/src/afs/VNOPS/afs_vnop_flock.c +++ b/src/afs/VNOPS/afs_vnop_flock.c @@ -16,7 +16,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_flock.c,v 1.24.2.11 2009/06/03 18:26:02 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_flock.c,v 1.24.2.12 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -225,7 +225,7 @@ int HandleFlock(register struct vcache *avc, int acom, struct vrequest *areq, pid_t clid, int onlymine) { - struct conn *tc; + struct afs_conn *tc; struct SimpleLocks *slp, *tlp, **slpp; afs_int32 code; struct AFSVolSync tsync; @@ -809,7 +809,7 @@ HandleGetLock(register struct vcache *avc, register struct AFS_FLOCK *af, static int GetFlockCount(struct vcache *avc, struct vrequest *areq) { - register struct conn *tc; + register struct afs_conn *tc; register afs_int32 code; struct AFSFetchStatus OutStatus; struct AFSCallBack CallBack; diff --git a/src/afs/VNOPS/afs_vnop_link.c b/src/afs/VNOPS/afs_vnop_link.c index 3dcdbada6..c5d9148cb 100644 --- a/src/afs/VNOPS/afs_vnop_link.c +++ b/src/afs/VNOPS/afs_vnop_link.c @@ -17,7 +17,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_link.c,v 1.15.2.5 2007/12/08 18:00:45 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_link.c,v 1.15.2.6 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -45,7 +45,7 @@ afs_link(avc, OSI_VC_ARG(adp), aname, acred) struct vrequest treq; register struct dcache *tdc; register afs_int32 code; - register struct conn *tc; + register struct afs_conn *tc; afs_size_t offset, len; struct AFSFetchStatus OutFidStatus, OutDirStatus; struct AFSVolSync tsync; diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c index e0495ac89..a4276de63 100644 --- a/src/afs/VNOPS/afs_vnop_lookup.c +++ b/src/afs/VNOPS/afs_vnop_lookup.c @@ -18,7 +18,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v 1.50.2.24 2009/04/06 22:53:16 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v 1.50.2.25 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -549,7 +549,7 @@ afs_DoBulkStat(struct vcache *adp, long dirCookie, struct vrequest *areqp) AFSCBFids fidParm; /* file ID parm for bulk stat */ AFSBulkStats statParm; /* stat info parm for bulk stat */ int fidIndex = 0; /* which file were stating */ - struct conn *tcp = 0; /* conn for call */ + struct afs_conn *tcp = 0; /* conn for call */ AFSCBs cbParm; /* callback parm for bulk stat */ struct server *hostp = 0; /* host we got callback from */ long startTime; /* time we started the call, diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c index 9bdcedd4f..b5cde4b6e 100644 --- a/src/afs/VNOPS/afs_vnop_remove.c +++ b/src/afs/VNOPS/afs_vnop_remove.c @@ -21,7 +21,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_remove.c,v 1.31.2.17 2007/12/19 20:59:48 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_remove.c,v 1.31.2.18 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -105,7 +105,7 @@ afsremove(register struct vcache *adp, register struct dcache *tdc, struct vrequest *treqp) { register afs_int32 code; - register struct conn *tc; + register struct afs_conn *tc; struct AFSFetchStatus OutDirStatus; struct AFSVolSync tsync; XSTATS_DECLS; diff --git a/src/afs/VNOPS/afs_vnop_rename.c b/src/afs/VNOPS/afs_vnop_rename.c index b0b48561d..af49c26b7 100644 --- a/src/afs/VNOPS/afs_vnop_rename.c +++ b/src/afs/VNOPS/afs_vnop_rename.c @@ -18,7 +18,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_rename.c,v 1.16.2.12 2007/12/08 18:00:45 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_rename.c,v 1.16.2.13 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -36,7 +36,7 @@ int afsrename(struct vcache *aodp, char *aname1, struct vcache *andp, char *aname2, struct AFS_UCRED *acred, struct vrequest *areq) { - register struct conn *tc; + register struct afs_conn *tc; register afs_int32 code; afs_int32 returnCode; int oneDir, doLocally; diff --git a/src/afs/VNOPS/afs_vnop_symlink.c b/src/afs/VNOPS/afs_vnop_symlink.c index 5f15983f6..fcaaa2916 100644 --- a/src/afs/VNOPS/afs_vnop_symlink.c +++ b/src/afs/VNOPS/afs_vnop_symlink.c @@ -22,7 +22,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_symlink.c,v 1.19.2.7 2008/06/09 03:30:59 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_symlink.c,v 1.19.2.8 2009/06/24 21:30:19 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -52,7 +52,7 @@ int afs_symlink afs_uint32 now = 0; struct vrequest treq; afs_int32 code; - struct conn *tc; + struct afs_conn *tc; struct VenusFid newFid; struct dcache *tdc; afs_size_t offset, len; diff --git a/src/afs/afs.h b/src/afs/afs.h index 0314e809e..2224e5a18 100644 --- a/src/afs/afs.h +++ b/src/afs/afs.h @@ -320,9 +320,9 @@ struct unixuser { struct afs_exporter *exporter; /* more info about the exporter for the remote user */ }; -struct conn { +struct afs_conn { /* Per-connection block. */ - struct conn *next; /* Next dude same server. */ + struct afs_conn *next; /* Next dude same server. */ struct unixuser *user; /* user validated with respect to. */ struct rx_connection *id; /* RPC connid. */ struct srvAddr *srvr; /* server associated with this conn */ @@ -354,7 +354,7 @@ struct srvAddr { struct srvAddr *next_bkt; /* next item in hash bucket */ struct srvAddr *next_sa; /* another interface on same host */ struct server *server; /* back to parent */ - struct conn *conns; /* All user connections to this server */ + struct afs_conn *conns; /* All user connections to this server */ afs_int32 sa_ip; /* Host addr in network byte order */ u_short sa_iprank; /* indiv ip address priority */ u_short sa_portal; /* port addr in network byte order */ diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c index dc1e791ce..27fd175ef 100644 --- a/src/afs/afs_analyze.c +++ b/src/afs/afs_analyze.c @@ -14,7 +14,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_analyze.c,v 1.22.2.8 2008/10/27 23:54:06 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_analyze.c,v 1.22.2.9 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ @@ -323,7 +323,7 @@ static int VLDB_Same(struct VenusFid *afid, struct vrequest *areq) { struct vrequest treq; - struct conn *tconn; + struct afs_conn *tconn; int i, type = 0; union { struct vldbentry tve; @@ -537,7 +537,7 @@ afs_BlackListOnce(struct vrequest *areq, struct VenusFid *afid, * if this is a temporary or permanent error. *------------------------------------------------------------------------*/ int -afs_Analyze(register struct conn *aconn, afs_int32 acode, +afs_Analyze(register struct afs_conn *aconn, afs_int32 acode, struct VenusFid *afid, register struct vrequest *areq, int op, afs_int32 locktype, struct cell *cellp) { diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c index b8793f59f..16f4f5971 100644 --- a/src/afs/afs_conn.c +++ b/src/afs/afs_conn.c @@ -14,7 +14,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_conn.c,v 1.13.2.5 2008/10/20 16:41:00 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_conn.c,v 1.13.2.6 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ @@ -52,13 +52,13 @@ afs_int32 cryptall = 0; /* encrypt all communications */ unsigned int VNOSERVERS = 0; -struct conn * +struct afs_conn * afs_Conn(register struct VenusFid *afid, register struct vrequest *areq, afs_int32 locktype) { u_short fsport = AFS_FSPORT; struct volume *tv; - struct conn *tconn = NULL; + struct afs_conn *tconn = NULL; struct srvAddr *lowp = NULL; struct unixuser *tu; int notbusy; @@ -132,12 +132,12 @@ afs_Conn(register struct VenusFid *afid, register struct vrequest *areq, } /*afs_Conn */ -struct conn * +struct afs_conn * afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell, struct unixuser *tu, int force_if_down, afs_int32 create, afs_int32 locktype) { - struct conn *tc = 0; + struct afs_conn *tc = 0; struct rx_securityClass *csec; /*Security class object */ int isec; /*Security index */ int service; @@ -167,8 +167,8 @@ afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell, * gets set, marking the time of its ``birth''. */ UpgradeSToWLock(&afs_xconn, 37); - tc = (struct conn *)afs_osi_Alloc(sizeof(struct conn)); - memset((char *)tc, 0, sizeof(struct conn)); + tc = (struct afs_conn *)afs_osi_Alloc(sizeof(struct afs_conn)); + memset((char *)tc, 0, sizeof(struct afs_conn)); tc->user = tu; tc->port = aport; @@ -260,12 +260,12 @@ afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell, * Having force... true and UTokensBad true simultaneously means that the tokens * went bad and we're supposed to create a new, unauthenticated, connection. */ -struct conn * +struct afs_conn * afs_ConnByHost(struct server *aserver, unsigned short aport, afs_int32 acell, struct vrequest *areq, int aforce, afs_int32 locktype) { struct unixuser *tu; - struct conn *tc = 0; + struct afs_conn *tc = 0; struct srvAddr *sa = 0; AFS_STATCNT(afs_ConnByHost); @@ -301,13 +301,13 @@ afs_ConnByHost(struct server *aserver, unsigned short aport, afs_int32 acell, } /*afs_ConnByHost */ -struct conn * +struct afs_conn * afs_ConnByMHosts(struct server *ahosts[], unsigned short aport, afs_int32 acell, register struct vrequest *areq, afs_int32 locktype) { register afs_int32 i; - register struct conn *tconn; + register struct afs_conn *tconn; register struct server *ts; /* try to find any connection from the set */ @@ -326,7 +326,7 @@ afs_ConnByMHosts(struct server *ahosts[], unsigned short aport, void -afs_PutConn(register struct conn *ac, afs_int32 locktype) +afs_PutConn(register struct afs_conn *ac, afs_int32 locktype) { AFS_STATCNT(afs_PutConn); ac->refCount--; @@ -340,7 +340,7 @@ connections in this case void ForceNewConnections(struct srvAddr *sap) { - struct conn *tc = 0; + struct afs_conn *tc = 0; if (!sap) return; /* defensive check */ diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c index 25035805f..7d829baf1 100644 --- a/src/afs/afs_dcache.c +++ b/src/afs/afs_dcache.c @@ -14,7 +14,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_dcache.c,v 1.42.2.24 2008/08/26 14:02:10 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_dcache.c,v 1.42.2.25 2009/06/24 21:30:14 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ @@ -1514,7 +1514,7 @@ afs_GetDCache(register struct vcache *avc, afs_size_t abyte, struct tlocal1 *tsmall = 0; register struct dcache *tdc; register struct osi_file *file; - register struct conn *tc; + register struct afs_conn *tc; int downDCount = 0; struct server *newCallback = NULL; char setNewCallback; diff --git a/src/afs/afs_init.c b/src/afs/afs_init.c index f4b9a53ff..11ed6a05a 100644 --- a/src/afs/afs_init.c +++ b/src/afs/afs_init.c @@ -17,7 +17,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_init.c,v 1.28.2.9 2009/03/20 02:32:59 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_init.c,v 1.28.2.10 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ @@ -767,7 +767,7 @@ shutdown_AFS(void) */ { struct server *ts, *nts; - struct conn *tc, *ntc; + struct afs_conn *tc, *ntc; register struct afs_cbr *tcbrp, *tbrp; for (i = 0; i < NSERVERS; i++) { @@ -784,7 +784,7 @@ shutdown_AFS(void) AFS_GUNLOCK(); rx_DestroyConnection(tc->id); AFS_GLOCK(); - afs_osi_Free(tc, sizeof(struct conn)); + afs_osi_Free(tc, sizeof(struct afs_conn)); tc = ntc; } } diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c index c19c97dcf..3e6d83bc7 100644 --- a/src/afs/afs_osi.c +++ b/src/afs/afs_osi.c @@ -11,7 +11,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_osi.c,v 1.48.2.21 2009/05/12 13:03:47 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_osi.c,v 1.48.2.22 2009/06/24 21:54:51 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #include "afsincludes.h" /* Afs-based standard headers */ @@ -843,7 +843,7 @@ extern rwlock_t tasklist_lock __attribute__((weak)); void afs_osi_TraverseProcTable() { -#if !defined(LINUX_KEYRING_SUPPORT) +#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK)) struct task_struct *p; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && defined(EXPORTED_TASKLIST_LOCK) @@ -1110,6 +1110,7 @@ afs_osi_proc2cred(AFS_PROC * pr) return rv; } #elif defined(AFS_LINUX22_ENV) +#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK)) const struct AFS_UCRED * afs_osi_proc2cred(AFS_PROC * pr) { @@ -1142,6 +1143,7 @@ afs_osi_proc2cred(AFS_PROC * pr) return rv; } +#endif #else const struct AFS_UCRED * afs_osi_proc2cred(AFS_PROC * pr) diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index 989175f19..dbb2c596d 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -11,7 +11,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_pioctl.c,v 1.81.2.36 2009/06/03 15:14:38 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_pioctl.c,v 1.81.2.39 2009/06/29 20:24:47 shadow Exp $"); #include "afs/sysincludes.h" /* Standard vendor system headers */ #ifdef AFS_OBSD_ENV @@ -1215,7 +1215,7 @@ DECL_PIOCTL(PGetFID) DECL_PIOCTL(PSetAcl) { register afs_int32 code; - struct conn *tconn; + struct afs_conn *tconn; struct AFSOpaque acl; struct AFSVolSync tsync; struct AFSFetchStatus OutStatus; @@ -1303,7 +1303,7 @@ DECL_PIOCTL(PGetAcl) struct AFSVolSync tsync; struct AFSFetchStatus OutStatus; afs_int32 code; - struct conn *tconn; + struct afs_conn *tconn; struct AFSFid Fid; XSTATS_DECLS; @@ -1546,7 +1546,7 @@ DECL_PIOCTL(PGetVolumeStatus) char volName[32]; char *offLineMsg = afs_osi_Alloc(256); char *motd = afs_osi_Alloc(256); - register struct conn *tc; + register struct afs_conn *tc; register afs_int32 code = 0; struct AFSFetchVolumeStatus volstat; register char *cp; @@ -1601,7 +1601,7 @@ DECL_PIOCTL(PSetVolumeStatus) char volName[32]; char *offLineMsg = afs_osi_Alloc(256); char *motd = afs_osi_Alloc(256); - register struct conn *tc; + register struct afs_conn *tc; register afs_int32 code = 0; struct AFSFetchVolumeStatus volstat; struct AFSStoreVolumeStatus storeStat; @@ -2040,7 +2040,7 @@ DECL_PIOCTL(PCheckAuth) { int i; struct srvAddr *sa; - struct conn *tc; + struct afs_conn *tc; struct unixuser *tu; afs_int32 retValue; @@ -2206,7 +2206,7 @@ DECL_PIOCTL(PGetCacheSize) DECL_PIOCTL(PRemoveCallBack) { - register struct conn *tc; + register struct afs_conn *tc; register afs_int32 code = 0; struct AFSCallBack CallBacks_Array[1]; struct AFSCBFids theFids; @@ -2399,7 +2399,7 @@ DECL_PIOCTL(PRemoveMount) char *bufp; struct sysname_info sysState; afs_size_t offset, len; - register struct conn *tc; + register struct afs_conn *tc; register struct dcache *tdc; register struct vcache *tvc; struct AFSFetchStatus OutDirStatus; @@ -3723,7 +3723,7 @@ DECL_PIOCTL(PPrefetchFromTape) { register afs_int32 code, code1; afs_int32 bytes; - struct conn *tc; + struct afs_conn *tc; struct rx_call *tcall; struct AFSVolSync tsync; struct AFSFetchStatus OutStatus; @@ -3788,7 +3788,7 @@ DECL_PIOCTL(PPrefetchFromTape) DECL_PIOCTL(PFsCmd) { register afs_int32 code; - struct conn *tc; + struct afs_conn *tc; struct vcache *tvc; struct FsCmdInputs *Inputs; struct FsCmdOutputs *Outputs; @@ -3903,7 +3903,7 @@ DECL_PIOCTL(PCallBackAddr) int srvAddrCount; struct server *ts; struct srvAddr *sa; - struct conn *tc; + struct afs_conn *tc; afs_int32 i, j; struct unixuser *tu; struct srvAddr **addrs; diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h index 9562da7b0..7ba69225c 100644 --- a/src/afs/afs_prototypes.h +++ b/src/afs/afs_prototypes.h @@ -13,7 +13,7 @@ /* afs_analyze.c */ extern void init_et_to_sys_error(void); extern void afs_FinalizeReq(struct vrequest *areq); -extern int afs_Analyze(register struct conn *aconn, afs_int32 acode, +extern int afs_Analyze(register struct afs_conn *aconn, afs_int32 acode, struct VenusFid *afid, register struct vrequest *areq, int op, afs_int32 locktype, struct cell *cellp); extern int afs_CheckCode(afs_int32 acode, struct vrequest *areq, int where); @@ -245,22 +245,22 @@ extern struct cell *afs_GetRealCellByIndex(register afs_int32 cellindex, extern afs_int32 cryptall; extern afs_rwlock_t afs_xinterface; extern afs_rwlock_t afs_xconn; -extern struct conn *afs_Conn(register struct VenusFid *afid, +extern struct afs_conn *afs_Conn(register struct VenusFid *afid, register struct vrequest *areq, afs_int32 locktype); -extern struct conn *afs_ConnBySA(struct srvAddr *sap, unsigned short aport, +extern struct afs_conn *afs_ConnBySA(struct srvAddr *sap, unsigned short aport, afs_int32 acell, struct unixuser *tu, int force_if_down, afs_int32 create, afs_int32 locktype); -extern struct conn *afs_ConnByMHosts(struct server *ahosts[], +extern struct afs_conn *afs_ConnByMHosts(struct server *ahosts[], unsigned short aport, afs_int32 acell, register struct vrequest *areq, afs_int32 locktype); -extern struct conn *afs_ConnByHost(struct server *aserver, +extern struct afs_conn *afs_ConnByHost(struct server *aserver, unsigned short aport, afs_int32 acell, struct vrequest *areq, int aforce, afs_int32 locktype); -extern void afs_PutConn(register struct conn *ac, afs_int32 locktype); +extern void afs_PutConn(register struct afs_conn *ac, afs_int32 locktype); extern void ForceNewConnections(struct srvAddr *sap); diff --git a/src/afs/afs_segments.c b/src/afs/afs_segments.c index be79c1bcb..0afd5e031 100644 --- a/src/afs/afs_segments.c +++ b/src/afs/afs_segments.c @@ -14,7 +14,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_segments.c,v 1.16.2.7 2009/05/12 16:42:48 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_segments.c,v 1.16.2.8 2009/06/24 21:30:14 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ @@ -40,7 +40,7 @@ afs_uint32 afs_stampValue = 0; int afs_StoreMini(register struct vcache *avc, struct vrequest *areq) { - register struct conn *tc; + register struct afs_conn *tc; struct AFSStoreStatus InStatus; struct AFSFetchStatus OutStatus; struct AFSVolSync tsync; @@ -305,7 +305,7 @@ afs_StoreAllSegments(register struct vcache *avc, struct vrequest *areq, int nomore; unsigned int first = 0; int *shouldwake; - struct conn *tc; + struct afs_conn *tc; struct osi_file *tfile; struct rx_call *tcall; XSTATS_DECLS; diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index 3e683c32d..bc13334e4 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -33,7 +33,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_server.c,v 1.33.2.13 2008/06/29 03:26:04 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_server.c,v 1.33.2.14 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ @@ -288,7 +288,7 @@ static void CheckVLServer(register struct srvAddr *sa, struct vrequest *areq) { register struct server *aserver = sa->server; - register struct conn *tc; + register struct afs_conn *tc; register afs_int32 code; AFS_STATCNT(CheckVLServer); @@ -531,7 +531,7 @@ afs_CheckServers(int adown, struct cell *acellp) struct vrequest treq; struct server *ts; struct srvAddr *sa; - struct conn *tc; + struct afs_conn *tc; afs_int32 i, j; afs_int32 code; afs_int32 start, end = 0, delta; @@ -540,14 +540,14 @@ afs_CheckServers(int adown, struct cell *acellp) char tbuffer[CVBS]; int srvAddrCount; struct srvAddr **addrs; - struct conn **conns; + struct afs_conn **conns; int nconns; struct rx_connection **rxconns; afs_int32 *conntimer, *deltas, *results; AFS_STATCNT(afs_CheckServers); - conns = (struct conn **)0; + conns = (struct afs_conn **)0; rxconns = (struct rx_connection **) 0; conntimer = 0; nconns = 0; @@ -577,7 +577,7 @@ afs_CheckServers(int adown, struct cell *acellp) ReleaseReadLock(&afs_xsrvAddr); ReleaseReadLock(&afs_xserver); - conns = (struct conn **)afs_osi_Alloc(j * sizeof(struct conn *)); + conns = (struct afs_conn **)afs_osi_Alloc(j * sizeof(struct afs_conn *)); rxconns = (struct rx_connection **)afs_osi_Alloc(j * sizeof(struct rx_connection *)); conntimer = (afs_int32 *)afs_osi_Alloc(j * sizeof (afs_int32)); deltas = (afs_int32 *)afs_osi_Alloc(j * sizeof (afs_int32)); @@ -745,7 +745,7 @@ afs_CheckServers(int adown, struct cell *acellp) } afs_osi_Free(addrs, srvAddrCount * sizeof(*addrs)); - afs_osi_Free(conns, j * sizeof(struct conn *)); + afs_osi_Free(conns, j * sizeof(struct afs_conn *)); afs_osi_Free(rxconns, j * sizeof(struct rx_connection *)); afs_osi_Free(conntimer, j * sizeof(afs_int32)); afs_osi_Free(deltas, j * sizeof(afs_int32)); diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c index 2b5d56b7f..3cd344aa2 100644 --- a/src/afs/afs_user.c +++ b/src/afs/afs_user.c @@ -14,7 +14,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_user.c,v 1.15.2.1 2006/12/20 20:09:06 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_user.c,v 1.15.2.4 2009/06/25 12:13:34 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ @@ -64,7 +64,7 @@ RemoveUserConns(register struct unixuser *au) register int i; register struct server *ts; register struct srvAddr *sa; - register struct conn *tc, **lc; + register struct afs_conn *tc, **lc; AFS_STATCNT(RemoveUserConns); for (i = 0; i < NSERVERS; i++) { @@ -77,7 +77,7 @@ RemoveUserConns(register struct unixuser *au) AFS_GUNLOCK(); rx_DestroyConnection(tc->id); AFS_GLOCK(); - afs_osi_Free(tc, sizeof(struct conn)); + afs_osi_Free(tc, sizeof(struct afs_conn)); break; /* at most one instance per server */ } /*Found unreferenced connection for user */ } /*For each connection on the server */ @@ -232,7 +232,7 @@ afs_ResetUserConns(register struct unixuser *auser) { int i; struct srvAddr *sa; - struct conn *tc; + struct afs_conn *tc; AFS_STATCNT(afs_ResetUserConns); ObtainReadLock(&afs_xsrvAddr); @@ -581,6 +581,7 @@ static size_t afs_GCPAGs_cred_count = 0; /* * LOCKS: afs_GCPAGs_perproc_func requires write lock on afs_xuser */ +#if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK)) void afs_GCPAGs_perproc_func(AFS_PROC * pproc) { @@ -629,6 +630,7 @@ afs_GCPAGs_perproc_func(AFS_PROC * pproc) } } } +#endif /* * Go through the process table, find all unused PAGs diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c index 4ce3e530c..7b5c426df 100644 --- a/src/afs/afs_util.c +++ b/src/afs/afs_util.c @@ -16,7 +16,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_util.c,v 1.17.2.3 2006/03/09 06:41:33 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_util.c,v 1.17.2.4 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ @@ -302,7 +302,7 @@ afs_CheckLocks(void) { struct srvAddr *sa; struct server *ts; - struct conn *tc; + struct afs_conn *tc; for (i = 0; i < NSERVERS; i++) { for (ts = afs_servers[i]; ts; ts = ts->next) { if (ts->flags & SRVR_ISDOWN) diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index 2a3a8e8bf..47ec45be9 100644 --- a/src/afs/afs_vcache.c +++ b/src/afs/afs_vcache.c @@ -39,7 +39,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_vcache.c,v 1.65.2.55 2009/03/31 12:41:47 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_vcache.c,v 1.65.2.56 2009/06/24 21:30:14 shadow Exp $"); #include "afs/sysincludes.h" /*Standard vendor system headers */ #include "afsincludes.h" /*AFS-based standard headers */ @@ -396,7 +396,7 @@ afs_FlushVCBs(afs_int32 lockit) struct server *tsp; int i; struct vrequest treq; - struct conn *tc; + struct afs_conn *tc; int safety1, safety2, safety3; XSTATS_DECLS; if ((code = afs_InitReq(&treq, afs_osi_credp))) @@ -1226,7 +1226,7 @@ afs_FlushActiveVcaches(register afs_int32 doflocks) { register struct vcache *tvc; register int i; - register struct conn *tc; + register struct afs_conn *tc; register afs_int32 code; register struct AFS_UCRED *cred = NULL; struct vrequest treq, ureq; @@ -1553,7 +1553,7 @@ afs_WriteVCache(register struct vcache *avc, struct vrequest *areq) { afs_int32 code; - struct conn *tc; + struct afs_conn *tc; struct AFSFetchStatus OutStatus; struct AFSVolSync tsync; XSTATS_DECLS; @@ -1712,7 +1712,7 @@ afs_RemoteLookup(register struct VenusFid *afid, struct vrequest *areq, { afs_int32 code; afs_uint32 start; - register struct conn *tc; + register struct afs_conn *tc; struct AFSFetchStatus OutDirStatus; XSTATS_DECLS; if (!name) @@ -2412,7 +2412,7 @@ afs_FetchStatus(struct vcache * avc, struct VenusFid * afid, { int code; afs_uint32 start = 0; - register struct conn *tc; + register struct afs_conn *tc; struct AFSCallBack CallBack; struct AFSVolSync tsync; struct volume *volp; @@ -2509,7 +2509,7 @@ afs_FetchStatus(struct vcache * avc, struct VenusFid * afid, void afs_StuffVcache(register struct VenusFid *afid, struct AFSFetchStatus *OutStatus, - struct AFSCallBack *CallBack, register struct conn *tc, + struct AFSCallBack *CallBack, register struct afs_conn *tc, struct vrequest *areq) { register afs_int32 code, i, newvcache = 0; diff --git a/src/afs/afs_volume.c b/src/afs/afs_volume.c index f890a353f..7bfe175e4 100644 --- a/src/afs/afs_volume.c +++ b/src/afs/afs_volume.c @@ -19,7 +19,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/afs/afs_volume.c,v 1.26.2.7 2007/01/25 11:24:30 shadow Exp $"); + ("$Header: /cvs/openafs/src/afs/afs_volume.c,v 1.26.2.8 2009/06/24 21:30:14 shadow Exp $"); #include "afs/stds.h" #include "afs/sysincludes.h" /* Standard vendor system headers */ @@ -615,7 +615,7 @@ afs_NewVolumeByName(char *aname, afs_int32 acell, int agood, struct uvldbentry *utve; struct cell *tcell; char *tbuffer, *ve; - struct conn *tconn; + struct afs_conn *tconn; struct vrequest treq; if (strlen(aname) > VL_MAXNAMELEN) /* Invalid volume name */ @@ -911,7 +911,7 @@ InstallUVolumeEntry(struct volume *av, struct uvldbentry *ve, int acell, struct cell *tcell, struct vrequest *areq) { register struct server *ts; - struct conn *tconn; + struct afs_conn *tconn; struct cell *cellp; register int i, j; afs_uint32 serverid; diff --git a/src/afsd/.gitignore b/src/afsd/.gitignore new file mode 100644 index 000000000..033f72217 --- /dev/null +++ b/src/afsd/.gitignore @@ -0,0 +1,7 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/afs.ppc_darwin.plist +/afsd +/vsys diff --git a/src/afsmonitor/.gitignore b/src/afsmonitor/.gitignore new file mode 100644 index 000000000..711a42961 --- /dev/null +++ b/src/afsmonitor/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/afsmonitor diff --git a/src/afsweb/apache_includes/1.2/httpd.h b/src/afsweb/apache_includes/1.2/httpd.h index 7481bc7ba..51cdc3fb0 100644 --- a/src/afsweb/apache_includes/1.2/httpd.h +++ b/src/afsweb/apache_includes/1.2/httpd.h @@ -429,7 +429,7 @@ struct htaccess_result { }; -typedef struct conn_rec conn_rec; +typedef struct afs_conn_rec conn_rec; typedef struct server_rec server_rec; typedef struct request_rec request_rec; typedef struct listen_rec listen_rec; @@ -553,7 +553,7 @@ struct request_rec { /* Things which are per connection */ -struct conn_rec { +struct afs_conn_rec { pool *pool; server_rec *server; diff --git a/src/afsweb/apache_includes/1.3.1/httpd.h b/src/afsweb/apache_includes/1.3.1/httpd.h index ed87ca790..14bf94a79 100644 --- a/src/afsweb/apache_includes/1.3.1/httpd.h +++ b/src/afsweb/apache_includes/1.3.1/httpd.h @@ -565,7 +565,7 @@ extern "C" { const struct htaccess_result *next; }; - typedef struct conn_rec conn_rec; + typedef struct afs_conn_rec conn_rec; typedef struct server_rec server_rec; typedef struct request_rec request_rec; typedef struct listen_rec listen_rec; @@ -718,7 +718,7 @@ extern "C" { /* Things which are per connection */ - struct conn_rec { + struct afs_conn_rec { ap_pool *pool; server_rec *server; diff --git a/src/afsweb/apache_includes/1.3.6/httpd.h b/src/afsweb/apache_includes/1.3.6/httpd.h index b92580537..ba86ea290 100644 --- a/src/afsweb/apache_includes/1.3.6/httpd.h +++ b/src/afsweb/apache_includes/1.3.6/httpd.h @@ -622,7 +622,7 @@ extern "C" { const struct htaccess_result *next; }; - typedef struct conn_rec conn_rec; + typedef struct afs_conn_rec conn_rec; typedef struct server_rec server_rec; typedef struct request_rec request_rec; typedef struct listen_rec listen_rec; @@ -784,7 +784,7 @@ extern "C" { /* Things which are per connection */ - struct conn_rec { + struct afs_conn_rec { ap_pool *pool; server_rec *server; diff --git a/src/aklog/.gitignore b/src/aklog/.gitignore new file mode 100644 index 000000000..52e12aa79 --- /dev/null +++ b/src/aklog/.gitignore @@ -0,0 +1,7 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/aklog +/asetkey +/klog diff --git a/src/auth/.gitignore b/src/auth/.gitignore new file mode 100644 index 000000000..46cdcd4d9 --- /dev/null +++ b/src/auth/.gitignore @@ -0,0 +1,10 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/acfg_errors.c +/auth.h +/cellconfig.h +/copyauth +/ktc_errors.c +/setkey diff --git a/src/auth/ktc.c b/src/auth/ktc.c index 68aff139f..89f493358 100644 --- a/src/auth/ktc.c +++ b/src/auth/ktc.c @@ -17,7 +17,7 @@ #endif RCSID - ("$Header: /cvs/openafs/src/auth/ktc.c,v 1.15.2.13 2009/06/04 20:51:57 shadow Exp $"); + ("$Header: /cvs/openafs/src/auth/ktc.c,v 1.15.2.14 2009/06/29 20:24:49 shadow Exp $"); #if defined(UKERNEL) #include "afs/sysincludes.h" @@ -1621,7 +1621,7 @@ ktc_curpag(void) afs_int32 pag; /* now setup for the pioctl */ - iob.in = -1; + iob.in = NULL; iob.in_size = 0; iob.out = &pag; iob.out_size = sizeof(afs_int32); diff --git a/src/bozo/.gitignore b/src/bozo/.gitignore new file mode 100644 index 000000000..515ed0c2f --- /dev/null +++ b/src/bozo/.gitignore @@ -0,0 +1,10 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/bnode.h +/bos +/bos_util +/boserr.c +/bosint.h +/bosserver diff --git a/src/bu_utils/.gitignore b/src/bu_utils/.gitignore new file mode 100644 index 000000000..da8bf61e9 --- /dev/null +++ b/src/bu_utils/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/fms diff --git a/src/bubasics/.gitignore b/src/bubasics/.gitignore new file mode 100644 index 000000000..2be46ad7a --- /dev/null +++ b/src/bubasics/.gitignore @@ -0,0 +1,12 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/bumon.h +/butc.h +/butc_errs.c +/butm.h +/butm_errs.c +/butx.h +/butx_errs.c +/tcdata.h diff --git a/src/bucoord/.gitignore b/src/bucoord/.gitignore new file mode 100644 index 000000000..aef3d8be2 --- /dev/null +++ b/src/bucoord/.gitignore @@ -0,0 +1,7 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/backup +/bc.h +/bucoord_errs.c diff --git a/src/budb/.gitignore b/src/budb/.gitignore new file mode 100644 index 000000000..142751586 --- /dev/null +++ b/src/budb/.gitignore @@ -0,0 +1,9 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/budb.h +/budb_client.h +/budb_errs.c +/budb_errs.h +/budb_server diff --git a/src/butc/.gitignore b/src/butc/.gitignore new file mode 100644 index 000000000..58438fd3c --- /dev/null +++ b/src/butc/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/butc +/read_tape diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 index e7b91dcdc..e63c5a0c6 100644 --- a/src/cf/linux-test4.m4 +++ b/src/cf/linux-test4.m4 @@ -1152,3 +1152,23 @@ _p.owner= "";], if test "x$ac_cv_linux_struct_proc_dir_entry_has_owner" = "xyes"; then AC_DEFINE([STRUCT_PROC_DIR_ENTRY_HAS_OWNER], 1, [define if struct proc_dir_entry has an owner member]) fi]) + +AC_DEFUN([LINUX_EXPORTS_KEY_TYPE_KEYRING], [ + AC_MSG_CHECKING([for exported key_type_keyring]) + AC_CACHE_VAL([ac_cv_linux_exports_key_type_keyring], [ + AC_TRY_KBUILD( +[ +#ifdef KEY_TYPE_H_EXISTS +#include +#endif +#include ], +[ +printk("%s", key_type_keyring.name); +], + ac_cv_linux_exports_key_type_keyring=yes, + ac_cv_linux_exports_key_type_keyring=no)]) + AC_MSG_RESULT($ac_cv_linux_exports_key_type_keyring) + if test "x$ac_cv_linux_exports_key_type_keyring" = "xyes"; then + AC_DEFINE([EXPORTED_KEY_TYPE_KEYRING], 1, [define if key_type_keyring is exported]) + fi]) + diff --git a/src/cf/solaris-solookup.m4 b/src/cf/solaris-solookup.m4 new file mode 100644 index 000000000..c1cb3090a --- /dev/null +++ b/src/cf/solaris-solookup.m4 @@ -0,0 +1,17 @@ +AC_DEFUN([SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS], [ +AC_MSG_CHECKING(whether solookup takes a sockparams) +AC_CACHE_VAL(ac_cv_solaris_solookup_takes_sockparams, +[ +AC_TRY_COMPILE( +[#define _KERNEL +#include +#include ], +[struct sockparams *sp; +(void) solookup(AF_INET, SOCK_DGRAM, 0, &sp);], +ac_cv_solaris_solookup_takes_sockparams=yes, +ac_cv_solaris_solookup_takes_sockparams=no)]) +AC_MSG_RESULT($ac_cv_solaris_solookup_takes_sockparams) +if test "$ac_cv_solaris_solookup_takes_sockparams" = "yes"; then + AC_DEFINE(SOLOOKUP_TAKES_SOCKPARAMS, 1, [define if solookup takes a sockparams**]) +fi +]) diff --git a/src/cmd/.gitignore b/src/cmd/.gitignore new file mode 100644 index 000000000..3ba98f218 --- /dev/null +++ b/src/cmd/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/cmd.h +/cmd_errors.c diff --git a/src/comerr/.gitignore b/src/comerr/.gitignore new file mode 100644 index 000000000..b032bc9de --- /dev/null +++ b/src/comerr/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/compile_et +/et_lex.lex.c diff --git a/src/config/.gitignore b/src/config/.gitignore new file mode 100644 index 000000000..06916db5b --- /dev/null +++ b/src/config/.gitignore @@ -0,0 +1,17 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/Makefile.*_*[0123456789] +/Makefile.*_*[0123456789].in +/Makefile.config +/Makefile.version +/Makefile.version-NOCML +/afsconfig.h +/afsconfig.h.in +/config +/mkvers +/param.h.new +/shlib-build +/shlib-install +/stamp-h1 diff --git a/src/config/afsconfig.h.in b/src/config/afsconfig.h.in index daf2075ac..57360b1d0 100644 --- a/src/config/afsconfig.h.in +++ b/src/config/afsconfig.h.in @@ -67,6 +67,9 @@ /* define if your linux kernel exports kallsyms */ #undef EXPORTED_KALLSYMS_SYMBOL +/* define if key_type_keyring is exported */ +#undef EXPORTED_KEY_TYPE_KEYRING + /* define if proc_root_fs is exported */ #undef EXPORTED_PROC_ROOT_FS @@ -627,6 +630,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } /* define if time_t is defined */ #undef SIZEOF_TIME_T +/* define if solookup takes a sockparams** */ +#undef SOLOOKUP_TAKES_SOCKPARAMS + /* define if your statfs takes a dentry argument */ #undef STATFS_TAKES_DENTRY diff --git a/src/config/param.i386_fbsd_61.h b/src/config/param.i386_fbsd_61.h index b72eae41f..895a552e9 100644 --- a/src/config/param.i386_fbsd_61.h +++ b/src/config/param.i386_fbsd_61.h @@ -195,4 +195,10 @@ enum vcexcl { NONEXCL, EXCL }; #endif /* !defined(UKERNEL) */ +/* general user-space compiles */ + +#if defined(UKERNEL) || !defined(KERNEL) +#define STDLIB_HAS_MALLOC_PROTOS 1 +#endif + #endif /* AFS_PARAM_H */ diff --git a/src/des/.gitignore b/src/des/.gitignore new file mode 100644 index 000000000..c99d36d42 --- /dev/null +++ b/src/des/.gitignore @@ -0,0 +1,18 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/fp.c +/ip.c +/key_perm.h +/make_fp +/make_ip +/make_keyperm +/make_odd +/make_p +/make_p_table +/make_s_table +/odd.h +/p.c +/p_table.h +/s_table.h diff --git a/src/dir/test/.gitignore b/src/dir/test/.gitignore new file mode 100644 index 000000000..fd9470426 --- /dev/null +++ b/src/dir/test/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/dtest diff --git a/src/export/.gitignore b/src/export/.gitignore new file mode 100644 index 000000000..8de20f3c7 --- /dev/null +++ b/src/export/.gitignore @@ -0,0 +1,8 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/cfgafs64 +/cfgexport64 +/export.ext.nonfs +/export64.ext.nonfs diff --git a/src/finale/.gitignore b/src/finale/.gitignore new file mode 100644 index 000000000..2069da97c --- /dev/null +++ b/src/finale/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/translate_et diff --git a/src/fsint/.gitignore b/src/fsint/.gitignore new file mode 100644 index 000000000..48c64c071 --- /dev/null +++ b/src/fsint/.gitignore @@ -0,0 +1,10 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/Kcallback.h +/Kvice.h +/Kpagcb.h +/afscbint.h +/afsint.h +/pagcb.h diff --git a/src/fsprobe/.gitignore b/src/fsprobe/.gitignore new file mode 100644 index 000000000..bf549b4dd --- /dev/null +++ b/src/fsprobe/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/fsprobe_test diff --git a/src/gtx/.gitignore b/src/gtx/.gitignore new file mode 100644 index 000000000..cfd0bd9ee --- /dev/null +++ b/src/gtx/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/gtxtest diff --git a/src/kauth/.gitignore b/src/kauth/.gitignore new file mode 100644 index 000000000..b57503159 --- /dev/null +++ b/src/kauth/.gitignore @@ -0,0 +1,20 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/Kkauth.h +/ka-forwarder +/kaerrors.c +/kas +/kaserver +/kauth.h +/kautils.h +/kdb +/klog +/klog.krb +/klogin +/klogin.krb +/knfs +/kpasswd +/kpwvalid +/rebuild diff --git a/src/kopenafs/.gitignore b/src/kopenafs/.gitignore new file mode 100644 index 000000000..79f405a9e --- /dev/null +++ b/src/kopenafs/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/test-setpag +/test-unlog diff --git a/src/libadmin/adminutil/.gitignore b/src/libadmin/adminutil/.gitignore new file mode 100644 index 000000000..a445292fb --- /dev/null +++ b/src/libadmin/adminutil/.gitignore @@ -0,0 +1,22 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/afs_AdminBosErrors.c +/afs_AdminBosErrors.h +/afs_AdminCfgErrors.c +/afs_AdminCfgErrors.h +/afs_AdminClientErrors.c +/afs_AdminClientErrors.h +/afs_AdminCommonErrors.c +/afs_AdminCommonErrors.h +/afs_AdminKasErrors.c +/afs_AdminKasErrors.h +/afs_AdminMiscErrors.c +/afs_AdminMiscErrors.h +/afs_AdminPtsErrors.c +/afs_AdminPtsErrors.h +/afs_AdminUtilErrors.c +/afs_AdminUtilErrors.h +/afs_AdminVosErrors.c +/afs_AdminVosErrors.h diff --git a/src/libadmin/samples/.gitignore b/src/libadmin/samples/.gitignore new file mode 100644 index 000000000..9be4c688d --- /dev/null +++ b/src/libadmin/samples/.gitignore @@ -0,0 +1,25 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/cm_client_config +/cm_list_cells +/cm_local_cell +/cm_server_prefs +/rxdebug_basic_stats +/rxdebug_conns +/rxdebug_peers +/rxdebug_rx_stats +/rxdebug_supported_stats +/rxdebug_version +/rxstat_clear_peer +/rxstat_clear_process +/rxstat_disable_peer +/rxstat_disable_process +/rxstat_enable_peer +/rxstat_enable_process +/rxstat_get_peer +/rxstat_get_process +/rxstat_get_version +/rxstat_query_peer +/rxstat_query_process diff --git a/src/libadmin/test/.gitignore b/src/libadmin/test/.gitignore new file mode 100644 index 000000000..e7057fc6f --- /dev/null +++ b/src/libadmin/test/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/afscp diff --git a/src/libafs/.gitignore b/src/libafs/.gitignore new file mode 100644 index 000000000..8ecfa7b7d --- /dev/null +++ b/src/libafs/.gitignore @@ -0,0 +1,26 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/MODLOAD +/MODLOAD-* +/MODLOAD32 +/MODLOAD64 +/Makefile.common +/MakefileProto.* +!/MakefileProto.*.in +/afs +/afsint +/asm +/asm-generic +/config +/export.h +/export.exp +/export64.exp +/h +/linux +/net +/netinet +/rpc +/sys +/rx diff --git a/src/libuafs/.gitignore b/src/libuafs/.gitignore new file mode 100644 index 000000000..bf4c7595b --- /dev/null +++ b/src/libuafs/.gitignore @@ -0,0 +1,27 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/Makefile.common +/MakefileProto.* +!/MakefileProto.*.in +/UAFS +/JUAFS +/afs +/afsint +/config +/des +/h +/inet +/linktest +/net +/netinet +/nfs +/nsapi +/rpc +/rx +/sys +/ufs +/export.exp +/export.h +/export64.exp diff --git a/src/log/.gitignore b/src/log/.gitignore new file mode 100644 index 000000000..cf84a7412 --- /dev/null +++ b/src/log/.gitignore @@ -0,0 +1,8 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/kseal +/tokens +/tokens.krb +/unlog diff --git a/src/packaging/Debian/.gitignore b/src/packaging/Debian/.gitignore new file mode 100644 index 000000000..8a8112e23 --- /dev/null +++ b/src/packaging/Debian/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/rules diff --git a/src/packaging/RedHat/.gitignore b/src/packaging/RedHat/.gitignore new file mode 100644 index 000000000..355be81c8 --- /dev/null +++ b/src/packaging/RedHat/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/openafs.spec diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index d0a099d1b..3b51bc1dd 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -1,4 +1,4 @@ -# Openafs Spec $Revision: 1.1.2.30 $ +# Openafs Spec $Revision: 1.1.2.31 $ # TEMPORARY fix for patch fuzz so we can build on Fedora 10 %define _default_patch_fuzz 2 @@ -1448,10 +1448,13 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %{pamdir}/pam_afs.so %{initdir}/openafs-client %{_mandir}/man1/cmdebug.* +%{_mandir}/man1/copyauth.* %{_mandir}/man1/up.* %{_mandir}/man5/afs* %{_mandir}/man5/cacheinfo.* %{_mandir}/man8/afsd.* +%{_mandir}/man8/rmtsysd.* +%{_mandir}/man8/vsys.* %{_mandir}/man5/CellAlias.* %{_mandir}/man5/afszcm.cat.* @@ -1514,6 +1517,7 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %{_mandir}/man8/prdb_check.* %{_mandir}/man8/ptserver.* %{_mandir}/man8/pt_util.* +%{_mandir}/man8/restorevol.* %{_mandir}/man8/salvager.* %{_mandir}/man8/upclient.* %{_mandir}/man8/upserver.* @@ -1565,6 +1569,7 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %{_libdir}/librxstat.a %{_libdir}/libubik.a %{_mandir}/man1/rxgen.* +%{_mandir}/man1/compile_et.* %if %{build_dkmspkg} %files -n dkms-%{name} diff --git a/src/pam/.gitignore b/src/pam/.gitignore new file mode 100644 index 000000000..c381a3cd7 --- /dev/null +++ b/src/pam/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/test_pam diff --git a/src/platform/SOLARIS/.gitignore b/src/platform/SOLARIS/.gitignore new file mode 100644 index 000000000..5c5591bed --- /dev/null +++ b/src/platform/SOLARIS/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/fs_conv_sol26 diff --git a/src/ptserver/.gitignore b/src/ptserver/.gitignore new file mode 100644 index 000000000..41b0e94bc --- /dev/null +++ b/src/ptserver/.gitignore @@ -0,0 +1,16 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/Kptint.h +/db_verify +/pt_util +/pterror.c +/pterror.h +/ptint.h +/pts +/ptserver +/readgroup +/readpwd +/testpt +/ptclient diff --git a/src/rx/.gitignore b/src/rx/.gitignore new file mode 100644 index 000000000..e2d9bf7af --- /dev/null +++ b/src/rx/.gitignore @@ -0,0 +1,7 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/rxdebug +/rxdumptrace +/rxperf diff --git a/src/rx/SOLARIS/rx_knet.c b/src/rx/SOLARIS/rx_knet.c index 19d4ab654..3204a4069 100644 --- a/src/rx/SOLARIS/rx_knet.c +++ b/src/rx/SOLARIS/rx_knet.c @@ -11,7 +11,7 @@ #include "afs/param.h" RCSID - ("$Header: /cvs/openafs/src/rx/SOLARIS/rx_knet.c,v 1.19.2.5 2008/07/07 17:15:37 shadow Exp $"); + ("$Header: /cvs/openafs/src/rx/SOLARIS/rx_knet.c,v 1.19.2.6 2009/06/24 21:38:42 shadow Exp $"); #ifdef AFS_SUN5_ENV #include "rx/rx_kcommon.h" @@ -50,10 +50,17 @@ RCSID /* * Function pointers for kernel socket routines */ +#ifdef SOLOOKUP_TAKES_SOCKPARAMS +struct sonode *(*sockfs_socreate) + (struct sockparams *, int, int, int, int, int *) = NULL; +int (*sockfs_solookup) + (int, int, int, struct sockparams **) = NULL; +#else struct sonode *(*sockfs_socreate) (vnode_t *, int, int, int, int, struct sonode *, int *) = NULL; struct vnode *(*sockfs_solookup) (int, int, int, char *, int *) = NULL; +#endif /* SOLOOKUP_TAKES_SOCKPARAMS */ int (*sockfs_sobind) (struct sonode *, struct sockaddr *, int, int, int) = NULL; int (*sockfs_sorecvmsg) @@ -327,12 +334,19 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) struct sockaddr_in addr; int error; int len; +#ifdef SOLOOKUP_TAKES_SOCKPARAMS + struct sockparams *sp; +#endif AFS_STATCNT(osi_NewSocket); if (sockfs_solookup == NULL) { sockfs_solookup = +#ifdef SOLOOKUP_TAKES_SOCKPARAMS + (int (*)())modlookup("sockfs", "solookup"); +#else (struct vnode * (*)())modlookup("sockfs", "solookup"); +#endif if (sockfs_solookup == NULL) { return NULL; } @@ -381,6 +395,14 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) } #endif +#ifdef SOLOOKUP_TAKES_SOCKPARAMS + error = sockfs_solookup(AF_INET, SOCK_DGRAM, 0, &sp); + if (error != 0) { + return NULL; + } + + so = sockfs_socreate(sp, AF_INET, SOCK_DGRAM, 0, SOV_STREAM, &error); +#else accessvp = sockfs_solookup(AF_INET, SOCK_DGRAM, 0, "/dev/udp", &error); if (accessvp == NULL) { return NULL; @@ -388,6 +410,8 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) so = sockfs_socreate(accessvp, AF_INET, SOCK_DGRAM, 0, SOV_STREAM, NULL, &error); +#endif /* SOLOOKUP_TAKES_SOCKPARAMS */ + if (so == NULL) { return NULL; } @@ -423,7 +447,7 @@ rxk_NewSocket(short aport) } int -osi_FreeSocket(register osi_socket *asocket) +osi_FreeSocket(register osi_socket asocket) { extern int rxk_ListenerPid; struct sonode *so = (struct sonode *)asocket; diff --git a/src/rxdebug/.gitignore b/src/rxdebug/.gitignore new file mode 100644 index 000000000..a54f3c908 --- /dev/null +++ b/src/rxdebug/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/rxdebug +/rxdumptrace diff --git a/src/rxgen/.gitignore b/src/rxgen/.gitignore new file mode 100644 index 000000000..8705b3ee8 --- /dev/null +++ b/src/rxgen/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/rxgen diff --git a/src/rxkad/.gitignore b/src/rxkad/.gitignore new file mode 100644 index 000000000..4bd986822 --- /dev/null +++ b/src/rxkad/.gitignore @@ -0,0 +1,11 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/crypt_conn.c +/fcrypt.c +/fcrypt.h +/rxkad.h +/rxkad_errs.c +/sboxes.h +/fc_test diff --git a/src/rxstat/.gitignore b/src/rxstat/.gitignore new file mode 100644 index 000000000..a2f9b2c24 --- /dev/null +++ b/src/rxstat/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/rxstat.h diff --git a/src/scout/.gitignore b/src/scout/.gitignore new file mode 100644 index 000000000..d8d9b1c10 --- /dev/null +++ b/src/scout/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/scout diff --git a/src/sys/.gitignore b/src/sys/.gitignore new file mode 100644 index 000000000..89e6019b2 --- /dev/null +++ b/src/sys/.gitignore @@ -0,0 +1,12 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/pagsh +/pagsh.krb +/picobj +/rmtsys.h +/rmtsysd +/afs.exp +/afsl.exp +/Krmtsys.h diff --git a/src/tbudb/.gitignore b/src/tbudb/.gitignore new file mode 100644 index 000000000..142751586 --- /dev/null +++ b/src/tbudb/.gitignore @@ -0,0 +1,9 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/budb.h +/budb_client.h +/budb_errs.c +/budb_errs.h +/budb_server diff --git a/src/tbutc/.gitignore b/src/tbutc/.gitignore new file mode 100644 index 000000000..38fa2d080 --- /dev/null +++ b/src/tbutc/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/butc diff --git a/src/tests/.gitignore b/src/tests/.gitignore new file mode 100644 index 000000000..3ac53c83e --- /dev/null +++ b/src/tests/.gitignore @@ -0,0 +1,74 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/xf_errs.c +/xf_errs.h +/OS.pm +/Dirpath.pm +/afsdump_dirlist +/afsdump_extract +/afsdump_scan +/append-over-page +/asu +/blocks-new-file +/create-dirs +/create-files +/create-remove +/create-stat +/create-symlinks +/dumpscan_errs.c +/dumpscan_errs.h +/dumptool +/dup2-and-unlog +/echo-n +/exit-wo-close +/fchmod +/fsx +/hardlink1 +/hardlink2 +/hardlink4 +/hello-world +/intr-read +/kill-softer +/kill-softly +/large-dir +/large-dir2 +/large-dir3 +/make-page +/mkdir2 +/mkdir3 +/mmap-and-read +/mmap-cat +/mmap-shared-write +/mmap-vs-read +/mmap-vs-read2 +/mountpoint +/pine +/read-vs-mmap +/read-vs-mmap2 +/read-write +/readdir-vs-lstat +/rename-under-feet +/rename5 +/rename6 +/rm-rf +/run-tests +/still-there-p +/strange-characters-c +/symlink +/test-parallel1 +/test-parallel2 +/test-setgroups +/test-setpag +/truncate +/truncate-files +/utime-dir +/utime-file +/write-closed +/write-closed2 +/write-large +/write-rand +/write-ro-file +/write-ucc +/write3 diff --git a/src/tests/OpenAFS/.gitignore b/src/tests/OpenAFS/.gitignore new file mode 100644 index 000000000..ab1eb5b07 --- /dev/null +++ b/src/tests/OpenAFS/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/Dirpath.pm diff --git a/src/tools/install/.gitignore b/src/tools/install/.gitignore new file mode 100644 index 000000000..34377552e --- /dev/null +++ b/src/tools/install/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +!.afs_state diff --git a/src/tptserver/.gitignore b/src/tptserver/.gitignore new file mode 100644 index 000000000..e993f8443 --- /dev/null +++ b/src/tptserver/.gitignore @@ -0,0 +1,14 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/db_verify +/pt_util +/pterror.c +/pterror.h +/ptint.h +/pts +/ptserver +/readgroup +/readpwd +/testpt diff --git a/src/tsalvaged/.gitignore b/src/tsalvaged/.gitignore new file mode 100644 index 000000000..f41b5f2a2 --- /dev/null +++ b/src/tsalvaged/.gitignore @@ -0,0 +1,7 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/fssync-debug +/salvageserver +/salvsync-debug diff --git a/src/tubik/.gitignore b/src/tubik/.gitignore new file mode 100644 index 000000000..6a89fe955 --- /dev/null +++ b/src/tubik/.gitignore @@ -0,0 +1,11 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/ubik.h +/ubik_int.h +/udebug +/uerrors.c +/utst_client +/utst_int.h +/utst_server diff --git a/src/tviced/.gitignore b/src/tviced/.gitignore new file mode 100644 index 000000000..aec943525 --- /dev/null +++ b/src/tviced/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/fileserver +/state_analyzer diff --git a/src/tvlserver/.gitignore b/src/tvlserver/.gitignore new file mode 100644 index 000000000..42e3943be --- /dev/null +++ b/src/tvlserver/.gitignore @@ -0,0 +1,11 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/cnvldb +/vl_errors.c +/vlclient +/vldb_check +/vldbint.h +/vlserver +/vlserver.h diff --git a/src/tvolser/.gitignore b/src/tvolser/.gitignore new file mode 100644 index 000000000..3efc92d30 --- /dev/null +++ b/src/tvolser/.gitignore @@ -0,0 +1,8 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/vl_errors.c +/vlserver.h +/volserver +/vos diff --git a/src/ubik/.gitignore b/src/ubik/.gitignore new file mode 100644 index 000000000..56b5b4e7c --- /dev/null +++ b/src/ubik/.gitignore @@ -0,0 +1,12 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/Kubik_int.h +/ubik.h +/ubik_int.h +/udebug +/uerrors.c +/utst_client +/utst_int.h +/utst_server diff --git a/src/update/.gitignore b/src/update/.gitignore new file mode 100644 index 000000000..6988d1289 --- /dev/null +++ b/src/update/.gitignore @@ -0,0 +1,7 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/upclient +/update.h +/upserver diff --git a/src/uss/.gitignore b/src/uss/.gitignore new file mode 100644 index 000000000..ab9d3d305 --- /dev/null +++ b/src/uss/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/uss diff --git a/src/util/.gitignore b/src/util/.gitignore new file mode 100644 index 000000000..948072003 --- /dev/null +++ b/src/util/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/dirpath.h +/sys diff --git a/src/venus/.gitignore b/src/venus/.gitignore new file mode 100644 index 000000000..13fad91e0 --- /dev/null +++ b/src/venus/.gitignore @@ -0,0 +1,12 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/cmdebug +/fs +/fstrace +/kdump-* +/up +/kdump +/kdump64 +/livesys diff --git a/src/venus/kdump.c b/src/venus/kdump.c index 830f4bceb..369dd61d4 100644 --- a/src/venus/kdump.c +++ b/src/venus/kdump.c @@ -11,7 +11,7 @@ #include RCSID - ("$Header: /cvs/openafs/src/venus/kdump.c,v 1.33.2.9 2008/10/03 20:40:05 shadow Exp $"); + ("$Header: /cvs/openafs/src/venus/kdump.c,v 1.33.2.10 2009/06/24 21:30:20 shadow Exp $"); #include #include @@ -2005,10 +2005,10 @@ print_allocs(pnt) T += j; printf("%20s:\t%8d bytes\t[%d servers/%d bytes each]\n", "Server package", j, i, sizeof(struct server)); - j = (Nconns * sizeof(struct conn)); + j = (Nconns * sizeof(struct afs_conn)); T += j; printf("%20s:\t%8d bytes\t[%d conns/%d bytes each]\n", - "Connection package", j, Nconns, sizeof(struct conn)); + "Connection package", j, Nconns, sizeof(struct afs_conn)); i = (AFS_NCBRS * sizeof(struct afs_cbr)) * (j = afs_cmperfstats. @@ -2669,12 +2669,12 @@ void print_conns(kmem, srv, conns, Con, pnt) int kmem, Con, pnt; struct srvAddr *srv; - struct conn *conns; + struct afs_conn *conns; { - struct conn *cep, ce, *centry = &ce; + struct afs_conn *cep, ce, *centry = &ce; int i = 1; - cep = (struct conn *)conns; + cep = (struct afs_conn *)conns; if (pnt && Con != 2) { if (cep) printf("\tRPC connections for server %lx:\n", srv); @@ -2693,7 +2693,7 @@ print_conns(kmem, srv, conns, Con, pnt) void print_conn(kmem, conns, ptr, pnt) int kmem, pnt; - struct conn *conns, *ptr; + struct afs_conn *conns, *ptr; { if (!pnt) return; diff --git a/src/venus/test/.gitignore b/src/venus/test/.gitignore new file mode 100644 index 000000000..fb1380372 --- /dev/null +++ b/src/venus/test/.gitignore @@ -0,0 +1,8 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/fulltest +/getinitparams +/idtest +/owntest diff --git a/src/vfsck/.gitignore b/src/vfsck/.gitignore new file mode 100644 index 000000000..2b2ef6b68 --- /dev/null +++ b/src/vfsck/.gitignore @@ -0,0 +1,5 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/vfsck diff --git a/src/viced/.gitignore b/src/viced/.gitignore new file mode 100644 index 000000000..ce810659c --- /dev/null +++ b/src/viced/.gitignore @@ -0,0 +1,8 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/cbd +/check_sysid +/fileserver +/fsprobe diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 573424aaa..3d6520035 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -29,7 +29,7 @@ #include RCSID - ("$Header: /cvs/openafs/src/viced/afsfileprocs.c,v 1.81.2.53 2009/03/25 13:07:27 shadow Exp $"); + ("$Header: /cvs/openafs/src/viced/afsfileprocs.c,v 1.81.2.54 2009/07/03 13:04:17 shadow Exp $"); #include #include @@ -336,8 +336,10 @@ CallPreamble(register struct rx_call *acall, int activecall, /* Is it still necessary to drop this? We hit the net, we should... */ H_UNLOCK; - if (uclient) + if (uclient) { hpr_End(uclient); + uclient = NULL; + } code = hpr_Initialize(&uclient); if (!code) diff --git a/src/vlserver/.gitignore b/src/vlserver/.gitignore new file mode 100644 index 000000000..42e3943be --- /dev/null +++ b/src/vlserver/.gitignore @@ -0,0 +1,11 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/cnvldb +/vl_errors.c +/vlclient +/vldb_check +/vldbint.h +/vlserver +/vlserver.h diff --git a/src/vol/.gitignore b/src/vol/.gitignore new file mode 100644 index 000000000..abfec40a3 --- /dev/null +++ b/src/vol/.gitignore @@ -0,0 +1,9 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/salvager +/volinfo +/gi +/fs_conv_sol26 +/fssync-debug diff --git a/src/vol/vnode.h b/src/vol/vnode.h index 0bf724508..62aaf81c2 100644 --- a/src/vol/vnode.h +++ b/src/vol/vnode.h @@ -105,7 +105,7 @@ typedef struct VnodeDiskObject { * backup purposes */ afs_int32 group; /* unix group */ afs_int32 vn_ino_hi; /* high part of 64 bit inode. */ - bit32 reserved6; + bit32 vn_length_hi; /* high part of 64 bit length */ /* Missing: * archiving/migration * encryption key @@ -156,10 +156,10 @@ typedef struct Vnode { #define SIZEOF_SMALLVNODE (sizeof (struct Vnode)) #ifdef AFS_LARGEFILE_ENV -#define VN_GET_LEN(N, V) FillInt64(N, (V)->disk.reserved6, (V)->disk.length) -#define VNDISK_GET_LEN(N, V) FillInt64(N, (V)->reserved6, (V)->length) -#define VN_SET_LEN(V, N) SplitInt64(N, (V)->disk.reserved6, (V)->disk.length) -#define VNDISK_SET_LEN(V, N) SplitInt64(N, (V)->reserved6, (V)->length) +#define VN_GET_LEN(N, V) FillInt64(N, (V)->disk.vn_length_hi, (V)->disk.length) +#define VNDISK_GET_LEN(N, V) FillInt64(N, (V)->vn_length_hi, (V)->length) +#define VN_SET_LEN(V, N) SplitInt64(N, (V)->disk.vn_length_hi, (V)->disk.length) +#define VNDISK_SET_LEN(V, N) SplitInt64(N, (V)->vn_length_hi, (V)->length) #else /* !AFS_LARGEFILE_ENV */ #define VN_GET_LEN(N, V) (N) = (V)->disk.length; #define VNDISK_GET_LEN(N, V) (N) = (V)->length; diff --git a/src/volser/.gitignore b/src/volser/.gitignore new file mode 100644 index 000000000..270a0005e --- /dev/null +++ b/src/volser/.gitignore @@ -0,0 +1,11 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/restorevol +/volerr.c +/volint.h +/volser.h +/volserver +/vos +/voldump diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index da7131870..ca592fbf7 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -11,7 +11,7 @@ #include RCSID - ("$Header: /cvs/openafs/src/volser/dumpstuff.c,v 1.25.2.12 2008/10/10 14:43:04 shadow Exp $"); + ("$Header: /cvs/openafs/src/volser/dumpstuff.c,v 1.25.2.13 2009/06/29 15:28:22 shadow Exp $"); #include #include @@ -383,6 +383,10 @@ ReadVolumeHeader(register struct iod *iodp, VolumeDiskData * vol) if (!ReadInt32(iodp, (afs_uint32 *) & vol->dayUse)) return VOLSERREAD_DUMPERROR; break; + case 'V': + if (!ReadInt32(iodp, &trash/*volUpdateCounter*/)) + return VOLSERREAD_DUMPERROR; + break; } } iod_ungetc(iodp, tag); diff --git a/src/xstat/.gitignore b/src/xstat/.gitignore new file mode 100644 index 000000000..9688fc37b --- /dev/null +++ b/src/xstat/.gitignore @@ -0,0 +1,6 @@ +# After changing this file, please run +# git ls-files -i --exclude-standard +# to check that you haven't inadvertently ignored any tracked files. + +/xstat_cm_test +/xstat_fs_test -- 2.39.5