From: Feifei Xu <xufeifei@linux.vnet.ibm.com>
To: linux-btrfs@vger.kernel.org
Cc: chandan@linux.vnet.ibm.com, Feifei Xu <xufeifei@linux.vnet.ibm.com>
Subject: [PATCH] btrfs-progs: Replace hardcoded PAGE_CACHE_SIZE with getpagesize().
Date: Wed, 9 Mar 2016 20:22:13 +0800 [thread overview]
Message-ID: <1457526133-28575-1-git-send-email-xufeifei@linux.vnet.ibm.com> (raw)
PAGE_CACHE_SIZE is hardcoded to 4K in cmds-restore.c. It makes lzo
decompress fail on ppc64. Fix this through replacing hardcoded 4K
with getpagesize().
Signed-off-by: Feifei Xu <xufeifei@linux.vnet.ibm.com>
---
cmds-restore.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/cmds-restore.c b/cmds-restore.c
index 161fd91..17a5475 100644
--- a/cmds-restore.c
+++ b/cmds-restore.c
@@ -56,7 +56,6 @@ static int get_xattrs = 0;
static int dry_run = 0;
#define LZO_LEN 4
-#define PAGE_CACHE_SIZE 4096
#define lzo1x_worst_compress(x) ((x) + ((x) / 16) + 64 + 3)
static int decompress_zlib(char *inbuf, char *outbuf, u64 compress_len,
@@ -127,7 +126,7 @@ static int decompress_lzo(unsigned char *inbuf, char *outbuf, u64 compress_len,
inbuf += LZO_LEN;
tot_in += LZO_LEN;
- new_len = lzo1x_worst_compress(PAGE_CACHE_SIZE);
+ new_len = lzo1x_worst_compress(getpagesize());
ret = lzo1x_decompress_safe((const unsigned char *)inbuf, in_len,
(unsigned char *)outbuf,
(void *)&new_len, NULL);
@@ -144,8 +143,8 @@ static int decompress_lzo(unsigned char *inbuf, char *outbuf, u64 compress_len,
* If the 4 byte header does not fit to the rest of the page we
* have to move to the next one, unless we read some garbage
*/
- mod_page = tot_in % PAGE_CACHE_SIZE;
- rem_page = PAGE_CACHE_SIZE - mod_page;
+ mod_page = tot_in % getpagesize();
+ rem_page = getpagesize() - mod_page;
if (rem_page < LZO_LEN) {
inbuf += rem_page;
tot_in += rem_page;
--
1.9.1
next reply other threads:[~2016-03-09 12:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 12:22 Feifei Xu [this message]
2016-03-09 12:45 ` [PATCH] btrfs-progs: Replace hardcoded PAGE_CACHE_SIZE with getpagesize() David Sterba
2016-03-10 6:06 ` Fiona
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=1457526133-28575-1-git-send-email-xufeifei@linux.vnet.ibm.com \
--to=xufeifei@linux.vnet.ibm.com \
--cc=chandan@linux.vnet.ibm.com \
--cc=linux-btrfs@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).