From: Jeremiah Mahler <jmmahler@gmail.com>
To: Oleg Drokin <oleg.drokin@intel.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Peng Tao <bergwolf@gmail.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Kirill Tkhai <ktkhai@parallels.com>,
Joe Perches <joe@perches.com>, Zi Shen Lim <zlim.lnx@gmail.com>,
Dmitry Eremin <dmitry.eremin@intel.com>,
Masaru Nomura <massa.nomura@gmail.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
James A Shackleford <shack@linux.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Jeremiah Mahler <jmmahler@gmail.com>
Subject: [PATCH 6/6] staging: lustre: remove custom MIN/MAX and min_t operations
Date: Thu, 25 Dec 2014 16:04:46 -0800 [thread overview]
Message-ID: <1419552286-8492-7-git-send-email-jmmahler@gmail.com> (raw)
In-Reply-To: <1419552286-8492-1-git-send-email-jmmahler@gmail.com>
Remove all custom MIN/MAX and min_t operations since they are
no longer needed.
Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com>
---
drivers/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 2817112..3d86fb5 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 d788dac..af96c7b 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.1.4
prev parent reply other threads:[~2014-12-26 0:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-26 0:04 [PATCH 0/6] staging: lustre: use built in min/max functions Jeremiah Mahler
2014-12-26 0:04 ` [PATCH 1/6] staging: lustre: use min/max instead of MIN/MAX, simple cases Jeremiah Mahler
2014-12-26 0:04 ` [PATCH 2/6] staging: lustre: replace MIN with min_t Jeremiah Mahler
2014-12-26 0:04 ` [PATCH 3/6] staging: lustre: replace MIN/MAX with min_t/max_t Jeremiah Mahler
2014-12-26 0:04 ` [PATCH 4/6] staging: lustre: replace MIN with min, cast (__kernel_size_t) Jeremiah Mahler
2014-12-26 0:04 ` [PATCH 5/6] staging: lustre: replace MIN with min_t, remove cast Jeremiah Mahler
2014-12-26 0:04 ` Jeremiah Mahler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1419552286-8492-7-git-send-email-jmmahler@gmail.com \
--to=jmmahler@gmail.com \
--cc=Julia.Lawall@lip6.fr \
--cc=andreas.dilger@intel.com \
--cc=bergwolf@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=dmitry.eremin@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=ktkhai@parallels.com \
--cc=linux-kernel@vger.kernel.org \
--cc=massa.nomura@gmail.com \
--cc=oleg.drokin@intel.com \
--cc=peterz@infradead.org \
--cc=shack@linux.com \
--cc=zlim.lnx@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®