Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jul 2017 20:53:54 +0000 (13:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jul 2017 20:53:54 +0000 (13:53 -0700)
commit19c6e12c07ceab2ff5d5ec97354b893ab386c41c
tree47ac6b968c5b725f25cd3c0ee34f8cc7cd4c9617
parent954e6e03c61d233eae810f8da65270c224fe2fa4
parent4d9bcaddacf23861c5ee088b0c03e7034c3d59d6
Merge branch 'for_linus' of git://git./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