[OpenAFS] 1.3.70 comments?

[Rainer Toebbicke]

--=-lzPe8KAjalmF3hOML1UM
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Tue, 2004-08-17 at 16:47, Derrick J Brashear wrote:

> > . fstrace hangs the machine almost immediately after 'fstrace setset cm
> > -act'. This is on an SMP i386 Linux 2.4.21-15.0.3.EL. It did the same
> > BTW on everything after Openafs 1.2.6 that I tested.
> 
> Hm, i thought i fixed that.

The delta
fstrace-avoid-double-glock-in-dentry-code-during-fstrace-20040719? That
one is in.


> 
> > . afs/LINUX/osi_vnodeops.c uses the page_count macro which on that
> > system is defined in mm_inline.h which is not included (since there are
> > plenty of distributions without this file). The (brutal) fix is
> >
> > *** openafs/src/afs/LINUX/osi_vnodeops.c.0rig   2004-07-22
> > 00:23:38.000000000 +0200
> > --- openafs/src/afs/LINUX/osi_vnodeops.c        2004-08-16
> > 12:20:59.000000000 +0200
> > ***************
> > *** 29,34 ****
> > --- 29,37 ----
> >  #include "afs/afs_stats.h"
> >  #include "afs/afs_osidnlc.h"
> >  #include "h/mm.h"
> > + #if !defined(page_count)
> > + #include "h/mm_inline.h"
> > + #endif
> >  #include "h/pagemap.h"
> >  #if defined(AFS_LINUX24_ENV)
> >  #include "h/smp_lock.h"
> >
> > ...but ideally 'configure' should sort that out.
> 
> probably, which subdirectory does mm_inline.h come from? include/linux or 
> include/asm?
> 

include/linux/mm_inline.h



> > . src/butc/tcprocs.c re-defines a number of XBSA-related variables
> > already defined in .../tcmain.c. Does not build on Linux when 'xbsa' is
> > defined.
> 
> I have no xbsa stuff, so i'd love to get a patch for this from someone who 
> does.

Attached.

-- 
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Rainer Toebbicke 
European Laboratory for Particle Physics(CERN) - Geneva, Switzerland  
Phone: +41 22 767 8985       Fax: +41 22 767 7155 

--=-lzPe8KAjalmF3hOML1UM
Content-Disposition: attachment; filename=patch_xbsa_cleanup
Content-Transfer-Encoding: quoted-printable
Content-Type: text/x-patch; name=patch_xbsa_cleanup; charset=ISO-8859-1

*** openafs/src/butc/butc_xbsa.h.0rig	Wed Jul 16 01:14:48 2003
--- openafs/src/butc/butc_xbsa.h	Wed Aug 18 10:51:42 2004
***************
*** 123,126 ****
--- 123,148 ----
  				   char *objectSpaceName, char *pathName);
 =20
  #endif /*xbsa */
+=20
+=20
+ /* XBSA Global Parameters */
+=20
+ #ifdef XBSA_TCMAIN
+ #define XBSA_EXT
+ #else
+ #define XBSA_EXT extern
+ #endif
+=20
+ XBSA_EXT afs_int32 xbsaType;
+ #ifdef xbsa
+ XBSA_EXT struct butx_transactionInfo butxInfo;
+=20
+ #define rpc_c_protect_level_default 0
+ XBSA_EXT afs_uint32 dumpRestAuthnLevel;
+ XBSA_EXT char *xbsaObjectOwner;
+ XBSA_EXT char *appObjectOwner;
+ XBSA_EXT char *adsmServerName;
+ XBSA_EXT char *xbsaSecToken;
+ XBSA_EXT char *xbsalGName;
+ #endif /*xbsa*/
  #endif /* OPENAFS_BUTC_XBSA_H */
*** openafs/src/butc/tcmain.c.0rig	Sat Nov 29 22:37:56 2003
--- openafs/src/butc/tcmain.c	Wed Aug 18 10:38:00 2004
***************
*** 55,60 ****
--- 55,61 ----
  #include "error_macros.h"
  #include <afs/budb_errs.h>
  #include "afs/butx.h"
+ #define XBSA_TCMAIN
  #include "butc_xbsa.h"
 =20
  #define N_SECURITY_OBJECTS 3
***************
*** 92,111 ****
  char *restoretofile;
  int forcemultiple;
 =20
- /* XBSA Global Parameters */
- afs_int32 xbsaType;
- #ifdef xbsa
- struct butx_transactionInfo butxInfo;
-=20
- #define rpc_c_protect_level_default 0
- afs_uint32 dumpRestAuthnLevel =3D rpc_c_protect_level_default;
- char *xbsaObjectOwner;
- char *appObjectOwner;
- char *adsmServerName;
- char *xbsaSecToken;
- char *xbsalGName;
- #endif
-=20
  int maxpass;
  #define PASSESMIN  1
  #define PASSESMAX  10
--- 93,98 ----
*** openafs/src/butc/tcprocs.c.0rig	Mon Aug 16 10:14:20 2004
--- openafs/src/butc/tcprocs.c	Wed Aug 18 10:35:28 2004
***************
*** 51,70 ****
      return 1;
  }
 =20
- /* XBSA Global Parameters */
- afs_int32 xbsaType;
- #ifdef xbsa
- struct butx_transactionInfo butxInfo;
-=20
- #define rpc_c_protect_level_default 0
- afs_uint32 dumpRestAuthnLevel =3D rpc_c_protect_level_default;
- char *xbsaObjectOwner;
- char *appObjectOwner;
- char *adsmServerName;
- char *xbsaSecToken;
- char *xbsalGName;
- #endif
-=20
  /* -------------------------
   * butc - interface routines - alphabetic order
   * -------------------------
--- 51,56 ----

--=-lzPe8KAjalmF3hOML1UM--