LU-1346 libcfs: tcpip/time/type related cleanup

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-curproc.c

diff --git a/libcfs/libcfs/linux/linux-curproc.c b/libcfs/libcfs/linux/linux-curproc.c
index dd5d6ce..670e4cd 100644 (file)
--- a/libcfs/libcfs/linux/linux-curproc.c
+++ b/libcfs/libcfs/linux/linux-curproc.c
@@ -151,7 +151,7 @@ int cfs_cap_raised(cfs_cap_t cap)
         return cap_raised(current_cap(), cfs_cap_unpack(cap));
 }
 
-void cfs_kernel_cap_pack(cfs_kernel_cap_t kcap, 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 = cfs_cap_pack(kcap);
@@ -165,7 +165,7 @@ void cfs_kernel_cap_pack(cfs_kernel_cap_t kcap, cfs_cap_t *cap)
 #endif
 }
 
-void cfs_kernel_cap_unpack(cfs_kernel_cap_t *kcap, cfs_cap_t cap)
+void cfs_kernel_cap_unpack(kernel_cap_t *kcap, cfs_cap_t cap)
 {
 #if defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x19980330
         *kcap = cfs_cap_unpack(cap);
@@ -199,28 +199,9 @@ int cfs_capable(cfs_cap_t 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 cfs_curproc_is_32bit(void)
-{
-#ifdef HAVE_IS_COMPAT_TASK
-        return is_compat_task();
-#else
-        return (BITS_PER_LONG == 32);
-#endif
-}
-
 static int cfs_access_process_vm(struct task_struct *tsk, unsigned long addr,
                                 void *buf, int len, int write)
 {
-#ifdef HAVE_ACCESS_PROCESS_VM
-       return access_process_vm(tsk, addr, buf, len, write);
-#else
        /* Just copied from kernel for the kernels which doesn't
         * have access_process_vm() exported */
        struct mm_struct *mm;
@@ -267,14 +248,13 @@ static int cfs_access_process_vm(struct task_struct *tsk, unsigned long addr,
        mmput(mm);
 
        return buf - old_buf;
-#endif /* HAVE_ACCESS_PROCESS_VM */
 }
 
 /* Read the environment variable of current process specified by @key. */
 int cfs_get_environ(const char *key, char *value, int *val_len)
 {
        struct mm_struct *mm;
-       char *buffer, *tmp_buf = NULL;
+       char *buffer;
        int buf_len = PAGE_CACHE_SIZE;
        int key_len = strlen(key);
        unsigned long addr;
@@ -295,8 +275,10 @@ int cfs_get_environ(const char *key, char *value, int *val_len)
         * which is already holding mmap_sem for writes.  If some other
         * thread gets the write lock in the meantime, this thread will
         * block, but at least it won't deadlock on itself.  LU-1735 */
-       if (down_read_trylock(&mm->mmap_sem) == 0)
+       if (down_read_trylock(&mm->mmap_sem) == 0) {
+               kfree(buffer);
                return -EDEADLK;
+       }
        up_read(&mm->mmap_sem);
 
        addr = mm->env_start;
@@ -364,8 +346,6 @@ int cfs_get_environ(const char *key, char *value, int *val_len)
 out:
        mmput(mm);
        kfree((void *)buffer);
-       if (tmp_buf)
-               kfree((void *)tmp_buf);
        return rc;
 }
 EXPORT_SYMBOL(cfs_get_environ);
@@ -388,7 +368,6 @@ EXPORT_SYMBOL(cfs_cap_raised);
 EXPORT_SYMBOL(cfs_curproc_cap_pack);
 EXPORT_SYMBOL(cfs_curproc_cap_unpack);
 EXPORT_SYMBOL(cfs_capable);
-EXPORT_SYMBOL(cfs_curproc_is_32bit);
 
 /*
  * Local variables: