btrfs-progs: replace PAGE_CACHE_SIZE to sysconf(_SC_PAGESIZE)

Commit Message

[e-mail] May 6, 2015, 8:35 a.m. UTC

From: George Wang <[e-mail]>

PAGE_CACHE_SIZE is usually 4096. But for some ppc64/ppc64le, it will be 65536.
Just replace this fixed PAGE_CACHE_SIZE to sysconf(_SC_PAGESIZE), which will
be more flexible

Signed-off-by: George Wang <[e-mail]>

Comments

David Sterba May 12, 2015, 3:46 p.m. UTC | #1

On Wed, May 06, 2015 at 04:35:22PM +0800, [e-mail] wrote:
> From: George Wang <[e-mail]>
> 
> PAGE_CACHE_SIZE is usually 4096. But for some ppc64/ppc64le, it will be 65536.
> Just replace this fixed PAGE_CACHE_SIZE to sysconf(_SC_PAGESIZE), which will
> be more flexible

As implemented in kernel right now, sectorsize must be page size and
this is also part of the compressed data format. So in restore we should
use the sectorsize from the filesystem.

Instead of passing the sectorsize through multiple functions, I suggest
to add a static global variable and set it after open_ctree.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/cmds-restore.c b/cmds-restore.c
index e1411e9..bf839f4 100644
--- a/cmds-restore.c
+++ b/cmds-restore.c
@@ -54,9 +54,13 @@  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 inline long pagesize(void)
+{
+	return sysconf(_SC_PAGESIZE);
+}
+
 static int decompress_zlib(char *inbuf, char *outbuf, u64 compress_len,
 			   u64 decompress_len)
 {
@@ -125,7 +129,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(pagesize());
 		ret = lzo1x_decompress_safe((const unsigned char *)inbuf, in_len,
 					    (unsigned char *)outbuf,
 					    (void *)&new_len, NULL);
@@ -142,8 +146,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 % pagesize();
+		rem_page = pagesize() - mod_page;
 		if (rem_page < LZO_LEN) {
 			inbuf += rem_page;
 			tot_in += rem_page;