Linus Torvalds 15fc5deb1f Merge branch 'for-linus-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs ... Pull btrfs merge fix from Chris Mason: "This fixes a merge error in rc1. The calls to mnt_want_write should have been removed." * 'for-linus-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: remove mnt_want_write call in btrfs_mksubvol		2012-08-12 21:28:41 +03:00
..
Kconfig	Btrfs: add config option to enable btrfs integrity check	2011-12-21 19:14:16 +01:00
Makefile	Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus	2012-07-25 19:19:10 -04:00
acl.c	Btrfs: cache no acl on new inodes	2012-05-30 10:23:27 -04:00
async-thread.c	Btrfs: call the ordered free operation without any locks held	2012-07-25 16:15:07 -04:00
async-thread.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
backref.c	Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus	2012-07-25 19:19:10 -04:00
backref.h	Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus	2012-07-25 19:19:10 -04:00
btrfs_inode.h	Btrfs: kill free_space pointer from inode structure	2012-07-23 16:28:05 -04:00
check-integrity.c	Btrfs: introduce subvol uuids and times	2012-07-25 23:28:38 +02:00
check-integrity.h	Btrfs: add optional integrity check code	2011-12-21 19:14:09 +01:00
compat.h	Btrfs: drop remaining LINUX_KERNEL_VERSION checks and compat code	2009-01-06 09:38:55 -05:00
compression.c	Merge branch 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-04-13 19:41:27 -07:00
compression.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
ctree.c	Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus	2012-07-25 19:19:10 -04:00
ctree.h	btrfs: use printk_get_level and printk_skip_level, add __printf, fix fallout	2012-07-30 17:25:14 -07:00
delayed-inode.c	Btrfs: zero unused bytes in inode item	2012-07-23 16:28:05 -04:00
delayed-inode.h	Btrfs: flush delayed inodes if we're short on space	2012-07-23 15:41:40 -04:00
delayed-ref.c	Btrfs: hooks for qgroup to record delayed refs	2012-07-12 10:54:38 +02:00
delayed-ref.h	Btrfs: hooks for qgroup to record delayed refs	2012-07-12 10:54:38 +02:00
dir-item.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
disk-io.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-08-01 10:26:23 -07:00
disk-io.h	Btrfs: added helper to create new trees	2012-07-10 15:14:43 +02:00
export.c	->encode_fh() API change	2012-05-29 23:28:33 -04:00
export.h	NFS support for btrfs - v3	2008-09-25 11:04:06 -04:00
extent-tree.c	Btrfs: add a barrier before a waitqueue_active check	2012-07-25 16:15:08 -04:00
extent_io.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-07-26 14:48:55 -07:00
extent_io.h	Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus	2012-05-31 16:49:53 -04:00
extent_map.c	Btrfs: clean up code for merging extent maps	2011-08-01 14:30:50 -04:00
extent_map.h	btrfs: fix structs where bitfields and spinlock/atomic share 8B word	2012-02-15 16:40:25 +01:00
file-item.c	Btrfs: kill root from btrfs_is_free_space_inode	2012-07-23 16:28:00 -04:00
file.c	btrfs: Convert to new freezing mechanism	2012-07-31 09:45:52 +04:00
free-space-cache.c	Btrfs: do not count in readonly bytes	2012-07-23 16:28:03 -04:00
free-space-cache.h	btrfs: remove all unused functions	2011-05-06 12:34:03 +02:00
hash.h	Btrfs: remove crc32c.h and use libcrc32c directly.	2009-06-10 11:29:53 -04:00
inode-item.c	Merge branch 'error-handling' into for-linus	2012-03-28 20:31:37 -04:00
inode-map.c	Btrfs: show useful info in space reservation tracepoint	2012-03-29 09:57:44 -04:00
inode-map.h	Btrfs: Support reading/writing on disk free ino cache	2011-04-25 16:46:11 +08:00
inode.c	btrfs: nuke pdflush from comments	2012-08-04 12:15:35 +04:00
ioctl.c	Btrfs: remove mnt_want_write call in btrfs_mksubvol	2012-08-09 11:01:54 -04:00
ioctl.h	Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus	2012-07-25 19:19:10 -04:00
locking.c	Btrfs: reduce calls to wake_up on uncontended locks	2012-07-23 15:36:18 -04:00
locking.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
lzo.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00
ordered-data.c	btrfs: nuke pdflush from comments	2012-08-04 12:15:35 +04:00
ordered-data.h	Btrfs: finish ordered extents in their own thread	2012-05-30 10:23:33 -04:00
orphan.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
print-tree.c	Btrfs: read device stats on mount, write modified ones during commit	2012-05-30 10:23:41 -04:00
print-tree.h	Btrfs: Create extent_buffer interface for large blocksizes	2008-09-25 11:03:56 -04:00
qgroup.c	Btrfs: qgroup implementation and prototypes	2012-07-12 10:54:21 +02:00
rcu-string.h	Btrfs: use rcu to protect device->name	2012-06-14 21:29:16 -04:00
reada.c	Btrfs: set ioprio of scrub readahead to idle	2012-05-30 10:23:43 -04:00
relocation.c	btrfs: use printk_get_level and printk_skip_level, add __printf, fix fallout	2012-07-30 17:25:14 -07:00
root-tree.c	Btrfs: introduce subvol uuids and times	2012-07-25 23:28:38 +02:00
scrub.c	Btrfs: use rcu to protect device->name	2012-06-14 21:29:16 -04:00
send.c	Btrfs: using vmalloc and friends needs vmalloc.h	2012-07-26 18:08:30 -07:00
send.h	Btrfs: introduce BTRFS_IOC_SEND for btrfs send/receive	2012-07-25 23:30:19 +02:00
struct-funcs.c	Btrfs: rewrite BTRFS_SETGET_FUNCS	2012-07-23 16:28:06 -04:00
super.c	btrfs: nuke write_super from comments	2012-08-04 12:15:35 +04:00
sysfs.c	btrfs: Remove unused sysfs code	2011-06-17 14:54:18 -04:00
transaction.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-08-01 10:26:23 -07:00
transaction.h	Merge branch 'qgroup' of git://git.jan-o-sch.net/btrfs-unstable into for-linus	2012-07-25 16:11:38 -04:00
tree-defrag.c	btrfs: drop unused parameter from btrfs_release_path	2011-05-02 13:57:22 +02:00
tree-log.c	Btrfs: return error of btrfs_update_inode() to caller	2012-07-23 16:27:54 -04:00
tree-log.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
ulist.c	Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus	2012-05-31 16:49:53 -04:00
ulist.h	Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus	2012-05-31 16:49:53 -04:00
version.h	Update Btrfs files for in-kernel usage	2008-09-25 15:41:59 -04:00
volumes.c	btrfs: nuke write_super from comments	2012-08-04 12:15:35 +04:00
volumes.h	Btrfs: add DEVICE_READY ioctl	2012-07-23 16:27:42 -04:00
xattr.c	Btrfs: use i_version instead of our own sequence	2012-05-30 10:23:27 -04:00
xattr.h	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00
zlib.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00