summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-10-2833-1131/+2510
|\
| * Merge branch 'next' into upstream-mergeTheodore Ts'o2010-10-2833-1131/+2510
| |\
| | * ext4,jbd2: convert tracepoints to use major/minor numbersTheodore Ts'o2010-10-282-156/+251
| | * ext4: optimize orphan_list handling for ext4_setattrDmitry Monakhov2010-10-281-3/+7
| | * ext4: fix unbalanced mutex unlock in error path of ext4_li_request_newNicolas Kaiser2010-10-281-14/+8
| | * ext4: fix compile error in ext4_fallocate()Kazuya Mio2010-10-281-1/+1
| | * ext4: move ext4_mb_{get,put}_buddy_cache_lock and make them staticEric Sandeen2010-10-282-81/+79
| | * ext4: rename mark_bitmap_end() to ext4_mark_bitmap_end()Theodore Ts'o2010-10-284-7/+9
| | * ext4: move flush_completed_IO to fs/ext4/fsync.c and make it staticTheodore Ts'o2010-10-283-84/+83
| | * ext4: rename {ext,idx}_pblock and inline small extent functionsTheodore Ts'o2010-10-284-118/+121
| | * ext4: make various ext4 functions be staticTheodore Ts'o2010-10-287-44/+27
| | * ext4: rename {exit,init}_ext4_*() to ext4_{exit,init}_*()Theodore Ts'o2010-10-287-34/+34
| | * ext4: fix kernel oops if the journal superblock has a non-zero j_errnoTheodore Ts'o2010-10-282-2/+15
| | * ext4: update writeback_index based on last page scannedEric Sandeen2010-10-281-5/+9
| | * ext4: implement writeback livelock avoidance using page taggingEric Sandeen2010-10-282-3/+17
| | * ext4: tidy up a void argument in inode.cEric Sandeen2010-10-281-2/+2
| | * ext4: add batched_discard into ext4 feature listLukas Czerner2010-10-281-0/+2
| | * ext4: Add batched discard support for ext4Lukas Czerner2010-10-283-0/+188
| | * fs: Add FITRIM ioctlLukas Czerner2010-10-282-0/+47
| | * ext4: Use return value from sb_issue_discard()Lukas Czerner2010-10-281-1/+2
| | * ext4: Check return value of sb_getblk() and friendsNamhyung Kim2010-10-282-0/+7
| | * ext4: use bio layer instead of buffer layer in mpage_da_submit_ioTheodore Ts'o2010-10-286-109/+489
| | * ext4: move mpage_put_bnr_to_bhs()'s functionality to mpage_da_submit_io()Theodore Ts'o2010-10-281-101/+38
| | * ext4: inline walk_page_buffers() into mpage_da_submit_ioTheodore Ts'o2010-10-281-11/+13
| | * ext4: inline ext4_writepage() into mpage_da_submit_io()Theodore Ts'o2010-10-281-11/+59
| | * ext4: simplify ext4_writepage()Theodore Ts'o2010-10-281-48/+25
| | * ext4: call mpage_da_submit_io() from mpage_da_map_blocks()Theodore Ts'o2010-10-281-33/+33
| | * ext4: use KMEM_CACHE instead of kmem_cache_createTheodore Ts'o2010-10-282-14/+7
| | * ext4: use search_dirblock() in ext4_dx_find_entry()Theodore Ts'o2010-10-281-21/+12
| | * ext4: avoid uninitialized memory references in ext3_htree_next_block()Theodore Ts'o2010-10-281-15/+15
| | * ext4: remove unused ext4_sb_info membersEric Sandeen2010-10-281-5/+0
| | * ext4: queue conversion after adding to inode's completed IO listEric Sandeen2010-10-281-3/+3
| | * ext4: don't use ext4_allocation_contexts for tracingEric Sandeen2010-10-282-91/+41
| | * ext4: fix oops in trace_ext4_mb_release_group_paEric Sandeen2010-10-281-3/+0
| | * ext4: fix potential infinite loop in ext4_da_writepages()Toshiyuki Okajima2010-10-281-1/+1
| | * ext4: improve llseek error handling for overly large seek offsetsToshiyuki Okajima2010-10-283-2/+45
| | * ext4: don't update sb journal_devnum when RO devMaciej Żenczykowski2010-10-281-1/+1
| | * ext4: use sb_issue_zeroout in ext4_ext_zerooutLukas Czerner2010-10-281-62/+7
| | * ext4: use sb_issue_zeroout in setup_new_group_blocksLukas Czerner2010-10-281-33/+13
| | * ext4: add interface to advertise ext4 features in sysfsLukas Czerner2010-10-283-11/+65
| | * ext4: add support for lazy inode table initializationLukas Czerner2010-10-284-3/+611
| | * Add helper function for blkdev_issue_zeroout (sb_issue_discard)Lukas Czerner2010-10-281-0/+8
| | * jbd2: Add sanity check for attempts to start handle during umountTheodore Ts'o2010-10-282-0/+11
| | * ext4: fix NULL pointer dereference in print_daily_error_info()Sergey Senozhatsky2010-10-281-0/+1
| | * ext4: don't hold spinlock while calling ext4_issue_discard()Lukas Czerner2010-10-281-2/+2
| | * ext4: check for negative error code from sb_issue_discardLukas Czerner2010-10-281-1/+1
| | * ext4: don't bump up LONG_MAX nr_to_write by a factor of 8Eric Sandeen2010-10-281-3/+6
| | * ext4: stop looping in ext4_num_dirty_pages when max_pages reachedEric Sandeen2010-10-281-1/+3
| | * ext4: use dedicated slab caches for group_info structuresCurt Wohlgemuth2010-10-282-21/+78
| | * ext4: avoid null dereference in trace_ext4_mballoc_discardWen Congyang2010-10-281-2/+3