wip: zil_commit_impl deadlock

Signed-off-by: Pavel Snajdr <snajpa@snajpa.net>
vpsfreecz · Sep 18, 2022 · afda13e · afda13e
1 parent 6dce2ae
commit afda13e
Showing 1 changed file with 37 additions and 36 deletions.
diff --git a/module/os/linux/zfs/zfs_znode.c b/module/os/linux/zfs/zfs_znode.c
@@ -1635,49 +1635,50 @@ zfs_free_range(znode_t *zp, uint64_t off, uint64_t len)
 
 	error = dmu_free_long_range(zfsvfs->z_os, zp->z_id, off, len);
 
+	zfs_rangelock_exit(lr);
+
+	if (!zp->z_is_mapped)
+		return (error);
+
 	/*
 	 * Zero partial page cache entries.  This must be done under a
 	 * range lock in order to keep the ARC and page cache in sync.
 	 */
-	if (zp->z_is_mapped) {
-		loff_t first_page, last_page, page_len;
-		loff_t first_page_offset, last_page_offset;
-
-		/* first possible full page in hole */
-		first_page = (off + PAGE_SIZE - 1) >> PAGE_SHIFT;
-		/* last page of hole */
-		last_page = (off + len) >> PAGE_SHIFT;
-
-		/* offset of first_page */
-		first_page_offset = first_page << PAGE_SHIFT;
-		/* offset of last_page */
-		last_page_offset = last_page << PAGE_SHIFT;
-
-		/* truncate whole pages */
-		if (last_page_offset > first_page_offset) {
-			truncate_inode_pages_range(ZTOI(zp)->i_mapping,
-			    first_page_offset, last_page_offset - 1);
-		}
+	loff_t first_page, last_page, page_len;
+	loff_t first_page_offset, last_page_offset;
 
-		/* truncate sub-page ranges */
-		if (first_page > last_page) {
-			/* entire punched area within a single page */
-			zfs_zero_partial_page(zp, off, len);
-		} else {
-			/* beginning of punched area at the end of a page */
-			page_len  = first_page_offset - off;
-			if (page_len > 0)
-				zfs_zero_partial_page(zp, off, page_len);
-
-			/* end of punched area at the beginning of a page */
-			page_len = off + len - last_page_offset;
-			if (page_len > 0)
-				zfs_zero_partial_page(zp, last_page_offset,
-				    page_len);
-		}
+	/* first possible full page in hole */
+	first_page = (off + PAGE_SIZE - 1) >> PAGE_SHIFT;
+	/* last page of hole */
+	last_page = (off + len) >> PAGE_SHIFT;
+
+	/* offset of first_page */
+	first_page_offset = first_page << PAGE_SHIFT;
+	/* offset of last_page */
+	last_page_offset = last_page << PAGE_SHIFT;
+
+	/* truncate whole pages */
+	if (last_page_offset > first_page_offset) {
+		truncate_inode_pages_range(ZTOI(zp)->i_mapping,
+		    first_page_offset, last_page_offset - 1);
 	}
-	zfs_rangelock_exit(lr);
 
+	/* truncate sub-page ranges */
+	if (first_page > last_page) {
+		/* entire punched area within a single page */
+		zfs_zero_partial_page(zp, off, len);
+	} else {
+		/* beginning of punched area at the end of a page */
+		page_len  = first_page_offset - off;
+		if (page_len > 0)
+			zfs_zero_partial_page(zp, off, page_len);
+
+		/* end of punched area at the beginning of a page */
+		page_len = off + len - last_page_offset;
+		if (page_len > 0)
+			zfs_zero_partial_page(zp, last_page_offset,
+			    page_len);
+	}
 	return (error);
 }