From 90d2ced902331613ba1d953d8d8884cae21da296 Mon Sep 17 00:00:00 2001 From: Jeremiah Mahler Date: Thu, 25 Dec 2014 16:04:46 -0800 Subject: [PATCH] staging: lustre: remove custom MIN/MAX and min_t operations Remove all custom MIN/MAX and min_t operations since they are no longer needed. Signed-off-by: Jeremiah Mahler Signed-off-by: Greg Kroah-Hartman --- .../staging/lustre/include/linux/libcfs/libcfs_private.h | 8 -------- drivers/staging/lustre/lustre/osc/osc_internal.h | 5 ----- 2 files changed, 13 deletions(-) diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h index 2817112c0633..3d86fb5b5481 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h @@ -458,14 +458,6 @@ struct libcfs_device_userstate { struct page *ldu_memhog_root_page; }; -/* what used to be in portals_lib.h */ -#ifndef MIN -# define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#endif -#ifndef MAX -# define MAX(a, b) (((a) > (b)) ? (a) : (b)) -#endif - #define MKSTR(ptr) ((ptr)) ? (ptr) : "" static inline int cfs_size_round4(int val) diff --git a/drivers/staging/lustre/lustre/osc/osc_internal.h b/drivers/staging/lustre/lustre/osc/osc_internal.h index d788dac93cd0..af96c7bc7764 100644 --- a/drivers/staging/lustre/lustre/osc/osc_internal.h +++ b/drivers/staging/lustre/lustre/osc/osc_internal.h @@ -160,11 +160,6 @@ static inline unsigned long rpcs_in_flight(struct client_obd *cli) return cli->cl_r_in_flight + cli->cl_w_in_flight; } -#ifndef min_t -#define min_t(type, x, y) \ - ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) -#endif - struct osc_device { struct cl_device od_cl; struct obd_export *od_exp; -- 2.20.1