]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Dec 2016 16:23:53 +0000 (08:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Dec 2016 16:23:53 +0000 (08:23 -0800)
Pull quota, fsnotify and ext2 updates from Jan Kara:
 "Changes to locking of some quota operations from dedicated quota mutex
  to s_umount semaphore, a fsnotify fix and a simple ext2 fix"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: Fix bogus warning in dquot_disable()
  fsnotify: Fix possible use-after-free in inode iteration on umount
  ext2: reject inodes with negative size
  quota: Remove dqonoff_mutex
  ocfs2: Use s_umount for quota recovery protection
  quota: Remove dqonoff_mutex from dquot_scan_active()
  ocfs2: Protect periodic quota syncing with s_umount semaphore
  quota: Use s_umount protection for quota operations
  quota: Hold s_umount in exclusive mode when enabling / disabling quotas
  fs: Provide function to get superblock with exclusive s_umount

1  2 
fs/ext2/inode.c
fs/ocfs2/super.c
fs/quota/dquot.c
fs/quota/quota.c
include/linux/fs.h
include/linux/quota.h

diff --cc fs/ext2/inode.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge