lkml.org 
[lkml]   [2014]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] drivers: staging: lustre: Use 'force_die' instead of 'die' to avoid compiling issue
On Sun, Jul 13, 2014 at 10:50:55PM +0800, Chen Gang wrote:
> Some of architectures have already defined 'die' as macro, so can not use
> this common name as declaration in other modules, or will cause compiling
> issue. So use more precise name 'force_die' (like 'wrap_bulk') instead of.
>
> The related error (with allmodconfig under score):
>
> CC [M] drivers/staging/lustre/lustre/ptlrpc/sec.o
> drivers/staging/lustre/lustre/ptlrpc/sec.c: In function 'sptlrpc_cli_ctx_expire':
> drivers/staging/lustre/lustre/ptlrpc/sec.c:309:13: error: 'struct ptlrpc_ctx_ops' has no member named '__die'
> ctx->cc_ops->die(ctx, 0);
> ^
> drivers/staging/lustre/lustre/ptlrpc/sec.c: In function 'ctx_refresh_timeout':
> drivers/staging/lustre/lustre/ptlrpc/sec.c:594:26: error: 'struct ptlrpc_ctx_ops' has no member named '__die'
> req->rq_cli_ctx->cc_ops->die(req->rq_cli_ctx, 0);
> ^
> make[5]: *** [drivers/staging/lustre/lustre/ptlrpc/sec.o] Error 1
> make[4]: *** [drivers/staging/lustre/lustre/ptlrpc] Error 2
> make[3]: *** [drivers/staging/lustre/lustre] Error 2
> make[2]: *** [drivers/staging/lustre] Error 2
> make[1]: *** [drivers/staging] Error 2
> make: *** [drivers] Error 2
>
>
> Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
> ---
> drivers/staging/lustre/lustre/include/lustre_sec.h | 2 +-
> drivers/staging/lustre/lustre/ptlrpc/sec.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)

This doesn't apply to my tree, can you please refresh it against the
staging-next branch of staging.git so that I can apply it?

thanks,

greg k-h


\
 
 \ /
  Last update: 2014-07-13 21:41    [W:0.055 / U:0.612 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site