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 <jmmahler@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
28b12e4168
commit
90d2ced902
@ -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)
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user