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

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

staging: libcfs: remove integer types abstraction from libcfs 



Replace the ulong_ptr_t and long_ptr_t with standard
kernel types.

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


Reviewed-by: default avatarFrank Zago <fzago@cray.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f4f7824

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

+0 −4
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ do { \ 


#include <linux/capability.h>



/* long integer with size equal to pointer */

typedef unsigned long ulong_ptr_t;

typedef long long_ptr_t;



#ifndef WITH_WATCHDOG

#define WITH_WATCHDOG

#endif

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c

+1 −1
Original line number Diff line number Diff line
@@ -2507,7 +2507,7 @@ ksocknal_base_startup(void) 


		snprintf(name, sizeof(name), "socknal_cd%02d", i);

		rc = ksocknal_thread_start(ksocknal_connd,

					   (void *)((ulong_ptr_t)i), name);

					   (void *)((uintptr_t)i), name);

		if (rc) {

			spin_lock_bh(&ksocknal_data.ksnd_connd_lock);

			ksocknal_data.ksnd_connd_starting--;

drivers/staging/lustre/lnet/libcfs/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void libcfs_debug_dumplog_internal(void *arg) 
		last_dump_time = current_time;

		snprintf(debug_file_name, sizeof(debug_file_name) - 1,

			 "%s.%lld.%ld", libcfs_debug_file_path_arr,

			 (s64)current_time, (long_ptr_t)arg);

			 (s64)current_time, (long)arg);

		pr_alert("LustreError: dumping log to %s\n", debug_file_name);

		cfs_tracefile_dump_all_pages(debug_file_name);

		libcfs_run_debug_log_upcall(debug_file_name);

drivers/staging/lustre/lnet/lnet/acceptor.c

+2 −2
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ lnet_acceptor(void *arg) 
	__u32 magic;

	__u32 peer_ip;

	int peer_port;

	int secure = (int)((long_ptr_t)arg);

	int secure = (int)((long)arg);



	LASSERT(!lnet_acceptor_state.pta_sock);
@@ -459,7 +459,7 @@ lnet_acceptor_start(void) 
	if (!lnet_count_acceptor_nis())  /* not required */

		return 0;



	task = kthread_run(lnet_acceptor, (void *)(ulong_ptr_t)secure,

	task = kthread_run(lnet_acceptor, (void *)(uintptr_t)secure,

			   "acceptor_%03ld", secure);

	if (IS_ERR(task)) {

		rc2 = PTR_ERR(task);