import PULS_20180308

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / ubifs / sb.c

diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
index 4aa095b6736abcd966bdd74e6b4f7956b0f23374..20771ddbc79be302e915d3218b63674e8f246ad8 100644 (file)
--- a/fs/ubifs/sb.c
+++ b/fs/ubifs/sb.c
@@ -58,7 +58,9 @@
 #define DEFAULT_RP_PERCENT 5
 
 /* The default maximum size of reserved pool in bytes */
-#define DEFAULT_MAX_RP_SIZE (512*1024)
+#define DEFAULT_MAX_RP_SIZE (16*1024*1024)
+
+#define UBIFS_ONE_GIGA 1024*1024*1024
 
 /* Default time granularity in nanoseconds */
 #define DEFAULT_TIME_GRAN 1000000000
@@ -193,11 +195,15 @@ static int create_default_filesystem(struct ubifs_info *c)
        generate_random_uuid(sup->uuid);
 
        main_bytes = (long long)main_lebs * c->leb_size;
-       tmp64 = div_u64(main_bytes * DEFAULT_RP_PERCENT, 100);
-       if (tmp64 > DEFAULT_MAX_RP_SIZE)
+
+       /*If the size of a volume is bigger than 1G, set rp_size to DEFAULT_MAX_RP_SIZE(16M).*/
+       if (main_bytes >= UBIFS_ONE_GIGA)
                tmp64 = DEFAULT_MAX_RP_SIZE;
+       else
+               tmp64 = 0;
+
        sup->rp_size = cpu_to_le64(tmp64);
-       sup->rp_uid = 9996; //VID_CCCI
+       sup->rp_uid = 10010; //VID_CCCI
        sup->ro_compat_version = cpu_to_le32(UBIFS_RO_COMPAT_VERSION);
 
        err = ubifs_write_node(c, sup, UBIFS_SB_NODE_SZ, 0, 0);