diff options
author | Peng Tao <bergwolf@gmail.com> | 2014-01-22 21:47:36 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-07 09:46:18 -0800 |
commit | efc9eb02898037b9639c8b5d17feaec2f853cf9c (patch) | |
tree | 359516c263178509ab8d5a55a76f467febb7e613 /drivers/staging/lustre | |
parent | 9a28b1881cef46727d7ba81a5d743db2321155b0 (diff) | |
download | linux-efc9eb02898037b9639c8b5d17feaec2f853cf9c.tar.bz2 |
staging/lustre/libcfs: remove CAPABILITY_VERSION tests
_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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
-rw-r--r-- | drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c | 16 |
1 files changed, 0 insertions, 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 81a1d0d7755f..8b3af7f2c432 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) |