code: plan9front

Info  •  Files  •  Log

ext4srv: ext4_recover: fix a deadlock on filesystems without a journal

--- a/sys/src/cmd/ext4srv/ext4.c

+++ b/sys/src/cmd/ext4srv/ext4.c

@@ -364,8 +364,10 @@

 	int r;

 	EXT4_MP_LOCK(mp);

-	if (!ext4_sb_feature_com(&mp->fs.sb, EXT4_FCOM_HAS_JOURNAL))

-		return 0;

+	if (!ext4_sb_feature_com(&mp->fs.sb, EXT4_FCOM_HAS_JOURNAL)){

+		r = 0;

+		goto Finish;

+	}

 	struct jbd_fs *jbd_fs = ext4_calloc(1, sizeof(struct jbd_fs));

 	if (!jbd_fs) {