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

Commit 90d2ced9 authored by Jeremiah Mahler's avatar Jeremiah Mahler Committed by Greg Kroah-Hartman
Browse files

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: default avatarJeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28b12e41

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

+0 −8
Original line number Diff line number Diff line
@@ -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)

drivers/staging/lustre/lustre/osc/osc_internal.h

+0 −5
Original line number Diff line number Diff line
@@ -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;