summaryrefslogtreecommitdiffstats
path: root/fs/ext2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-13 13:53:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-13 13:53:54 -0700
commit19c6e12c07ceab2ff5d5ec97354b893ab386c41c (patch)
tree47ac6b968c5b725f25cd3c0ee34f8cc7cd4c9617 /fs/ext2
parent954e6e03c61d233eae810f8da65270c224fe2fa4 (diff)
parent4d9bcaddacf23861c5ee088b0c03e7034c3d59d6 (diff)
downloadlinux-19c6e12c07ceab2ff5d5ec97354b893ab386c41c.tar.bz2
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext2, udf, reiserfs fixes from Jan Kara: "Several ext2, udf, and reiserfs fixes" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: ext2: Fix memory leak when truncate races ext2_get_blocks reiserfs: fix race in prealloc discard reiserfs: don't preallocate blocks for extended attributes udf: Convert udf_disk_stamp_to_time() to use mktime64() udf: Use time64_to_tm for timestamp conversion udf: Fix deadlock between writeback and udf_setsize() udf: Use i_size_read() in udf_adinicb_writepage() udf: Fix races with i_size changes during readpage udf: Remove unused UDF_DEFAULT_BLOCKSIZE
Diffstat (limited to 'fs/ext2')
-rw-r--r--fs/ext2/inode.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 2dcbd5698884..30163d007b2f 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -659,6 +659,7 @@ static int ext2_get_blocks(struct inode *inode,
*/
err = -EAGAIN;
count = 0;
+ partial = chain + depth - 1;
break;
}
blk = le32_to_cpu(*(chain[depth-1].p + count));