Merge branch 'KHJ' of https://github.com/hishine6/linux-nova into KHJ

yh-raphael · Aug 23, 2021 · 4bafec0 · 4bafec0
2 parents a449817 + 670eb09
commit 4bafec0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/fs/nova/dedup.h b/fs/nova/dedup.h
@@ -25,8 +25,8 @@
 #define FINGERPRINT_SIZE 20
 #define MAX_DATAPAGE_PER_WRITEENTRY 32
 /* nova_dedup_queue
-   queue of entries that needs to be deduplicated
- */
+	 queue of entries that needs to be deduplicated
+*/
 struct nova_dedup_queue_entry{
   u64 write_entry_address;
   u64 target_inode_number;

diff --git a/fs/nova/super.h b/fs/nova/super.h
@@ -59,22 +59,26 @@ struct nova_super_block {
 /* NOVA DEDUP KHJ */
 /*
  * 4G Environment
- * Block 64 - 5183 Static FACT Table (20MB)
+ * Block 64 - 5183 Static FACT Table (64MB)
  * Index 0 ~ (2^20 - 1)
+ 
+ * 750G Environment
+ * Block 64 ~ 3072063 (almost 12GB)
+ * Index 0 ~ (750*2^18 - 1)
 
  * 750G Environment
  * Block 64 ~ 3072063 (almost 12GB)
  * Index 0 ~ *(750*2^18 - 1)
 
  * 1T Environment
- * Block 64 ~ 1310783 Static FACT Table (5GB)
- * Index 0 ~ (2^28 - 1) --> 1T Environment
+ * Block 64 ~ 1310783 (16GB)
+ * Index 0 ~ (2^28 - 1)
  */
 // #define FACT_TABLE_INDEX_MAX 1048575 // 2^20 - 1  (4G ENV)
 // #define FACT_TABLE_INDEX_MAX 268435455 // 2^28 -1 (1TB ENV)
-#define FACT_TABLE_INDEX_MAX (unsigned long)196607999 // 750 * 2^18 - 1(750GB ENV)
-#define	HEAD_RESERVED_BLOCKS (unsigned long)63 + (((unsigned long)FACT_TABLE_INDEX_MAX+1)*64)/4096
-// 20 - FACT entry size
+#define FACT_TABLE_INDEX_MAX (unsigned long)196607999 // 750 * 2^18 - 1 (750GB ENV)
+#define	HEAD_RESERVED_BLOCKS (unsigned long)63 + ((unsigned long)(FACT_TABLE_INDEX_MAX+1)*64)/4096
+// 64 - FACT entry size
 // 4096 - Block size
 #define	NUM_JOURNAL_PAGES	16