aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/super.c
Commit message (Expand)AuthorAgeFilesLines
* merged more uncritical stuff from 3.2.72Wolfgang Wiedmeyer2015-10-231-126/+221
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-07-081-0/+6
|\
| * btrfs: add missing options displayed in mount outputDavid Sterba2011-07-061-0/+6
* | Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2011-06-071-1/+1
|\ \
| * | more conservative S_NOSEC handlingAl Viro2011-06-031-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-06-051-1/+7
|\ \ \ | |/ / |/| / | |/
| * Btrfs: add mount -o inode_cacheChris Mason2011-06-041-1/+7
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-05-271-5/+46
|\ \ | |/
| * Btrfs: add mount -o auto_defragChris Mason2011-05-261-1/+6
| * Merge branch 'cleanups_and_fixes' into inode_numbersChris Mason2011-05-231-1/+3
| |\
| | * fs/btrfs: Add missing btrfs_free_pathJulia Lawall2011-05-231-1/+3
| * | Merge branch 'allocator' of git://git.kernel.org/pub/scm/linux/kernel/git/arn...Chris Mason2011-05-221-0/+26
| |\ \
| | * | btrfs: move btrfs_cmp_device_free_bytes to super.cArne Jansen2011-05-131-0/+26
| | |/
| * | Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into ino...Chris Mason2011-05-221-2/+2
| |\ \
| | * | btrfs: rename variables clashing with global function namesDavid Sterba2011-05-021-2/+2
| | |/
| * | btrfs: implement delayed inode items operationMiao Xie2011-05-211-1/+9
| |/
* | btrfs: add cleancache supportDan Magenheimer2011-05-261-0/+2
|/
* Btrfs: fix subvolume mount by name problem when default mount subvolume is setXin Zhong2011-04-111-9/+33
* Btrfs: fix /proc/mounts info.Tsutomu Itoh2011-04-051-2/+17
* Btrfs: add initial tracepoint support for btrfsliubo2011-03-281-0/+5
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2011-02-251-1/+6
|\
| * Btrfs: put ENOSPC debugging under a mount optionChris Mason2011-02-161-1/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2011-02-071-2/+7
|\ \ | |/
| * btrfs: fix return value check of btrfs_start_transaction()Tsutomu Itoh2011-02-011-0/+2
| * Merge branch 'bug-fixes' of git://repo.or.cz/linux-btrfs-devel into btrfs-38Chris Mason2011-01-281-2/+5
| |\
| | * Btrfs: Free correct pointer after using strsepTero Roponen2011-01-271-2/+3
| | * Btrfs: Fix memory leak on finding existing superIan Kent2011-01-271-0/+2
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-01-171-18/+263
|\ \ \ | |/ /
| * | Btrfs: forced readonly mounts on errorsliubo2011-01-171-0/+84
| * | btrfs: fix wrong free space information of btrfsMiao Xie2011-01-161-6/+140
| * | btrfs: fix wrong data space statisticsMiao Xie2011-01-161-4/+3
| * | btrfs: Add lzo compression supportLi Zefan2010-12-221-0/+3
| * | btrfs: Allow to add new compression algorithmLi Zefan2010-12-221-11/+36
| |/
* | switch btrfs, close racesAl Viro2011-01-121-0/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2010-12-141-1/+1
|\ \ | |/
| * Btrfs: Fix a crash when mounting a subvolumeLi Zefan2010-12-101-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2010-11-291-3/+38
|\ \ | |/
| * Btrfs: setup blank root and fs_info for mount timeJosef Bacik2010-11-271-3/+31
| * Btrfs - fix race between btrfs_get_sb() and umountIan Kent2010-11-271-0/+6
| * Btrfs: handle the space_cache option properlyJosef Bacik2010-11-211-0/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2010-10-301-12/+30
|\ \ | |/
| * Btrfs: allow subvol deletion by unprivileged user with -o user_subvol_rm_allowedSage Weil2010-10-291-0/+5
| * Btrfs: cleanup warnings from gcc 4.6 (nonbugs)Andi Kleen2010-10-291-4/+2
| * Btrfs: Use ERR_CAST helpersJulia Lawall2010-10-291-1/+1
| * Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jos...Chris Mason2010-10-291-6/+12
| |\
| | * Btrfs: fix error handling in btrfs_get_sbJosef Bacik2010-10-221-4/+3
| | * Btrfs: fix df regressionJosef Bacik2010-10-221-2/+9
| * | Btrfs: Add a clear_cache mount optionJosef Bacik2010-10-291-1/+5
| * | Btrfs: create special free space cache inodeJosef Bacik2010-10-281-1/+6
* | | convert btrfsAl Viro2010-10-291-9/+6