Merge pull request torvalds#109 from hayley-leblanc/issue_100

Andiry · web-flow · commit b04a2c8e8f29 · 2021-07-18T14:20:11.000-07:00
Fix crash consistency issue with alternate logs (torvalds#100)
diff --git a/fs/nova/log.c b/fs/nova/log.c
@@ -1184,7 +1184,6 @@ static int nova_initialize_inode_log(struct super_block *sb,
 		sih->log_pages++;
 		nova_flush_buffer(&pi->alter_log_head, CACHELINE_SIZE, 1);
 	}
-	nova_update_inode_checksum(pi);
 	nova_memlock_inode(sb, pi, &irq_flags);
 
 	return 0;
@@ -1221,6 +1220,10 @@ static u64 nova_extend_inode_log(struct super_block *sb, struct nova_inode *pi,
 			nova_memlock_inode(sb, pi, &irq_flags);
 		}
 
+		nova_memunlock_inode(sb, pi, &irq_flags);
+		nova_update_inode_checksum(pi);
+		nova_memlock_inode(sb, pi, &irq_flags);
+
 		return sih->log_head;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1184,7 +1184,6 @@ static int nova_initialize_inode_log(struct super_block *sb,`
`1184`	`1184`	`sih->log_pages++;`
`1185`	`1185`	`nova_flush_buffer(&pi->alter_log_head, CACHELINE_SIZE, 1);`
`1186`	`1186`	`}`
`1187`		`- nova_update_inode_checksum(pi);`
`1188`	`1187`	`nova_memlock_inode(sb, pi, &irq_flags);`
`1189`	`1188`
`1190`	`1189`	`return 0;`
`@@ -1221,6 +1220,10 @@ static u64 nova_extend_inode_log(struct super_block sb, struct nova_inode pi,`
`1221`	`1220`	`nova_memlock_inode(sb, pi, &irq_flags);`
`1222`	`1221`	`}`
`1223`	`1222`
	`1223`	`+ nova_memunlock_inode(sb, pi, &irq_flags);`
	`1224`	`+ nova_update_inode_checksum(pi);`
	`1225`	`+ nova_memlock_inode(sb, pi, &irq_flags);`
	`1226`	`+`
`1224`	`1227`	`return sih->log_head;`
`1225`	`1228`	`}`
`1226`	`1229`