From: green@linuxhacker.ru
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lustre Development List <lustre-devel@lists.lustre.org>,
Oleg Drokin <green@linuxhacker.ru>
Subject: [PATCH 23/25] staging/lustre: Rework MAX_DIO_SIZE macro
Date: Fri, 26 Feb 2016 01:50:11 -0500 [thread overview]
Message-ID: <1456469413-931943-24-git-send-email-green@linuxhacker.ru> (raw)
In-Reply-To: <1456469413-931943-1-git-send-email-green@linuxhacker.ru>
From: Oleg Drokin <green@linuxhacker.ru>
KMALLOC_MAX_SIZE is always defined in the kernel, so no point
in checking for it, just use t directly.
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
---
drivers/staging/lustre/lustre/llite/rw26.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index b9d8e73..7a5db67 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -350,20 +350,14 @@ static ssize_t ll_direct_IO_26_seg(const struct lu_env *env, struct cl_io *io,
return ll_direct_rw_pages(env, io, rw, inode, &pvec);
}
-#ifdef KMALLOC_MAX_SIZE
-#define MAX_MALLOC KMALLOC_MAX_SIZE
-#else
-#define MAX_MALLOC (128 * 1024)
-#endif
-
/* This is the maximum size of a single O_DIRECT request, based on the
* kmalloc limit. We need to fit all of the brw_page structs, each one
* representing PAGE_SIZE worth of user data, into a single buffer, and
* then truncate this to be a full-sized RPC. For 4kB PAGE_SIZE this is
* up to 22MB for 128kB kmalloc and up to 682MB for 4MB kmalloc.
*/
-#define MAX_DIO_SIZE ((MAX_MALLOC / sizeof(struct brw_page) * PAGE_CACHE_SIZE) & \
- ~(DT_MAX_BRW_SIZE - 1))
+#define MAX_DIO_SIZE ((KMALLOC_MAX_SIZE / sizeof(struct brw_page) * \
+ PAGE_CACHE_SIZE) & ~(DT_MAX_BRW_SIZE - 1))
static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter,
loff_t file_offset)
{
--
2.1.0
next prev parent reply other threads:[~2016-02-26 6:53 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 6:49 [PATCH 00/25] Lustre cleanups continued green
2016-02-26 6:49 ` [PATCH 01/25] staging/lustre/llite: Fix style vs open parenthesis alignment green
2016-02-26 6:49 ` [PATCH 02/25] staging/lustre/include: Fix style of function declarations green
2016-02-26 6:49 ` [PATCH 03/25] staging/lustre/fld: Fix style vs open parenthesis alignment green
2016-02-26 6:49 ` [PATCH 04/25] staging/lustre: Remove unused liblustre_check_services prototype green
2016-02-26 6:49 ` [PATCH 05/25] staging/lustre: Remove unused lustre_build_lock_params() green
2016-02-26 6:49 ` [PATCH 06/25] staging/lustre: Convert ptlrpc_at_check_timed to void green
2016-02-26 6:49 ` [PATCH 07/25] staging/lustre: Remove misleading liblustre comments green
2016-02-26 6:49 ` [PATCH 08/25] staging/lustre: Remove liblustre references from explanations green
2016-02-26 6:49 ` [PATCH 09/25] staging/lustre/lmv: Remove commented out MDS selection policies green
2016-02-26 6:49 ` [PATCH 10/25] staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined green
2016-02-26 6:49 ` [PATCH 11/25] staging/lustre: MS_POSIXACL is always defined, don't check for it green
2016-02-26 6:50 ` [PATCH 12/25] staging/lustre: Remove RELEASEPAGE_ARG_TYPE compat macro green
2016-02-26 6:50 ` [PATCH 13/25] staging/lustre: NEED_QUOTA_DEFS is never defined, drop it green
2016-02-26 6:50 ` [PATCH 14/25] staging/lustre/ptlrpc: Fix style vs open parenthesis alignment green
2016-02-26 6:50 ` [PATCH 15/25] staging/lustre/osc: " green
2016-02-26 6:50 ` [PATCH 16/25] staging/lustre/obdclass: " green
2016-02-26 6:50 ` [PATCH 17/25] staging/lustre/lov: " green
2016-02-26 6:50 ` [PATCH 18/25] staging/lustre/mdc: " green
2016-02-26 6:50 ` [PATCH 19/25] staging/lustre/mgc: " green
2016-02-26 6:50 ` [PATCH 20/25] staging/lustre/obdecho: " green
2016-02-26 6:50 ` [PATCH 21/25] staging/lustre/lmv: " green
2016-02-26 6:50 ` [PATCH 22/25] staging/lustre: Fix lines that start with spaces green
2016-02-26 6:50 ` green [this message]
2016-02-26 6:50 ` [PATCH 24/25] staging/lustre: Remove unneeded {} in lprocfs_stats_unlock() green
2016-02-26 6:50 ` [PATCH 25/25] staging/lustre/ptlrpc: Fix ENABLE_PINGER ifdef green
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=1456469413-931943-24-git-send-email-green@linuxhacker.ru \
--to=green@linuxhacker.ru \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
/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