diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-19 08:23:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-19 08:23:53 -0800 |
| commit | e93b1cc8a8965da137ffea0b88e5f62fa1d2a9e6 (patch) | |
| tree | 9757e9167daff086a314b031429d9b65a39b96bc /fs/ocfs2/super.c | |
| parent | 45d36906e256fe9f8e976461b4c559722c3cbe2a (diff) | |
| parent | 2700e6067c72a99d1b7037692da0145ac44623c4 (diff) | |
| download | linux-e93b1cc8a8965da137ffea0b88e5f62fa1d2a9e6.tar.gz linux-e93b1cc8a8965da137ffea0b88e5f62fa1d2a9e6.tar.bz2 linux-e93b1cc8a8965da137ffea0b88e5f62fa1d2a9e6.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
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
Diffstat (limited to 'fs/ocfs2/super.c')
| -rw-r--r-- | fs/ocfs2/super.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index c894d945b084..a24e42f95341 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -985,7 +985,6 @@ static void ocfs2_disable_quotas(struct ocfs2_super *osb) for (type = 0; type < OCFS2_MAXQUOTAS; type++) { if (!sb_has_quota_loaded(sb, type)) continue; - /* Cancel periodic syncing before we grab dqonoff_mutex */ oinfo = sb_dqinfo(sb, type)->dqi_priv; cancel_delayed_work_sync(&oinfo->dqi_sync_work); inode = igrab(sb->s_dquot.files[type]); |