Linus Torvalds
72932611b4
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace ...
Pull namespace bugfixes from Eric Biederman:
"This is three simple fixes against 3.9-rc1. I have tested each of
these fixes and verified they work correctly.
The userns oops in key_change_session_keyring and the BUG_ON triggered
by proc_ns_follow_link were found by Dave Jones.
I am including the enhancement for mount to only trigger requests of
filesystem modules here instead of delaying this for the 3.10 merge
window because it is both trivial and the kind of change that tends to
bit-rot if left untouched for two months."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
proc: Use nd_jump_link in proc_ns_follow_link
fs: Limit sys_mount to only request filesystem modules (Part 2).
fs: Limit sys_mount to only request filesystem modules.
userns: Stop oopsing in key_change_session_keyring
2013-03-09 16:51:13 -08:00
Btrfs: skip adding an acl attribute if we don't have to
2012-12-16 20:46:15 -05:00
Btrfs: fix backref walking race with tree deletions
2013-02-26 11:00:50 -05:00
Btrfs: move fs/btrfs/ioctl.h to include/uapi/linux/btrfs.h
2013-02-20 09:37:28 -05:00
Btrfs: serialize unlocked dio reads with truncate
2013-02-20 12:59:47 -05:00
btrfs: define BTRFS_MAGIC as a u64 value
2013-02-20 13:00:01 -05:00
Btrfs: add rw argument to merge_bio_hook()
2013-02-01 11:49:47 -05:00
btrfs: remove cache only arguments from defrag path
2013-02-20 12:59:36 -05:00
Btrfs: fix wrong reserved space in qgroup during snap/subv creation
2013-02-28 13:33:54 -05:00
Btrfs: improve the delayed inode throttling
2013-03-07 07:52:40 -05:00
Btrfs: improve the delayed inode throttling
2013-03-07 07:52:40 -05:00
Btrfs: make delayed ref lock logic more readable
2013-02-20 09:36:41 -05:00
Merge branch 'raid56-experimental' into for-linus-3.9
2013-02-20 14:06:05 -05:00
Btrfs: check the return value of btrfs_start_delalloc_inodes()
2013-02-20 09:37:21 -05:00
Btrfs: add new sources for device replace code
2012-12-12 17:15:41 -05:00
Btrfs: fix hash overflow handling
2012-12-17 14:48:21 -05:00
Btrfs: fix wrong handle at error path of create_snapshot() when the commit fails
2013-03-04 16:33:22 -05:00
Btrfs: RAID5 and RAID6
2013-02-01 14:24:23 -05:00
fs: encode_fh: return FILEID_INVALID if invalid fid_type
2013-02-26 02:46:10 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2013-03-02 16:41:54 -08:00
btrfs: fixup/remove module.h usage as required
2013-03-01 15:01:01 -05:00
btrfs: use only inline_pages from extent buffer
2013-02-28 13:33:56 -05:00
btrfs: fixup/remove module.h usage as required
2013-03-01 15:01:01 -05:00
Btrfs: do not allow logged extents to be merged or removed
2013-01-24 12:49:48 -05:00
Btrfs: extend the checksum item as much as possible
2013-02-20 12:59:37 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2013-03-02 16:41:54 -08:00
Merge branch 'raid56-experimental' into for-linus-3.9
2013-02-20 14:06:05 -05:00
Btrfs: improve the noflush reservation
2012-12-11 13:31:31 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2013-03-08 17:33:20 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2013-03-08 17:33:20 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2013-03-02 16:41:54 -08:00
Btrfs: save us a read_lock
2013-02-20 09:37:17 -05:00
Btrfs: RAID5 and RAID6
2013-02-01 14:24:23 -05:00
Btrfs: cleanup duplicated division functions
2012-12-11 13:31:30 -05:00
Btrfs: place ordered operations on a per transaction list
2013-02-20 12:59:57 -05:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-linus-3.9
2013-02-20 14:05:45 -05:00
btrfs: add missing break in btrfs_print_leaf()
2013-02-20 12:59:20 -05:00
Btrfs: remove reduplicate check about root in the function btrfs_clean_quota_tree
2013-03-01 10:13:04 -05:00
btrfs/raid56: Add missing #include <linux/vmalloc.h>
2013-03-03 06:53:41 -05:00
Btrfs: RAID5 and RAID6
2013-02-01 14:24:23 -05:00
Btrfs: introduce GET_READ_MIRRORS functionality for btrfs_map_block()
2012-12-12 17:15:43 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2013-03-08 17:33:20 -08:00
Btrfs: rename root_times_lock to root_item_lock
2012-12-16 20:46:21 -05:00
Merge branch 'raid56-experimental' into for-linus-3.9
2013-02-20 14:06:05 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2013-03-02 16:41:54 -08:00
btrfs: add "no file data" flag to btrfs send ioctl
2013-02-20 12:59:39 -05:00
fs: Limit sys_mount to only request filesystem modules.
2013-03-03 19:36:31 -08:00
btrfs: fixup/remove module.h usage as required
2013-03-01 15:01:01 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2013-03-08 17:33:20 -08:00
Btrfs: fix wrong reserved space in qgroup during snap/subv creation
2013-02-28 13:33:54 -05:00
btrfs: remove cache only arguments from defrag path
2013-02-20 12:59:36 -05:00
Btrfs: use set_nlink if our i_nlink is 0
2013-03-04 16:30:06 -05:00
btrfs: fixup/remove module.h usage as required
2013-03-01 15:01:01 -05:00
Btrfs: fix a mismerge in btrfs_balance()
2013-03-06 22:03:16 -05:00
Merge branch 'raid56-experimental' into for-linus-3.9
2013-02-20 14:06:05 -05:00
Btrfs: only log the inode item if we can get away with it
2012-12-16 20:46:21 -05:00
72932611b4