Messages in this thread | | | Date | Sat, 11 Oct 2014 13:15:23 -0700 | From | Greg KH <> | Subject | Re: [PATCH 1/1] drivers/staging: Fixed sparse error "directive in argument list" |
| |
On Sat, Oct 11, 2014 at 08:13:42PM +0100, Filipe Gonçalves wrote: > This patch fixes a sparse warning on layout.c (ptlrpc) that was caused by having preprocessor directives in the arguments to a macro. > > Signed-off-by: Filipe Gonçalves <filipe@codinghighway.com> > --- > drivers/staging/lustre/lustre/ptlrpc/layout.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/lustre/lustre/ptlrpc/layout.c b/drivers/staging/lustre/lustre/ptlrpc/layout.c > index 5b83371..211df78 100644 > --- a/drivers/staging/lustre/lustre/ptlrpc/layout.c > +++ b/drivers/staging/lustre/lustre/ptlrpc/layout.c > @@ -978,10 +978,11 @@ struct req_msg_field RMF_CONN = > EXPORT_SYMBOL(RMF_CONN); > > struct req_msg_field RMF_CONNECT_DATA = > +#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 7, 50, 0) > DEFINE_MSGF("cdata", > RMF_F_NO_SIZE_CHECK /* we allow extra space for interop */, > -#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 7, 50, 0) > sizeof(struct obd_connect_data), > + lustre_swab_connect, NULL);
Ick ick ick.
Yeah, sparse might complain about this, but how about just properly deleting the #ifdef entirely, and not perpetuate it even more?
It shouldn't be needed anymore now that the code is in the kernel tree.
greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |