summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2012-06-162-2/+3
|\
| * Btrfs: cast devid to unsigned long long for printk %lluChris Mason2012-06-151-1/+2
| * Btrfs: init old_generation in get_old_rootChris Mason2012-06-151-1/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2012-06-1518-189/+476
|\ \ | |/
| * Btrfs: destroy the items of the delayed inodes in error handling routineMiao Xie2012-06-153-0/+27
| * Btrfs: make sure that we've made everything in pinned tree cleanLiu Bo2012-06-151-0/+11
| * Btrfs: avoid memory leak of extent state in error handling routineLiu Bo2012-06-151-0/+2
| * Btrfs: do not resize a seeding deviceLiu Bo2012-06-151-0/+7
| * Btrfs: fix missing inherited flag in renameLiu Bo2012-06-151-3/+6
| * Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-l...Chris Mason2012-06-153-35/+70
| |\
| | * Btrfs: fix race in tree mod log additionJan Schmidt2012-06-141-4/+19
| | * Btrfs: add btrfs_next_old_leafJan Schmidt2012-06-143-4/+16
| | * Btrfs: fix return value for __tree_mod_log_oldest_rootJan Schmidt2012-06-141-13/+20
| | * Btrfs: use btrfs_read_lock_root_node in get_old_rootJan Schmidt2012-06-141-4/+16
| | * Btrfs: remove obsolete btrfs_next_leaf call from __resolve_indirect_refJan Schmidt2012-06-141-9/+1
| | * Btrfs: remove call to btrfs_header_nritems with no effectJan Schmidt2012-06-041-3/+0
| * | Btrfs: fix incompat flags settingLi Zefan2012-06-141-1/+1
| * | Btrfs: fix defrag regressionLi Zefan2012-06-141-48/+49
| * | Btrfs: call filemap_fdatawrite twice for compressionJosef Bacik2012-06-143-7/+31
| * | Btrfs: keep inode pinned when compressing writesJosef Bacik2012-06-141-2/+6
| * | Btrfs: implement ->show_devnameJosef Bacik2012-06-141-0/+33
| * | Btrfs: use rcu to protect device->nameJosef Bacik2012-06-148-64/+162
| * | Btrfs: unlock everything properly in the error case for nocowJosef Bacik2012-06-141-2/+35
| * | Btrfs: fix btrfs_destroy_marked_extentsJosef Bacik2012-06-141-4/+2
| * | Btrfs: abort the transaction if the commit failsJosef Bacik2012-06-141-2/+8
| * | Btrfs: wake up transaction waiters when aborting a transactionJosef Bacik2012-06-142-6/+7
| * | Btrfs: fix locking in btrfs_destroy_delayed_refsJosef Bacik2012-06-141-13/+17
| * | Btrfs: pass locked_page into extent_clear_unlock_delalloc if theres an errorJosef Bacik2012-06-141-2/+2
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-06-015-55/+23
|\ \
| * | Btrfs: move over to use ->update_timeJosef Bacik2012-06-013-41/+15
| * | btrfs: trivial endianness annotationsAl Viro2012-05-293-7/+8
| * | ->encode_fh() API changeAl Viro2012-05-291-11/+4
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2012-06-0133-866/+2849
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-l...Chris Mason2012-05-3114-252/+1368
| |\
| | * Btrfs: fix tree mod log rewinded level and rewinding of moved keysJan Schmidt2012-05-311-2/+4
| | * Btrfs: fix tree mod log del_ptrJan Schmidt2012-05-311-6/+7
| | * Btrfs: add tree_mod_dont_log helperJan Schmidt2012-05-311-9/+15
| | * Btrfs: add missing spin_lock for insertion into tree mod logJan Schmidt2012-05-311-5/+18
| | * Btrfs: add inodes before dropping the extent lock in find_all_leafsJan Schmidt2012-05-313-6/+43
| | * Btrfs: use delayed ref sequence numbers for all fs-tree updatesJan Schmidt2012-05-303-23/+13
| | * Btrfs: tree mod log sanity checks in join_transactionJan Schmidt2012-05-301-0/+18
| | * Btrfs: fs_info variable for join_transactionJan Schmidt2012-05-301-18/+19
| | * Btrfs: use the tree modification log for backref resolvingJan Schmidt2012-05-302-17/+29
| | * Btrfs: add btrfs_search_old_slotJan Schmidt2012-05-302-4/+317
| | * Btrfs: add del_ptr and insert_ptr modifications to the tree mod logJan Schmidt2012-05-301-10/+32
| | * Btrfs: put all block modifications into the tree mod logJan Schmidt2012-05-301-0/+36
| | * Btrfs: add tree modification log functionsJan Schmidt2012-05-302-1/+412
| | * Btrfs: add tree mod log to fs_infoJan Schmidt2012-05-262-0/+14
| | * Btrfs: dummy extent buffers for tree mod logJan Schmidt2012-05-262-7/+76
| | * Btrfs: move struct seq_list to ctree.hJan Schmidt2012-05-262-5/+7
OpenPOWER on IntegriCloud