summaryrefslogtreecommitdiffstats
path: root/fs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2011-05-262-2/+2
|\
| * gfs2: Drop __TIME__ usageMichal Marek2011-05-261-1/+1
| * dlm: Drop __TIME__ usageMichal Marek2011-05-261-1/+1
* | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jl...Linus Torvalds2011-05-2619-246/+2135
|\ \
| * \ Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into oc...Joel Becker2011-05-2647-1047/+3158
| |\ \
| | * | Ocfs2/move_extents: Set several trivial constraints for threshold.Tristan Ye2011-05-251-7/+17
| | * | Ocfs2/move_extents: Let defrag handle partial extent moving.Tristan Ye2011-05-251-20/+26
| | * | Ocfs2/move_extents: move/defrag extents within a certain range.Tristan Ye2011-05-253-0/+315
| | * | Ocfs2/move_extents: helper to calculate the defraging length in one run.Tristan Ye2011-05-251-0/+30
| | * | Ocfs2/move_extents: move entire/partial extent.Tristan Ye2011-05-251-0/+165
| | * | Ocfs2/move_extents: helpers to update the group descriptor and global bitmap ...Tristan Ye2011-05-251-0/+77
| | * | Ocfs2/move_extents: helper to probe a proper region to move in an alloc group.Tristan Ye2011-05-251-0/+39
| | * | Ocfs2/move_extents: helper to validate and adjust moving goal.Tristan Ye2011-05-251-0/+61
| | * | Ocfs2/move_extents: find the victim alloc group, where the given #blk fits.Tristan Ye2011-05-251-0/+104
| | * | Ocfs2/move_extents: defrag a range of extent.Tristan Ye2011-05-251-0/+136
| | * | Ocfs2/move_extents: move a range of extent.Tristan Ye2011-05-251-0/+100
| | * | Ocfs2/move_extents: lock allocators and reserve metadata blocks and data clus...Tristan Ye2011-05-251-0/+61
| | * | Ocfs2/move_extents: Add basic framework and source files for extent moving.Tristan Ye2011-05-253-0/+77
| | * | Ocfs2/move_extents: Adding new ioctl code 'OCFS2_IOC_MOVE_EXT' to ocfs2.Tristan Ye2011-05-251-0/+34
| | * | Ocfs2/refcounttree: Publicize couple of funcs from refcounttree.cTristan Ye2011-05-252-29/+40
| | * | Ocfs2: Add a new code 'OCFS2_INFO_FREEFRAG' for o2info ioctl.Tristan Ye2011-05-252-0/+313
| | * | Ocfs2: Add a new code 'OCFS2_INFO_FREEINODE' for o2info ioctl.Tristan Ye2011-05-252-0/+139
| | * | Ocfs2: Using inline funcs to set/clear *FILLED* flags in info handler.Tristan Ye2011-05-251-28/+19
| * | | Ocfs2: Teach local-mounted ocfs2 to handle unwritten_extents correctly.Tristan Ye2011-05-261-0/+1
| * | | ocfs2/dlm: Do not migrate resource to a node that is leaving the domainSunil Mushran2011-05-262-95/+57
| * | | ocfs2/dlm: Add new dlm message DLM_BEGIN_EXIT_DOMAIN_MSGSunil Mushran2011-05-264-11/+82
| * | | ocfs2: change incorrect 'extern' keyword to 'static' in dlmfsRobin Dong2011-05-241-1/+1
| * | | ocfs2/dlm: dlm_is_lockres_migrateable() returns booleanSunil Mushran2011-05-242-84/+63
| * | | ocfs2: Add trace event for trim.Tao Ma2011-05-242-0/+32
| * | | ocfs2: Add FITRIM ioctl.Tao Ma2011-05-241-0/+24
| * | | ocfs2: Add ocfs2_trim_fs for SSD trim support.Tao Ma2011-05-242-0/+160
| * | | ocfs2: remove the /sys/o2cb symlinkAmerigo Wang2011-05-241-9/+0
| * | | ocfs2: clean up mount option about atime in ocfs2.txtTiger Yang2011-05-241-1/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm...Linus Torvalds2011-05-268-0/+32
|\ \ \ \
| * | | | ocfs2: add cleancache supportDan Magenheimer2011-05-261-0/+2
| * | | | ext4: add cleancache supportDan Magenheimer2011-05-261-0/+2
| * | | | btrfs: add cleancache supportDan Magenheimer2011-05-262-0/+11
| * | | | ext3: add cleancache supportDan Magenheimer2011-05-261-0/+2
| * | | | mm/fs: add hooks to support cleancacheDan Magenheimer2011-05-263-0/+15
* | | | | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds2011-05-2614-318/+360
|\ \ \ \ \
| * | | | | xfs: correctly decrement the extent buffer index in xfs_bmap_del_extentChristoph Hellwig2011-05-251-0/+2
| * | | | | xfs: check for valid indices in xfs_iext_get_ext and xfs_iext_idx_to_irecChristoph Hellwig2011-05-251-2/+6
| * | | | | xfs: fix up asserts in xfs_iflush_forkChristoph Hellwig2011-05-251-4/+1
| * | | | | xfs: do not do pointer arithmetic on extent recordsChristoph Hellwig2011-05-251-3/+6
| * | | | | xfs: do not use unchecked extent indices in xfs_bunmapiChristoph Hellwig2011-05-251-8/+8
| * | | | | xfs: do not use unchecked extent indices in xfs_bmapiChristoph Hellwig2011-05-251-4/+5
| * | | | | xfs: do not use unchecked extent indices in xfs_bmap_add_extent_*Christoph Hellwig2011-05-251-8/+6
| * | | | | xfs: remove if_lastexChristoph Hellwig2011-05-253-223/+203
| * | | | | xfs: remove the unused XFS_BMAPI_RSVBLOCKS flagChristoph Hellwig2011-05-252-63/+33
| * | | | | xfs: do not discard alloc btree blocksChristoph Hellwig2011-05-244-5/+10