[ewg] Re: [PATCH OFED-1.5] NFSRDMA: NFS backport for 2.6.22

[Jack Morgenstein]

On Friday 19 June 2009 19:14, Jon Mason wrote:
> This patch provides the NFS backport for 2.6.22.
> 
> It passes Connectathon as a client and server over TCP and RDMA.
> 
> Signed-Off-By: Jon Mason <jon at opengridcomputing.com>
> 
This patch fails compilation on the 2.6.22 kernel, as follows:
jackm at mtldesk006:/local/of15/ofed_kernel-2.6.22> make -k all > /dev/null
/local/of15/ofed_kernel-2.6.22/fs/nfs/nfsroot.c:132: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘__initconst’
/local/of15/ofed_kernel-2.6.22/fs/nfs/nfsroot.c: In function ‘root_nfs_parse’:
/local/of15/ofed_kernel-2.6.22/fs/nfs/nfsroot.c:191: error: ‘tokens’ undeclared (first use in this function)
/local/of15/ofed_kernel-2.6.22/fs/nfs/nfsroot.c:191: error: (Each undeclared identifier is reported only once
/local/of15/ofed_kernel-2.6.22/fs/nfs/nfsroot.c:191: error: for each function it appears in.)
make[3]: *** [/local/of15/ofed_kernel-2.6.22/fs/nfs/nfsroot.o] Error 1
make[3]: Target `__build' not remade because of errors.
make[2]: *** [/local/of15/ofed_kernel-2.6.22/fs/nfs] Error 2
make[2]: Target `__build' not remade because of errors.
make[1]: *** [_module_/local/of15/ofed_kernel-2.6.22] Error 2
make[1]: Target `modules' not remade because of errors.
make: *** [kernel] Error 2
make: Target `all' not remade because of errors.

Note that in file fs/nfs/nfsroot.c, we have (after I applied the patch):
static const match_table_t tokens __initconst = {
        {Opt_port, "port=%u"},
        {Opt_rsize, "rsize=%u"},

It should probably be: 
static match_table_t tokens = {

(which is consistent with changes for super.c in your patch:
      +-static const match_table_t nfs_mount_option_tokens = {
      ++static match_table_t nfs_mount_option_tokens = {
 except that you also need to get rid of the "__initconst" keyword).

Please resolve this, and re-send the patch (and also check this for the 2.6.25 patch)

Did you actually compile the patch on kernel 2.6.22?

-Jack