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

This commit is contained in:

Linus Torvalds

2017-07-13 13:53:54 -07:00

parent 954e6e03c6 4d9bcaddac

commit 19c6e12c07

6 changed files with 36 additions and 95 deletions

									
										fs/ext2/inode.c
									
		+1
		
												View File
												
				@@ -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));