Skip to content

Commit 8fc8232

Browse files
Hugh Dickinsgregkh
authored andcommitted
tmpfs: fix regression hang in fallocate undo
commit 7f556567036cb7f89aabe2f0954b08566b4efb53 upstream. 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: b9b4bb26af01 ("tmpfs: don't undo fallocate past its last page") Signed-off-by: Hugh Dickins <hughd@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1d3255b commit 8fc8232

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

mm/shmem.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2153,9 +2153,11 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
21532153
NULL);
21542154
if (error) {
21552155
/* Remove the !PageUptodate pages we added */
2156-
shmem_undo_range(inode,
2157-
(loff_t)start << PAGE_CACHE_SHIFT,
2158-
((loff_t)index << PAGE_CACHE_SHIFT) - 1, true);
2156+
if (index > start) {
2157+
shmem_undo_range(inode,
2158+
(loff_t)start << PAGE_CACHE_SHIFT,
2159+
((loff_t)index << PAGE_CACHE_SHIFT) - 1, true);
2160+
}
21592161
goto undone;
21602162
}
21612163

0 commit comments

Comments
 (0)