[OpenAFS] FC6-T2 openafs

Derrick J Brashear shadow@dementia.org
Fri, 11 Aug 2006 14:46:57 -0400 (EDT)


Wouldn't that be:
--- osi_nfssrv.c        31 Jul 2006 21:20:29 -0000      1.1
+++ osi_nfssrv.c        11 Aug 2006 18:46:00 -0000
@@ -26,7 +26,11 @@
  #include <linux/sunrpc/svcauth.h>

  static unsigned long authtab_addr = 0;
+#if defined(module_param)
+module_param(authtab_addr, long, 0);
+#else
  MODULE_PARM(authtab_addr, "l");
+#endif
  MODULE_PARM_DESC(authtab_addr, "Address of the authtab array.");

  extern struct auth_ops *authtab[] __attribute__((weak));
Index: osi_pag_module.c
===================================================================
RCS file: /cvs/openafs/src/afs/LINUX/osi_pag_module.c,v
retrieving revision 1.1
--- osi_pag_module.c    31 Jul 2006 21:20:29 -0000      1.1
+++ osi_pag_module.c    11 Aug 2006 18:46:23 -0000
@@ -39,11 +39,19 @@
  #endif

  static unsigned long nfs_server_addr = 0;
+#if defined(module_param)
+module_param(nfs_server_addr, long, 0);
+#else
  MODULE_PARM(nfs_server_addr,  "l");
+#endif
  MODULE_PARM_DESC(nfs_server_addr,  "IP Address of NFS Server");

  static char *this_cell = 0;
+#if defined(module_param_array) && LINUX_VERSION_CODE > 
KERNEL_VERSION(2,6,9)
+module_param_array(this_cell, charp, 0);
+#else
  MODULE_PARM(this_cell, "s");
+#endif
  MODULE_PARM_DESC(this_cell, "Local cell name");

  #if defined(AFS_LINUX24_ENV)

On Fri, 11 Aug 2006, chas williams - CONTRACTOR wrote:

> In message <1155284146.14227.5.camel@heplnw8.pp.rl.ac.uk>,William Murray writes
> :
>> MODULE_PARM(nfs_server_addr,  "l");
>>
>> nfs_server_addr is defined in the line above. I suppose that means
>> something wrong with MODULE_PARM? But this is frequently used...
>
> in the interest of compatibility, the linux kernel has renamed this
> to module_param() and changed the arguments.
>
> module_param(nfs_server_addr, long, 0);
>
> might work.
>