hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging/lustre: remove portals_compat25.h 

Remove include/linux/libcfs/linux/portals_compat25.h.

. remove some unused/unnecessary macros such as smp_num_cpus /
  SIGNAL_MASK_ASSERT etc.

. replace some macros with direct kernel API calls such as
  RECALC_SIGPENDING/CLEAR_SIGPENDING/CURRENT_SECONDS,
  cfs_wait_event_interruptible/_exclusive etc.

Signed-off-by: Liu Xuezhao <xuezhao.liu@emc.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Reviewed-on: http://review.whamcloud.com/4778
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Keith Mannthey <keith.mannthey@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James Simmons 2014-09-09 13:39:04 -05:00 committed by Greg Kroah-Hartman
parent 16e0631db7
commit 46ffc93438
13 changed files with 20 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h
View File

@ -156,8 +156,8 @@ static inline void cfs_race(__u32 id)
cfs_race_state = 0; cfs_race_state = 0;
CERROR("cfs_race id %x sleeping\n", id); CERROR("cfs_race id %x sleeping\n", id);
cfs_wait_event_interruptible(cfs_race_waitq, rc = wait_event_interruptible(cfs_race_waitq,
cfs_race_state != 0, rc); cfs_race_state != 0);
CERROR("cfs_fail_race id %x awake, rc=%d\n", id, rc); CERROR("cfs_fail_race id %x awake, rc=%d\n", id, rc);
} else { } else {
CERROR("cfs_fail_race id %x waking\n", id); CERROR("cfs_fail_race id %x waking\n", id);

1
drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
View File

@ -86,7 +86,6 @@
#include "linux-cpu.h" #include "linux-cpu.h"
#include "linux-time.h" #include "linux-time.h"
#include "linux-mem.h" #include "linux-mem.h"
#include "portals_compat25.h"
#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5) #define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)

2
drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
View File

@ -53,8 +53,6 @@
#include <linux/time.h> #include <linux/time.h>
#include <asm/div64.h> #include <asm/div64.h>
#include "portals_compat25.h"
/* /*
* post 2.5 kernels. * post 2.5 kernels.
*/ */

81
drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
View File

@ -1,81 +0,0 @@
/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 only,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License version 2 for more details (a copy is included
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
* http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*
* GPL HEADER END
*/
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Lustre is a trademark of Sun Microsystems, Inc.
*/
#ifndef __LIBCFS_LINUX_PORTALS_COMPAT_H__
#define __LIBCFS_LINUX_PORTALS_COMPAT_H__
/* XXX BUG 1511 -- remove this stanza and all callers when bug 1511 is resolved */
#if defined(SPINLOCK_DEBUG) && SPINLOCK_DEBUG
# define SIGNAL_MASK_ASSERT() \
LASSERT(current->sighand->siglock.magic == SPINLOCK_MAGIC)
#else
# define SIGNAL_MASK_ASSERT()
#endif
/* XXX BUG 1511 -- remove this stanza and all callers when bug 1511 is resolved */
#define SIGNAL_MASK_LOCK(task, flags) \
spin_lock_irqsave(&task->sighand->siglock, flags)
#define SIGNAL_MASK_UNLOCK(task, flags) \
spin_unlock_irqrestore(&task->sighand->siglock, flags)
#define USERMODEHELPER(path, argv, envp) \
call_usermodehelper(path, argv, envp, 1)
#define clear_tsk_thread_flag(current, TIF_SIGPENDING) clear_tsk_thread_flag(current, \
TIF_SIGPENDING)
# define smp_num_cpus num_online_cpus()
#define cfs_wait_event_interruptible(wq, condition, ret) \
ret = wait_event_interruptible(wq, condition)
#define cfs_wait_event_interruptible_exclusive(wq, condition, ret) \
ret = wait_event_interruptible_exclusive(wq, condition)
#define THREAD_NAME(comm, len, fmt, a...) \
snprintf(comm, len, fmt, ## a)
/* 2.6 alloc_page users can use page->lru */
#define PAGE_LIST_ENTRY lru
#define PAGE_LIST(page) ((page)->lru)
#ifndef __user
#define __user
#endif
#ifndef __fls
#define __cfs_fls fls
#else
#define __cfs_fls __fls
#endif
#endif /* _PORTALS_COMPAT_H */

4
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
View File

@ -1537,9 +1537,9 @@ int ksocknal_scheduler(void *arg)
nloops = 0; nloops = 0;
if (!did_something) { /* wait for something to do */ if (!did_something) { /* wait for something to do */
cfs_wait_event_interruptible_exclusive( rc = wait_event_interruptible_exclusive(
sched->kss_waitq, sched->kss_waitq,
!ksocknal_sched_cansleep(sched), rc); !ksocknal_sched_cansleep(sched));
LASSERT (rc == 0); LASSERT (rc == 0);
} else { } else {
cond_resched(); cond_resched();

1
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h
View File

@ -63,7 +63,6 @@
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include "../../../include/linux/libcfs/libcfs.h" #include "../../../include/linux/libcfs/libcfs.h"
#include "../../../include/linux/libcfs/linux/portals_compat25.h"
#include <linux/crc32.h> #include <linux/crc32.h>
static inline __u32 ksocknal_csum(__u32 crc, unsigned char const *p, size_t len) static inline __u32 ksocknal_csum(__u32 crc, unsigned char const *p, size_t len)

1
drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
View File

@ -39,7 +39,6 @@
#include <linux/fs_struct.h> #include <linux/fs_struct.h>
#include <linux/namei.h> #include <linux/namei.h>
#include "../../../include/linux/libcfs/linux/portals_compat25.h"
#include "lustre_patchless_compat.h" #include "lustre_patchless_compat.h"

3
drivers/staging/lustre/lustre/libcfs/hash.c
View File

@ -2092,8 +2092,7 @@ int cfs_hash_debug_str(struct cfs_hash *hs, struct seq_file *m)
maxdepb = ffz(~maxdep); maxdepb = ffz(~maxdep);
} }
total += bd.bd_bucket->hsb_count; total += bd.bd_bucket->hsb_count;
dist[min(__cfs_fls(bd.bd_bucket->hsb_count/max(theta, dist[min(fls(bd.bd_bucket->hsb_count / max(theta, 1)), 7)]++;
1)), 7)]++;
cfs_hash_bd_unlock(hs, &bd, 0); cfs_hash_bd_unlock(hs, &bd, 0);
} }

5
drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
View File

@ -56,7 +56,6 @@
# define DEBUG_SUBSYSTEM S_LNET # define DEBUG_SUBSYSTEM S_LNET
#include "../../../include/linux/libcfs/libcfs.h" #include "../../../include/linux/libcfs/libcfs.h"
#include "../../../include/linux/libcfs/linux/portals_compat25.h"
#include "../tracefile.h" #include "../tracefile.h"
@ -86,7 +85,7 @@ void libcfs_run_debug_log_upcall(char *file)
argv[2] = NULL; argv[2] = NULL;
rc = USERMODEHELPER(argv[0], argv, envp); rc = call_usermodehelper(argv[0], argv, envp, 1);
if (rc < 0 && rc != -ENOENT) { if (rc < 0 && rc != -ENOENT) {
CERROR("Error %d invoking LNET debug log upcall %s %s; " CERROR("Error %d invoking LNET debug log upcall %s %s; "
"check /proc/sys/lnet/debug_log_upcall\n", "check /proc/sys/lnet/debug_log_upcall\n",
@ -113,7 +112,7 @@ void libcfs_run_upcall(char **argv)
LASSERT(argc >= 2); LASSERT(argc >= 2);
rc = USERMODEHELPER(argv[0], argv, envp); rc = call_usermodehelper(argv[0], argv, envp, 1);
if (rc < 0 && rc != -ENOENT) { if (rc < 0 && rc != -ENOENT) {
CERROR("Error %d invoking LNET upcall %s %s%s%s%s%s%s%s%s; " CERROR("Error %d invoking LNET upcall %s %s%s%s%s%s%s%s%s; "
"check /proc/sys/lnet/upcall\n", "check /proc/sys/lnet/upcall\n",

20
drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c
View File

@ -130,11 +130,11 @@ cfs_block_allsigs(void)
unsigned long flags; unsigned long flags;
sigset_t old; sigset_t old;
SIGNAL_MASK_LOCK(current, flags); spin_lock_irqsave(&current->sighand->siglock, flags);
old = current->blocked; old = current->blocked;
sigfillset(&current->blocked); sigfillset(&current->blocked);
recalc_sigpending(); recalc_sigpending();
SIGNAL_MASK_UNLOCK(current, flags); spin_unlock_irqrestore(&current->sighand->siglock, flags);
return old; return old;
} }
@ -144,11 +144,11 @@ sigset_t cfs_block_sigs(unsigned long sigs)
unsigned long flags; unsigned long flags;
sigset_t old; sigset_t old;
SIGNAL_MASK_LOCK(current, flags); spin_lock_irqsave(&current->sighand->siglock, flags);
old = current->blocked; old = current->blocked;
sigaddsetmask(&current->blocked, sigs); sigaddsetmask(&current->blocked, sigs);
recalc_sigpending(); recalc_sigpending();
SIGNAL_MASK_UNLOCK(current, flags); spin_unlock_irqrestore(&current->sighand->siglock, flags);
return old; return old;
} }
@ -158,11 +158,11 @@ sigset_t cfs_block_sigsinv(unsigned long sigs)
unsigned long flags; unsigned long flags;
sigset_t old; sigset_t old;
SIGNAL_MASK_LOCK(current, flags); spin_lock_irqsave(&current->sighand->siglock, flags);
old = current->blocked; old = current->blocked;
sigaddsetmask(&current->blocked, ~sigs); sigaddsetmask(&current->blocked, ~sigs);
recalc_sigpending(); recalc_sigpending();
SIGNAL_MASK_UNLOCK(current, flags); spin_unlock_irqrestore(&current->sighand->siglock, flags);
return old; return old;
} }
@ -172,10 +172,10 @@ cfs_restore_sigs (sigset_t old)
{ {
unsigned long flags; unsigned long flags;
SIGNAL_MASK_LOCK(current, flags); spin_lock_irqsave(&current->sighand->siglock, flags);
current->blocked = old; current->blocked = old;
recalc_sigpending(); recalc_sigpending();
SIGNAL_MASK_UNLOCK(current, flags); spin_unlock_irqrestore(&current->sighand->siglock, flags);
} }
int int
@ -189,9 +189,9 @@ cfs_clear_sigpending(void)
{ {
unsigned long flags; unsigned long flags;
SIGNAL_MASK_LOCK(current, flags); spin_lock_irqsave(&current->sighand->siglock, flags);
clear_tsk_thread_flag(current, TIF_SIGPENDING); clear_tsk_thread_flag(current, TIF_SIGPENDING);
SIGNAL_MASK_UNLOCK(current, flags); spin_unlock_irqrestore(&current->sighand->siglock, flags);
} }
int int

4
drivers/staging/lustre/lustre/libcfs/workitem.c
View File

@ -288,8 +288,8 @@ cfs_wi_scheduler (void *arg)
} }
cfs_wi_sched_unlock(sched); cfs_wi_sched_unlock(sched);
cfs_wait_event_interruptible_exclusive(sched->ws_waitq, rc = wait_event_interruptible_exclusive(sched->ws_waitq,
!cfs_wi_sched_cansleep(sched), rc); !cfs_wi_sched_cansleep(sched));
cfs_wi_sched_lock(sched); cfs_wi_sched_lock(sched);
} }

2
drivers/staging/lustre/lustre/obdclass/obd_config.c
View File

@ -1067,7 +1067,7 @@ static int process_param2_config(struct lustre_cfg *lcfg)
} }
do_gettimeofday(&start); do_gettimeofday(&start);
rc = USERMODEHELPER(argv[0], argv, NULL); rc = call_usermodehelper(argv[0], argv, NULL, 1);
do_gettimeofday(&end); do_gettimeofday(&end);
if (rc < 0) { if (rc < 0) {

2
drivers/staging/lustre/lustre/ptlrpc/client.c
View File

@ -2041,8 +2041,6 @@ int ptlrpc_set_next_timeout(struct ptlrpc_request_set *set)
struct ptlrpc_request *req; struct ptlrpc_request *req;
int deadline; int deadline;
SIGNAL_MASK_ASSERT(); /* XXX BUG 1511 */
list_for_each(tmp, &set->set_requests) { list_for_each(tmp, &set->set_requests) {
req = list_entry(tmp, struct ptlrpc_request, rq_set_chain); req = list_entry(tmp, struct ptlrpc_request, rq_set_chain);