From: "Filipe Gonçalves" <filipe@codinghighway.com>
To: oleg.drokin@intel.com, andreas.dilger@intel.com,
gregkh@linuxfoundation.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Cc: "Filipe Gonçalves" <filipe@codinghighway.com>
Subject: [PATCH 1/1] drivers/staging: Fixed sparse error "directive in argument list"
Date: Sat, 11 Oct 2014 20:13:42 +0100 [thread overview]
Message-ID: <1413054822-7894-1-git-send-email-filipe@codinghighway.com> (raw)
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);
#else
/* For interoperability with 1.8 and 2.0 clients/servers.
* The RPC verification code allows larger RPC buffers, but not
@@ -990,9 +991,11 @@ struct req_msg_field RMF_CONNECT_DATA =
* size is at least as large as obd_connect_data_v1. That is not
* not in itself harmful, since the chance of just corrupting this
* field is low. See JIRA LU-16 for details. */
+ DEFINE_MSGF("cdata",
+ RMF_F_NO_SIZE_CHECK /* we allow extra space for interop */,
sizeof(struct obd_connect_data_v1),
-#endif
lustre_swab_connect, NULL);
+#endif
EXPORT_SYMBOL(RMF_CONNECT_DATA);
struct req_msg_field RMF_DLM_REQ =
--
1.9.1
next reply other threads:[~2014-10-11 19:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-11 19:13 Filipe Gonçalves [this message]
2014-10-11 20:15 ` [PATCH 1/1] drivers/staging: Fixed sparse error "directive in argument list" Greg KH
2014-10-11 21:06 ` Filipe Gonçalves
2014-10-11 21:49 ` Drokin, Oleg
2014-10-11 22:02 ` Filipe Gonçalves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413054822-7894-1-git-send-email-filipe@codinghighway.com \
--to=filipe@codinghighway.com \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg.drokin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox