Decided that we don't need to limit the block size after all now

that the map_file() code handles large block sizes better.

diff --git a/generator.c b/generator.c
index 04975b6..9c78e64 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -154,7 +154,6 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
                        c >>= 1;
                } while (c >= 8);       /* round to multiple of 8 */
                blength = MAX(blength, BLOCK_SIZE);
-               blength = MIN(blength, MAX_BLOCK_SIZE);
        }
 
        if (protocol_version < 27) {

diff --git a/options.c b/options.c
index c8d1a5c..b0cf723 100644 (file)
--- a/options.c
+++ b/options.c
@@ -660,12 +660,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        }
 #endif
 
-       if (block_size > MAX_BLOCK_SIZE) {
-               rprintf(FINFO, "limiting block-size to %d bytes\n",
-                       MAX_BLOCK_SIZE);
-               block_size = MAX_BLOCK_SIZE;
-       }
-
        if (write_batch && read_batch) {
                snprintf(err_buf, sizeof err_buf,
                        "--write-batch and --read-batch can not be used together\n");

diff --git a/rsync.h b/rsync.h
index 79bd0ae..086eb42 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -90,8 +90,7 @@
 #define SPARSE_WRITE_SIZE (1024)
 #define WRITE_SIZE (32*1024)
 #define CHUNK_SIZE (32*1024)
-#define MAX_MAP_SIZE (512*1024)
-#define MAX_BLOCK_SIZE (256*1024)
+#define MAX_MAP_SIZE (256*1024)
 #define IO_BUFFER_SIZE (4092)
 
 #define IOERR_GENERAL  (1<<0) /* For backward compatibility, this must == 1 */