The patch titled ext2: fix ext2 block reservation early ENOSPC issue has been added to the -mm tree. Its filename is ext2-fix-ext2-block-reservation-early-enospc-issue.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ext2: fix ext2 block reservation early ENOSPC issue From: Mingming Cao <cmm@xxxxxxxxxx> We could run into ENOSPC error on ext2, even when there is free blocks on the filesystem. The problem is triggered in the case the goal block group has 0 free blocks , and the rest block groups are skipped due to the check of "free_blocks < windowsz/2". Current code could fall back to non reservation allocation to prevent early ENOSPC after examing all the block groups with reservation on , but this code was bypassed if the reservation window is turned off already, which is true in this case. This patch fixed two issues: 1) We don't need to turn off block reservation if the goal block group has 0 free blocks left and continue search for the rest of block groups. Current code the intention is to turn off the block reservation if the goal allocation group has a few (some) free blocks left (not enough for make the desired reservation window),to try to allocation in the goal block group, to get better locality. But if the goal blocks have 0 free blocks, it should leave the block reservation on, and continues search for the next block groups,rather than turn off block reservation completely. 2) we don't need to check the window size if the block reservation is off. The problem was originally found and fixed in ext4. Signed-off-by: Mingming Cao <cmm@xxxxxxxxxx> Cc: Theodore Ts'o <tytso@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ext2/balloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN fs/ext2/balloc.c~ext2-fix-ext2-block-reservation-early-enospc-issue fs/ext2/balloc.c --- a/fs/ext2/balloc.c~ext2-fix-ext2-block-reservation-early-enospc-issue +++ a/fs/ext2/balloc.c @@ -1295,6 +1295,7 @@ retry_alloc: * turn off reservation for this allocation */ if (my_rsv && (free_blocks < windowsz) + && (free_blocks > 0) && (rsv_is_empty(&my_rsv->rsv_window))) my_rsv = NULL; @@ -1332,7 +1333,7 @@ retry_alloc: * free blocks is less than half of the reservation * window size. */ - if (free_blocks <= (windowsz/2)) + if (my_rsv && (free_blocks <= (windowsz/2))) continue; brelse(bitmap_bh); _ Patches currently in -mm which might be from cmm@xxxxxxxxxx are origin.patch vfs-fix-dio-write-returning-eio-when-try_to_release_page-fails.patch vmscan-set-try_to_release_pages-gfp_mask-to-0.patch percpu-counters-clean-up-percpu_counter_sum_and_set-interface.patch ext2-fix-ext2-block-reservation-early-enospc-issue.patch ext3-fix-ext3-block-reservation-early-enospc-issue.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html