Skip to content

Commit 7f55656

Browse files
Hugh Dickinstorvalds
authored andcommitted
tmpfs: fix regression hang in fallocate undo
The well-spotted fallocate undo fix is good in most cases, but not when fallocate failed on the very first page. index 0 then passes lend -1 to shmem_undo_range(), and that has two bad effects: (a) that it will undo every fallocation throughout the file, unrestricted by the current range; but more importantly (b) it can cause the undo to hang, because lend -1 is treated as truncation, which makes it keep on retrying until every page has gone, but those already fully instantiated will never go away. Big thank you to xfstests generic/269 which demonstrates this. Fixes: b9b4bb2 ("tmpfs: don't undo fallocate past its last page") Cc: [email protected] Signed-off-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 617a8d6 commit 7f55656

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

mm/shmem.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2225,9 +2225,11 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
22252225
error = shmem_getpage(inode, index, &page, SGP_FALLOC);
22262226
if (error) {
22272227
/* Remove the !PageUptodate pages we added */
2228-
shmem_undo_range(inode,
2229-
(loff_t)start << PAGE_SHIFT,
2230-
((loff_t)index << PAGE_SHIFT) - 1, true);
2228+
if (index > start) {
2229+
shmem_undo_range(inode,
2230+
(loff_t)start << PAGE_SHIFT,
2231+
((loff_t)index << PAGE_SHIFT) - 1, true);
2232+
}
22312233
goto undone;
22322234
}
22332235

0 commit comments

Comments
 (0)