Commit c7c99012 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging/lustre/autoconf: remove LIBCFS_HAVE_IS_COMPAT_TASK test

is_compat_task has been defined on all arches since v2.6.29.
We can remove the test and dead code.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2800
Lustre-change: http://review.whamcloud.com/5393Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aa363d6a
...@@ -61,7 +61,6 @@ int cfs_curproc_groups_nr(void); ...@@ -61,7 +61,6 @@ int cfs_curproc_groups_nr(void);
*/ */
/* check if task is running in compat mode.*/ /* check if task is running in compat mode.*/
int current_is_32bit(void);
#define current_pid() (current->pid) #define current_pid() (current->pid)
#define current_comm() (current->comm) #define current_comm() (current->comm)
int cfs_get_environ(const char *key, char *value, int *val_len); int cfs_get_environ(const char *key, char *value, int *val_len);
......
...@@ -140,18 +140,6 @@ int cfs_capable(cfs_cap_t cap) ...@@ -140,18 +140,6 @@ int cfs_capable(cfs_cap_t cap)
return capable(cfs_cap_unpack(cap)); return capable(cfs_cap_unpack(cap));
} }
/* Check if task is running in 32-bit API mode, for the purpose of
* userspace binary interfaces. On 32-bit Linux this is (unfortunately)
* always true, even if the application is using LARGEFILE64 and 64-bit
* APIs, because Linux provides no way for the filesystem to know if it
* is called via 32-bit or 64-bit APIs. Other clients may vary. On
* 64-bit systems, this will only be true if the binary is calling a
* 32-bit system call. */
int current_is_32bit(void)
{
return is_compat_task();
}
static int cfs_access_process_vm(struct task_struct *tsk, unsigned long addr, static int cfs_access_process_vm(struct task_struct *tsk, unsigned long addr,
void *buf, int len, int write) void *buf, int len, int write)
{ {
...@@ -311,7 +299,6 @@ EXPORT_SYMBOL(cfs_cap_raised); ...@@ -311,7 +299,6 @@ EXPORT_SYMBOL(cfs_cap_raised);
EXPORT_SYMBOL(cfs_curproc_cap_pack); EXPORT_SYMBOL(cfs_curproc_cap_pack);
EXPORT_SYMBOL(cfs_curproc_cap_unpack); EXPORT_SYMBOL(cfs_curproc_cap_unpack);
EXPORT_SYMBOL(cfs_capable); EXPORT_SYMBOL(cfs_capable);
EXPORT_SYMBOL(current_is_32bit);
/* /*
* Local variables: * Local variables:
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include <lclient.h> #include <lclient.h>
#include <lustre_mdc.h> #include <lustre_mdc.h>
#include <linux/lustre_intent.h> #include <linux/lustre_intent.h>
#include <linux/compat.h>
#ifndef FMODE_EXEC #ifndef FMODE_EXEC
#define FMODE_EXEC 0 #define FMODE_EXEC 0
...@@ -643,7 +644,7 @@ static inline int ll_need_32bit_api(struct ll_sb_info *sbi) ...@@ -643,7 +644,7 @@ static inline int ll_need_32bit_api(struct ll_sb_info *sbi)
#if BITS_PER_LONG == 32 #if BITS_PER_LONG == 32
return 1; return 1;
#else #else
return unlikely(current_is_32bit() || (sbi->ll_flags & LL_SBI_32BIT_API)); return unlikely(is_compat_task() || (sbi->ll_flags & LL_SBI_32BIT_API));
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment