---

yaml
---
r: 267217
b: refs/heads/master
c: 7542274
h: refs/heads/master
i:
  267215: b940cf1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6d05a757c314ad88d0649d3835a8a1daa964236
+refs/heads/master: 7542274519b3ba87555410c66e8356ac1e3bc9b3

trunk/fs/nfs/blocklayout/blocklayout.c

@@ -533,6 +533,11 @@ bl_write_pagelist(struct nfs_write_data *wdata, int sync)
 fill_invalid_ext:
 		dprintk("%s need to zero %d pages\n", __func__, npg_zero);
 		for (;npg_zero > 0; npg_zero--) {
+			if (bl_is_sector_init(be->be_inval, isect)) {
+				dprintk("isect %llu already init\n",
+					(unsigned long long)isect);
+				goto next_page;
+			}
 			/* page ref released in bl_end_io_write_zero */
 			index = isect >> PAGE_CACHE_SECTOR_SHIFT;
 			dprintk("%s zero %dth page: index %lu isect %llu\n",
@@ -552,8 +557,7 @@ bl_write_pagelist(struct nfs_write_data *wdata, int sync)
 			 * PageUptodate: It was read before
 			 * sector_initialized: already written out
 			 */
-			if (PageDirty(page) || PageWriteback(page) ||
-			    bl_is_sector_init(be->be_inval, isect)) {
+			if (PageDirty(page) || PageWriteback(page)) {
 				print_page(page);
 				unlock_page(page);
 				page_cache_release(page);