From: Peng Tao <bergwolf@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, Peng Tao <bergwolf@gmail.com>,
Andreas Dilger <andreas.dilger@intel.com>
Subject: [PATCH 5/6] staging/lustre/libcfs: remove CAPABILITY_VERSION tests
Date: Wed, 22 Jan 2014 21:47:36 +0800 [thread overview]
Message-ID: <1390398457-31140-5-git-send-email-bergwolf@gmail.com> (raw)
In-Reply-To: <1390398457-31140-1-git-send-email-bergwolf@gmail.com>
_LINUX_CAPABILITY_VERSION is only for backward compatibility in
user space. Kernel code doesn't care about it.
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
---
.../lustre/lustre/libcfs/linux/linux-curproc.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c
index 81a1d0d..8b3af7f 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c
@@ -80,29 +80,13 @@ int cfs_cap_raised(cfs_cap_t cap)
void cfs_kernel_cap_pack(kernel_cap_t kcap, cfs_cap_t *cap)
{
-#if defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x19980330
- *cap = kcap;
-#elif defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x20071026
- *cap = kcap[0];
-#elif defined(_KERNEL_CAPABILITY_VERSION) && _KERNEL_CAPABILITY_VERSION == 0x20080522
/* XXX lost high byte */
*cap = kcap.cap[0];
-#else
- #error "need correct _KERNEL_CAPABILITY_VERSION "
-#endif
}
void cfs_kernel_cap_unpack(kernel_cap_t *kcap, cfs_cap_t cap)
{
-#if defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x19980330
- *kcap = cap;
-#elif defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x20071026
- (*kcap)[0] = cap;
-#elif defined(_KERNEL_CAPABILITY_VERSION) && _KERNEL_CAPABILITY_VERSION == 0x20080522
kcap->cap[0] = cap;
-#else
- #error "need correct _KERNEL_CAPABILITY_VERSION "
-#endif
}
cfs_cap_t cfs_curproc_cap_pack(void)
--
1.7.9.5
next prev parent reply other threads:[~2014-01-22 13:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-22 13:47 [PATCH 1/6] staging/lustre/o2iblnd: fix is_vmalloc_addr build warning Peng Tao
2014-01-22 13:47 ` [PATCH 2/6] staging/lustre/libcfs: remove cfs_curproc_groups_nr Peng Tao
2014-01-22 13:47 ` [PATCH 3/6] staging/lustre/libcfs: remove cfs_curproc_cap_unpack Peng Tao
2014-01-22 13:47 ` [PATCH 4/6] staging/lustre/libcfs: remove cfs_cap_{un}pack Peng Tao
2014-01-22 13:47 ` Peng Tao [this message]
2014-01-22 13:47 ` [PATCH 6/6] staging/lustre/libcfs: remove cfs_capable Peng Tao
2014-01-24 18:50 ` Dilger, Andreas
2014-02-11 9:43 ` 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=1390398457-31140-5-git-send-email-bergwolf@gmail.com \
--to=bergwolf@gmail.com \
--cc=andreas.dilger@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox