summaryrefslogtreecommitdiff
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds2011-12-025-25/+74
|\
| * xfs: fix attr2 vs large data fork assertChristoph Hellwig2011-11-291-25/+39
| * xfs: force buffer writeback before blocking on the ilock in inode reclaimChristoph Hellwig2011-11-293-0/+33
| * xfs: validate acl countChristoph Hellwig2011-11-281-0/+2
* | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-12-0131-536/+995
|\ \
| * | ocfs2: avoid unaligned access to dqc_bitmapAkinobu Mita2011-12-012-5/+52
| * | ocfs2: Use filemap_write_and_wait() instead of write_inode_now()Jan Kara2011-11-171-1/+1
| * | ocfs2: honor O_(D)SYNC flag in fallocateMark Fasheh2011-11-171-0/+3
| * | ocfs2: Add a missing journal credit in ocfs2_link_credits() -v2Xiaowei.Hu2011-11-171-2/+3
| * | ocfs2: send correct UUID to cleancache initializationDan Magenheimer2011-11-171-1/+1
| * | ocfs2: Commit transactions in error cases -v2Wengang Wang2011-11-173-6/+9
| * | ocfs2: make direntry invalid when deleting itWengang Wang2011-11-171-2/+1
| * | fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_freeJulia Lawall2011-11-171-1/+1
| * | Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 in...Joel Becker2011-08-21389-10005/+9983
| |\ \
| | * | ocfs2: Implement llseek()Sunil Mushran2011-07-253-2/+151
| | * | ocfs2: Fix ocfs2_page_mkwrite()Wengang Wang2011-07-242-37/+67
| | * | ocfs2: Add comment about orphan scanningSunil Mushran2011-07-241-0/+14
| | * | ocfs2: Clean up messages in the fsSunil Mushran2011-07-244-14/+22
| | * | ocfs2/cluster: Cluster up now includes network connections tooSunil Mushran2011-07-242-13/+61
| | * | ocfs2/cluster: Add new function o2net_fill_node_map()Sunil Mushran2011-07-243-33/+90
| | * | ocfs2/cluster: Fix output in file elapsed_time_in_msSunil Mushran2011-07-241-3/+6
| | * | ocfs2/dlm: dlmlock_remote() needs to account for remasterySunil Mushran2011-07-241-10/+8
| | * | ocfs2/dlm: Take inflight reference count for remotely mastered resources tooSunil Mushran2011-07-243-39/+32
| | * | ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery()Sunil Mushran2011-07-242-26/+24
| | * | ocfs2/dlm: Trace insert/remove of resource to/from hashSunil Mushran2011-07-243-11/+15
| | * | ocfs2/dlm: Clean up refmap helpersSunil Mushran2011-07-243-79/+66
| | * | ocfs2/dlm: Cleanup up dlm_finish_local_lockres_recovery()Sunil Mushran2011-07-241-32/+25
| | * | ocfs2: Clean up messages in stack_o2cb.cSunil Mushran2011-07-241-2/+2
| | * | ocfs2/dlm: Clean up messages in o2dlmSunil Mushran2011-07-245-70/+71
| | * | ocfs2/cluster: Clean up messages in o2netSunil Mushran2011-07-241-66/+53
| | * | ocfs2/cluster: Abort heartbeat start on hard-ro devicesSunil Mushran2011-07-241-69/+116
| * | | ocfs2: Avoid livelock in ocfs2_readpage()Jan Kara2011-07-281-0/+8
| * | | ocfs2: serialize unaligned aioMark Fasheh2011-07-285-2/+73
| * | | ocfs2: use proper little-endian bitopsAkinobu Mita2011-05-311-2/+2
| * | | ocfs2: null deref on allocation errorDan Carpenter2011-05-311-4/+4
| * | | ocfs2: checking the wrong variable in ocfs2_move_extent()Dan Carpenter2011-05-311-1/+1
| * | | ocfs2: Bugfix for hard readonly mountTiger Yang2011-05-312-7/+17
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-12-018-23/+58
|\ \ \ \
| * | | | Btrfs: fix meta data raid-repair merge problemJan Schmidt2011-12-011-7/+20
| * | | | Btrfs: skip allocation attempt from empty clusterAlexandre Oliva2011-11-301-3/+3
| * | | | Btrfs: skip block groups without enough space for a clusterAlexandre Oliva2011-11-301-1/+1
| * | | | Btrfs: start search for new cluster at the beginningAlexandre Oliva2011-11-301-4/+2
| * | | | Btrfs: reset cluster's max_size when creating bitmapAlexandre Oliva2011-11-301-0/+1
| * | | | Btrfs: initialize new bitmaps' listAlexandre Oliva2011-11-301-0/+1
| * | | | Btrfs: fix oops when calling statfs on readonly deviceLi Zefan2011-11-301-3/+3
| * | | | Btrfs: Don't error on resizing FS to same sizeMike Fleetwood2011-11-301-1/+1
| * | | | Btrfs: fix deadlock on metadata reservation when evicting a inodeMiao Xie2011-11-303-5/+22
| * | | | btrfs scrub: handle -ENOMEM from init_ipath()Dan Carpenter2011-11-301-0/+5
* | | | | Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4Linus Torvalds2011-11-291-1/+1
|\ \ \ \ \
| * | | | | ext4: fix racy use-after-free in ext4_end_io_dio()Tejun Heo2011-11-241-1/+1
View Lorry Controller Status