From: Peng Tao <bergwolf@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
Dmitry Eremin <dmitry.eremin@intel.com>,
Peng Tao <bergwolf@gmail.com>,
Andreas Dilger <andreas.dilger@intel.com>
Subject: [PATCH v2 09/12] staging/lustre/build: fix compilation issue with is_compat_task
Date: Tue, 26 Nov 2013 23:04:43 +0800 [thread overview]
Message-ID: <1385478286-5525-10-git-send-email-bergwolf@gmail.com> (raw)
In-Reply-To: <1385478286-5525-1-git-send-email-bergwolf@gmail.com>
From: Dmitry Eremin <dmitry.eremin@intel.com>
After removing LIBCFS_HAVE_IS_COMPAT_TASK test we have a
compilation issue with kernels configured without CONFIG_COMPAT.
Lustre-change: http://review.whamcloud.com/7118
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2800
Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
---
.../staging/lustre/lustre/llite/llite_internal.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index c326ff2..b6a22b6 100644
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -650,7 +650,12 @@ static inline int ll_need_32bit_api(struct ll_sb_info *sbi)
#if BITS_PER_LONG == 32
return 1;
#else
- return unlikely(is_compat_task() || (sbi->ll_flags & LL_SBI_32BIT_API));
+ return unlikely(
+#ifdef CONFIG_COMPAT
+ is_compat_task() ||
+#endif
+ (sbi->ll_flags & LL_SBI_32BIT_API)
+ );
#endif
}
--
1.7.9.5
next prev parent reply other threads:[~2013-11-26 15:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-26 15:04 [PATCH v2 00/12] staging/lustre: sync with extern tree, set 2 Peng Tao
2013-11-26 15:04 ` [PATCH v2 01/12] Revert "staging/lustre/nfs: writing to new files will return ENOENT" Peng Tao
2013-11-26 15:04 ` [PATCH v2 02/12] staging/lustre/llog: MGC to use OSD API for backup logs Peng Tao
2013-11-26 18:33 ` Levente Kurusa
2013-11-26 15:04 ` [PATCH v2 03/12] staging/lustre: constify uuid argument of obd_uuid2str Peng Tao
2013-11-26 15:04 ` [PATCH v2 04/12] staging/lustre: make obd_uuid_equals return bool Peng Tao
2013-11-26 15:04 ` [PATCH v2 05/12] staging/lustre/scrub: OI scrub on OST Peng Tao
2013-11-26 15:04 ` [PATCH v2 06/12] staging/lustre: make code align in lma_incompat Peng Tao
2013-11-26 15:04 ` [PATCH v2 07/12] staging/lustre/llite: don't check for O_CREAT in it_create_mode Peng Tao
2013-11-26 15:04 ` [PATCH v2 08/12] staging/lustre/build: clean up unused variables and dead code Peng Tao
2013-11-26 15:04 ` Peng Tao [this message]
2013-11-26 15:04 ` [PATCH v2 10/12] staging/lustre/ptlrpc: Fix a crash when dereferencing NULL pointer Peng Tao
2013-11-26 15:04 ` [PATCH v2 11/12] staging/lustre/hsm: Add hsm_release feature Peng Tao
2013-11-26 15:04 ` [PATCH v2 12/12] staging/lustre/llite: extended attribute cache Peng Tao
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=1385478286-5525-10-git-send-email-bergwolf@gmail.com \
--to=bergwolf@gmail.com \
--cc=andreas.dilger@intel.com \
--cc=dmitry.eremin@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.