diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 14:02:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 14:02:31 +0200 |
| commit | ac0c49396d5ed9a33f08ce661635ac1bff80bb4f (patch) | |
| tree | e2f066b931b133e94fde7e1157c57bef69a928e7 /fs/btrfs/extent_io.c | |
| parent | Merge tag 'ecryptfs-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | udf: Fix loading of special inodes (diff) | |
| download | linux-ac0c49396d5ed9a33f08ce661635ac1bff80bb4f.tar.xz linux-ac0c49396d5ed9a33f08ce661635ac1bff80bb4f.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF and quota updates from Jan Kara:
"A few UDF fixes and also a few patches which are preparing filesystems
for support of project quotas in VFS"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
udf: Fix loading of special inodes
ocfs2: Back out change to use OCFS2_MAXQUOTAS in ocfs2_setattr()
udf: remove redundant sys_tz declaration
ocfs2: Don't use MAXQUOTAS value
reiserfs: Don't use MAXQUOTAS value
ext3: Don't use MAXQUOTAS value
udf: Fix race between write(2) and close(2)
Diffstat (limited to 'fs/btrfs/extent_io.c')
0 files changed, 0 insertions, 0 deletions