Merge tag 'vfs-5.4-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Sep 2019 00:35:20 +0000 (17:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Sep 2019 00:35:20 +0000 (17:35 -0700)
commite6bc9de714972cac34daa1dc1567ee48a47a9342
treebb688c082764b6ce11d1160f525f535836d3f591
parentb6c0d35772468173b5d3a7f6162079611e68a1e8
parentdc617f29dbe5ef0c8ced65ce62c464af1daaab3d
Merge tag 'vfs-5.4-merge-1' of git://git./fs/xfs/xfs-linux

Pull swap access updates from Darrick Wong:
 "Prohibit writing to active swap files and swap partitions.

  There's no non-malicious use case for allowing userspace to scribble
  on storage that the kernel thinks it owns"

* tag 'vfs-5.4-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  vfs: don't allow writes to swap files
  mm: set S_SWAPFILE on blockdev swap devices
fs/block_dev.c
include/linux/fs.h