summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2011-11-071-55/+50
|\
| * CIFS: Cleanup byte-range locking code stylePavel Shilovsky2011-11-041-24/+19
| * CIFS: Simplify setlk error handling for mandatory lockingPavel Shilovsky2011-11-041-32/+32
* | Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-11-078-47/+225
|\ \
| * | jffs2: add compr=lzo and compr=zlib optionsAndres Salomon2011-10-193-37/+110
| * | jffs2: implement mount option parsing and compression overridingAndres Salomon2011-10-195-4/+112
| * | mtd: rename MTD_OOB_* to MTD_OPS_*Brian Norris2011-09-111-3/+3
| * | jffs2: use mutex_is_locked() in __jffs2_flush_wbuf()Alexey Khoroshilov2011-09-111-2/+1
| * | jffs2: Avoid unneeded 'if' before kfreeJesper Juhl2011-09-111-3/+1
* | | Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6Linus Torvalds2011-11-074-2/+23
|\ \ \
| * | | UBIFS: fix the dark space calculationsrimugunthan dhandapani2011-08-262-2/+2
| * | | UBIFS: introduce a helper to dump scanning infoArtem Bityutskiy2011-08-222-0/+21
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-11-0631-1603/+5423
|\ \ \
| * | | Btrfs: check for a null fs root when writing to the backup root logChris Mason2011-11-061-3/+10
| * | | Btrfs: fix race during transaction joinsChris Mason2011-11-061-5/+8
| * | | Btrfs: fix a potential btrfs_bio leak on scrub fixupsIlya Dryomov2011-11-061-0/+1
| * | | Btrfs: rename btrfs_bio multi -> bbio for consistencyIlya Dryomov2011-11-061-15/+15
| * | | Btrfs: stop leaking btrfs_bios on readaheadIlya Dryomov2011-11-061-0/+2
| * | | Btrfs: stop the readahead threads on failed mountChris Mason2011-11-061-0/+1
| * | | Btrfs: fix extent_buffer leak in the metadata IO error handlingChris Mason2011-11-061-0/+1
| * | | Btrfs: fix the new inspection ioctls for 32 bit compatChris Mason2011-11-064-16/+15
| * | | Merge git://git.jan-o-sch.net/btrfs-unstable into integrationChris Mason2011-11-0614-280/+1930
| |\ \ \
| | * | | btrfs: integrating raid-repair and scrub-fixup-nodatasumJan Schmidt2011-09-291-25/+67
| | * | | btrfs: Moved repair code from inode.c to extent_io.cJan Schmidt2011-09-293-159/+393
| | * | | btrfs: Put mirror_num in bi_bdevJan Schmidt2011-09-291-0/+2
| | * | | btrfs: Do not use bio->bi_bdev after submissionJan Schmidt2011-09-291-1/+1
| | * | | btrfs: btrfs_multi_bio replaced with btrfs_bioJan Schmidt2011-09-294-78/+90
| | * | | btrfs: new ioctls to do logical->inode and inode->path resolvingJan Schmidt2011-09-292-0/+162
| | * | | btrfs scrub: add fixup code for errors on nodatasum filesJan Schmidt2011-09-292-6/+183
| | * | | btrfs scrub: use int for mirror_num, not u64Jan Schmidt2011-09-291-4/+4
| | * | | btrfs: add mirror_num to extent_read_full_pageJan Schmidt2011-09-294-6/+6
| | * | | btrfs scrub: bugfix: mirror_num off by oneJan Schmidt2011-09-291-6/+6
| | * | | btrfs scrub: print paths of corrupted filesJan Schmidt2011-09-291-6/+163
| | * | | btrfs scrub: added unverified_errorsJan Schmidt2011-09-291-11/+26
| | * | | btrfs: added helper functions to iterate backrefsJan Schmidt2011-09-294-1/+851
| * | | | Merge branch 'for-chris' of git://github.com/sensille/linux into integrationChris Mason2011-11-0610-70/+1130
| |\ \ \ \
| | * | | | btrfs: use readahead API for scrubArne Jansen2011-10-021-62/+50
| | * | | | btrfs: hooks for readaheadArne Jansen2011-10-022-1/+38
| | * | | | btrfs: initial readahead code and prototypesArne Jansen2011-10-023-1/+967
| | * | | | btrfs: state information for readaheadArne Jansen2011-10-024-0/+31
| | * | | | btrfs: add READAHEAD extent buffer flagArne Jansen2011-10-023-0/+35
| | * | | | btrfs: add an extra wait mode to read_extent_buffer_pagesArne Jansen2011-10-023-6/+9
| | * | | | Merge branch 'btrfs-3.0' into for-linusChris Mason2011-09-301-8/+16
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Btrfs: fix delayed insertion reservationJosef Bacik2011-11-063-8/+49
| * | | | | Btrfs: ClearPageError during writepage and clean_tree_blockChris Mason2011-11-062-1/+10
| * | | | | Btrfs: be smarter about committing the transaction in reserve_metadata_bytesJosef Bacik2011-11-061-19/+67
| * | | | | Btrfs: make a delayed_block_rsv for the delayed item insertionJosef Bacik2011-11-064-7/+13
| * | | | | Btrfs: add a log of past tree rootsChris Mason2011-11-063-24/+369
| * | | | | btrfs: separate superblock items out of fs_infoDavid Sterba2011-11-0612-76/+78
| * | | | | Btrfs: use the global reserve when truncating the free space cache inodeJosef Bacik2011-11-061-5/+17
OpenPOWER on IntegriCloud