aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent_io.c
Commit message (Expand)AuthorAgeFilesLines
* merged more uncritical stuff from 3.2.72Wolfgang Wiedmeyer2015-10-231-207/+837
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-06-051-1/+1
|\
| * Merge branch 'for-chris' ofChris Mason2011-05-281-1/+1
| |\
| | * Btrfs: set range_start to the right start in count_range_bitsJosef Bacik2011-05-231-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-05-271-264/+60
|\ \ \ | |/ /
| * | Btrfs: return -ENOMEM in clear_extent_bitChris Mason2011-05-261-1/+2
| * | Merge branch 'cleanups_and_fixes' into inode_numbersChris Mason2011-05-231-16/+40
| |\ \
| | * | Btrfs: fix unsafe usage of merge_stateXiao Guangrong2011-05-231-8/+14
| | * | Btrfs: allocate extent state and check the result properlyXiao Guangrong2011-05-231-8/+26
| | |/
| * | Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into ino...Chris Mason2011-05-221-248/+19
| |\ \
| | * | btrfs: remove all unused functionsDavid Sterba2011-05-061-227/+0
| | * | btrfs: drop gfp parameter from alloc_extent_bufferDavid Sterba2011-05-021-4/+3
| | * | btrfs: drop gfp parameter from find_extent_bufferDavid Sterba2011-05-021-2/+1
| | * | btrfs: drop unused argument from extent_io_tree_initDavid Sterba2011-05-021-1/+1
| | * | btrfs: unify checking of IS_ERR and nullDavid Sterba2011-05-021-6/+6
| | * | btrfs: rename variables clashing with global function namesDavid Sterba2011-05-021-14/+14
| | |/
| * | Merge branch 'ino-alloc' of git://repo.or.cz/linux-btrfs-devel into inode_num...Chris Mason2011-05-211-2/+2
| |\ \ | | |/ | |/|
| | * Btrfs: Always use 64bit inode numberLi Zefan2011-04-251-2/+2
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm...Linus Torvalds2011-05-261-0/+9
|\ \ \
| * | | btrfs: add cleancache supportDan Magenheimer2011-05-261-0/+9
| |/ /
* | | sanitize <linux/prefetch.h> usageLinus Torvalds2011-05-201-0/+1
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2011-04-261-1/+1
|\ \
| * | btrfs: fix wrong allocating flag when reading pageItaru Kitayama2011-04-251-1/+1
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2011-04-181-20/+62
|\ \ | |/
| * Btrfs end_bio_extent_readpage should look for locked bitsChris Mason2011-04-161-1/+1
| * Btrfs: make uncache_state unconditionalChris Mason2011-04-121-5/+3
| * btrfs: using cached extent_state in set/unlock combinationsArne Jansen2011-04-111-17/+53
| * btrfs: properly handle overlapping areas in memmove_extent_bufferSergei Trofimovich2011-04-111-3/+11
* | Merge branch 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-03-281-0/+3
|\ \ | |/
| * Btrfs: add initial tracepoint support for btrfsliubo2011-03-281-0/+2
| * Btrfs: return error if the range we want to map is bogusJosef Bacik2011-03-171-0/+1
* | Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-03-241-1/+1
|\ \ | |/ |/|
| * Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/coreJens Axboe2011-03-101-1/+1
| |\
| | * block: kill off REQ_UNPLUGJens Axboe2011-03-101-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2011-03-131-6/+27
|\ \ \ | |/ / |/| |
| * | Btrfs: make sure not to return overlapping extents to fiemapChris Mason2011-03-081-6/+27
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2011-02-251-39/+99
|\ \ \ | |/ / | | / | |/ |/|
| * Btrfs: fix fiemap bugs with delallocChris Mason2011-02-231-39/+99
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2011-02-151-4/+44
|\ \ | |/
| * Btrfs: don't release pages when we can't clear the uptodate bitsChris Mason2011-02-141-1/+9
| * Btrfs: fix page->private racesChris Mason2011-02-141-3/+35
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2011-02-071-2/+4
|\ \ | |/
| * btrfs: checking NULL or not in some functionsTsutomu Itoh2011-02-011-0/+2
| * btrfs: fix uncheck memory allocation in btrfs_submit_compressed_readliubo2011-01-281-2/+2
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-01-171-1/+6
|\ \ | |/
| * btrfs: check NULL or notTsutomu Itoh2011-01-161-0/+2
| * btrfs: Allow to add new compression algorithmLi Zefan2010-12-221-1/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2010-11-291-15/+62
|\ \ | |/
| * Btrfs: fix fiemapJosef Bacik2010-11-271-9/+54
| * Btrfs: avoid NULL pointer deref in try_release_extent_bufferChris Mason2010-11-211-2/+4