Merge tag 'for_v4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jun 2018 09:04:56 +0000 (18:04 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jun 2018 09:04:56 +0000 (18:04 +0900)
commit894b8c000ae6c106cc434ee0000dfb77df8bd9db
tree8d21694dcad449e3a5a24f0213320655b12adc73
parent1cfea546b10c8fec218973c3f3c39ff797a3e50c
parent6c1e4d06a3808dc67dbce2d631f4c12574567dd5
Merge tag 'for_v4.18-rc2' of git://git./linux/kernel/git/jack/linux-fs

Pull udf, quota, ext2 fixes from Jan Kara:
 "UDF:
   - fix an oops due to corrupted disk image
   - two small cleanups

  quota:
   - a fixfor lru handling
   - cleanup

  ext2:
   - a warning about a deprecated mount option"

* tag 'for_v4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Drop unused arguments of udf_delete_aext()
  udf: Provide function for calculating dir entry length
  udf: Detect incorrect directory size
  ext2: add warning when specifying nocheck option
  quota: Cleanup list iteration in dqcache_shrink_scan()
  quota: reclaim least recently used dquots