Messages in this thread | ![/](/images/icornerl.gif) | | Date | Mon, 21 Mar 2016 15:52:17 +0100 | From | Jan Kara <> | Subject | [GIT PULL] UDF and quota changes for 4.6-rc1 |
| |
Hello Linus,
could you please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git for_linus
This pull request contains rewrite of UDF handling of filename encoding to fix remaining overflow issues from Andrew Gabbasov and quota changes to support new Q_[X]GETNEXTQUOTA quotactl for VFS quota formats.
The pull also contains XFS changes for Q_[X]GETNEXTQUOTA support since I have pulled a branch from Dave Chinner's tree and based support for VFS quota formats on that. I have verified that the same branch is included in Dave's pull request to you so things should work out without issues.
Top of the tree is ab73ef46398e. The full shortlog is:
Andrew Gabbasov (5): udf: Parameterize output length in udf_put_filename udf: Join functions for UTF8 and NLS conversions udf: Adjust UDF_NAME_LEN to better reflect actual restrictions udf: Remove struct ustr as non-needed intermediate storage udf: Merge linux specific translation into CS0 conversion function
Carlos Maiolino (1): xfs: Split default quota limits by quota type
Eric Sandeen (9): quota: remove unused cmd argument from quota_quotaon() quota: add new quotactl Q_XGETNEXTQUOTA quota: add new quotactl Q_GETNEXTQUOTA xfs: don't overflow quota ID when initializing dqblk xfs: get quota inode from mp & flags rather than dqp xfs: Factor xfs_seek_hole_data into helper xfs: wire up Q_XGETNEXTQUOTA / get_nextdqblk quota: Fixup comments about return value of Q_[X]GETNEXTQUOTA ext4: Make Q_GETNEXTQUOTA work for quota in hidden inodes
Jan Kara (8): Merge branch 'xfs-get-next-dquot-4.6' of git://git.kernel.org/.../dgc/linux-xfs into for_next quota: Allow Q_GETQUOTA for frozen filesystem udf: Use separate buffer for copying split names quota: Add support for ->get_nextdqblk() for VFS quota quota_v2: Implement get_next_id() for V2 quota format ocfs2: Implement get_next_id() quota: Fix possible races during quota loading quota: Forbid Q_GETQUOTA and Q_GETNEXTQUOTA for frozen filesystem
Nikolay Borisov (1): quota: Fix possible GPF due to uninitialised pointers
The diffstat is
fs/ext4/super.c | 4 +- fs/ocfs2/ocfs2_trace.h | 2 + fs/ocfs2/quota_global.c | 25 ++ fs/quota/dquot.c | 54 +++- fs/quota/quota.c | 70 ++++- fs/quota/quota_tree.c | 67 ++++- fs/quota/quota_v2.c | 6 + fs/reiserfs/super.c | 1 + fs/udf/dir.c | 13 +- fs/udf/namei.c | 29 +- fs/udf/super.c | 38 +-- fs/udf/udfdecl.h | 21 +- fs/udf/unicode.c | 630 ++++++++++++++++------------------------- fs/xfs/libxfs/xfs_quota_defs.h | 3 +- fs/xfs/xfs_dquot.c | 129 ++++++++- fs/xfs/xfs_file.c | 82 ++++-- fs/xfs/xfs_inode.h | 2 + fs/xfs/xfs_qm.c | 55 +++- fs/xfs/xfs_qm.h | 48 +++- fs/xfs/xfs_qm_syscalls.c | 27 +- fs/xfs/xfs_quotaops.c | 36 ++- fs/xfs/xfs_trans_dquot.c | 15 +- include/linux/dqblk_qtree.h | 2 + include/linux/quota.h | 5 + include/linux/quotaops.h | 3 + include/uapi/linux/dqblk_xfs.h | 1 + include/uapi/linux/quota.h | 14 + 27 files changed, 862 insertions(+), 520 deletions(-)
Thanks Honza
-- Jan Kara <jack@suse.com> SUSE Labs, CR
| ![\](/images/icornerr.gif) |