Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9af4826a authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: libcfs: remove cfs_signal_pending wrapper 



Use signal_pending() directly instead of a one line function
wrapper.

Signed-off-by: default avatarJames Simmons <uja.ornl@gmail.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6245
Reviewed-on: http://review.whamcloud.com/13874


Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3404f60d

drivers/staging/lustre/include/linux/libcfs/libcfs.h

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ sigset_t cfs_block_allsigs(void); 
sigset_t cfs_block_sigs(unsigned long sigs);

sigset_t cfs_block_sigsinv(unsigned long sigs);

void cfs_restore_sigs(sigset_t);

int cfs_signal_pending(void);

void cfs_clear_sigpending(void);



/*

drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c

+0 −7
Original line number Diff line number Diff line
@@ -128,13 +128,6 @@ cfs_restore_sigs(sigset_t old) 
}

EXPORT_SYMBOL(cfs_restore_sigs);



int

cfs_signal_pending(void)

{

	return signal_pending(current);

}

EXPORT_SYMBOL(cfs_signal_pending);



void

cfs_clear_sigpending(void)

{

drivers/staging/lustre/lustre/include/lustre_lib.h

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ do { \ 
									       \

		if (condition)						 \

			break;						 \

		if (cfs_signal_pending()) {				    \

		if (signal_pending(current)) {				    \

			if (info->lwi_on_signal &&		     \

			    (__timeout == 0 || __allow_intr)) {		\

				if (info->lwi_on_signal != LWI_ON_SIGNAL_NOOP) \

drivers/staging/lustre/lustre/obdclass/cl_lock.c

+1 −1
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ int cl_lock_state_wait(const struct lu_env *env, struct cl_lock *lock) 
		result = -ERESTARTSYS;

		if (likely(!OBD_FAIL_CHECK(OBD_FAIL_LOCK_STATE_WAIT_INTR))) {

			schedule();

			if (!cfs_signal_pending())

			if (!signal_pending(current))

				result = 0;

		}

drivers/staging/lustre/lustre/ptlrpc/client.c

+3 −3
Original line number Diff line number Diff line
@@ -2087,7 +2087,7 @@ int ptlrpc_set_wait(struct ptlrpc_request_set *set) 
		CDEBUG(D_RPCTRACE, "set %p going to sleep for %d seconds\n",

		       set, timeout);



		if (timeout == 0 && !cfs_signal_pending())

		if (timeout == 0 && !signal_pending(current))

			/*

			 * No requests are in-flight (ether timed out

			 * or delayed), so we can allow interrupts.
@@ -2114,7 +2114,7 @@ int ptlrpc_set_wait(struct ptlrpc_request_set *set) 
		 * it being ignored forever

		 */

		if (rc == -ETIMEDOUT && !lwi.lwi_allow_intr &&

		    cfs_signal_pending()) {

		    signal_pending(current)) {

			sigset_t blocked_sigs =

					   cfs_block_sigsinv(LUSTRE_FATAL_SIGS);
@@ -2124,7 +2124,7 @@ int ptlrpc_set_wait(struct ptlrpc_request_set *set) 
			 * important signals since ptlrpc set is not easily

			 * reentrant from userspace again

			 */

			if (cfs_signal_pending())

			if (signal_pending(current))

				ptlrpc_interrupted_set(set);

			cfs_restore_sigs(blocked_sigs);

		}