summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'foreign/josef/space-updates' into for-chris-4.6David Sterba2016-02-263-17/+36
|\
| * Btrfs: check reserved when deciding to background flushJosef Bacik2016-02-181-1/+1
| * Btrfs: add transaction space reservation tracepointsJosef Bacik2016-02-181-1/+5
| * Btrfs: fix truncate_space_checkJosef Bacik2016-02-181-1/+10
| * Btrfs: change how we update the global block rsvJosef Bacik2016-02-181-14/+20
* | Merge branch 'foreign/zhaolei/reada' into for-chris-4.6David Sterba2016-02-263-137/+141
|\ \
| * | btrfs: reada: ignore creating reada_extent for a non-existent deviceZhao Lei2016-02-181-9/+8
| * | btrfs: reada: avoid undone reada extents in btrfs_reada_waitZhao Lei2016-02-181-1/+8
| * | btrfs: reada: limit max works countZhao Lei2016-02-183-1/+12
| * | btrfs: reada: simplify dev->reada_in_flight processingZhao Lei2016-02-181-18/+10
| * | btrfs: reada: Fix a debug code typoZhao Lei2016-02-181-8/+3
| * | btrfs: reada: Jump into cleanup in direct way for __readahead_hook()Zhao Lei2016-02-181-19/+21
| * | btrfs: reada: Use fs_info instead of root in __readahead_hook's argumentZhao Lei2016-02-183-25/+24
| * | btrfs: reada: Pass reada_extent into __readahead_hook directlyZhao Lei2016-02-181-21/+24
| * | btrfs: reada: move reada_extent_put to place after __readahead_hook()Zhao Lei2016-02-181-2/+2
| * | btrfs: reada: Remove level argument in severial functionsZhao Lei2016-02-181-9/+6
| * | btrfs: reada: bypass adding extent when all zone failedZhao Lei2016-02-181-0/+5
| * | btrfs: reada: add all reachable mirrors into reada device listZhao Lei2016-02-181-11/+9
| * | btrfs: reada: Move is_need_to_readahead contition earlierZhao Lei2016-02-181-11/+9
| * | btrfs: reada: Avoid many times of empty loopZhao Lei2016-02-161-1/+1
| * | btrfs: reada: Add missed segment checking in reada_find_zoneZhao Lei2016-02-161-1/+3
| * | btrfs: reada: reduce additional fs_info->reada_lock in reada_find_zoneZhao Lei2016-02-161-8/+4
| * | btrfs: reada: Fix in-segment calculation for readaZhao Lei2016-02-161-2/+2
| |/
* | Merge branch 'foreign/qu/norecovery-v7' into for-chris-4.6David Sterba2016-02-264-18/+67
|\ \
| * | btrfs: Introduce new mount option alias for nologreplayQu Wenruo2016-02-121-1/+3
| * | btrfs: Introduce new mount option to disable tree log replayQu Wenruo2016-02-124-7/+40
| * | btrfs: Introduce new mount option usebackuproot to replace recoveryQu Wenruo2016-02-124-11/+25
| |/
* | Merge branch 'dev/rename-keys' into for-chris-4.6David Sterba2016-02-263-12/+64
|\ \
| * | btrfs: teach print_leaf about temporary item subtypesDavid Sterba2016-02-111-0/+11
| * | btrfs: teach print_leaf about permanent item subtypesDavid Sterba2016-02-111-2/+10
| * | btrfs: switch dev stats item to the permanent item keyDavid Sterba2016-02-112-5/+8
| * | btrfs: introduce key type for persistent permanent itemsDavid Sterba2016-02-111-3/+17
| * | btrfs: switch balance item to the temporary item keyDavid Sterba2016-02-111-3/+3
| * | btrfs: introduce key type for persistent temporary itemsDavid Sterba2016-02-111-0/+16
| |/
* | Merge branch 'dev/gfp-flags' into for-chris-4.6David Sterba2016-02-2610-56/+60
|\ \
| * | btrfs: switch to kcalloc in btrfs_cmp_data_prepareDavid Sterba2016-02-111-2/+2
| * | btrfs: extent same: use GFP_KERNEL for page array allocationsDavid Sterba2016-02-111-2/+2
| * | btrfs: device add and remove: use GFP_KERNELDavid Sterba2016-02-111-4/+5
| * | btrfs: readdir: use GFP_KERNELDavid Sterba2016-02-111-1/+1
| * | btrfs: fallocate: use GFP_KERNELDavid Sterba2016-02-111-3/+3
| * | btrfs: let callers of btrfs_alloc_root pass gfp flagsDavid Sterba2016-02-111-10/+11
| * | btrfs: scrub: use GFP_KERNEL on the submission pathDavid Sterba2016-02-112-12/+14
| * | btrfs: reada: use GFP_KERNEL everywhereDavid Sterba2016-02-111-5/+5
| * | btrfs: send: use GFP_KERNEL everywhereDavid Sterba2016-02-112-19/+19
| |/
* | Merge branch 'chandan/prep-subpage-blocksize' into for-chris-4.6David Sterba2016-02-267-165/+321
|\ \ | |/ |/|
| * Btrfs: btrfs_ioctl_clone: Truncate complete page after performing clone opera...Chandan Rajendra2016-02-011-2/+3
| * Btrfs: Clean pte corresponding to page straddling i_sizeChandan Rajendra2016-02-012-3/+11
| * Btrfs: Fix block size returned to user spaceChandan Rajendra2016-02-011-1/+0
| * Btrfs: Limit inline extents to root->sectorsizeChandan Rajendra2016-02-011-1/+1
| * Btrfs: btrfs_submit_direct_hook: Handle map_length < bio vector lengthChandan Rajendra2016-02-011-8/+17