summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' into for-2.6.35Jens Axboe2010-04-022-62/+75
|\
| * Merge branch 'master' into for-linusJens Axboe2010-03-1972-1991/+364
| |\
| * | vfs: improve writeback_inodes_wb()Edward Shishkin2010-03-121-60/+73
| * | blkdev: fix merge_bvec_fn return value checks v2Dmitry Monakhov2010-03-081-2/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfsLinus Torvalds2010-03-307-36/+67
|\ \ \
| * | | [LogFS] Erase new journal segmentsJoern Engel2010-03-291-0/+2
| * | | [LogFS] Move reserved segments with journalJoern Engel2010-03-291-0/+4
| * | | [LogFS] Clear PagePrivate when moving journalJoern Engel2010-03-283-1/+3
| * | | Simplify and fix pad_wbufJoern Engel2010-03-281-22/+30
| * | | Prevent data corruption in logfs_rewrite_block()Joern Engel2010-03-281-1/+12
| * | | Use deactivate_locked_superJoern Engel2010-03-271-2/+1
| * | | Fix logfs_get_sb_final error pathJoern Engel2010-03-271-1/+1
| * | | Write out both superblocks on mismatchJoern Engel2010-03-271-1/+1
| * | | Prevent schedule while atomic in __logfs_readdirJoern Engel2010-03-271-2/+2
| * | | Plug memory leak in writeseg_end_ioJoern Engel2010-03-271-0/+1
| * | | Limit max_pages for insane devicesJoern Engel2010-03-271-2/+6
| * | | Open segment file before using itJoern Engel2010-03-271-4/+4
* | | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-03-2911-74/+223
|\ \ \ \
| * | | | ocfs2: Fix a race in o2dlm lockres masterySrinivas Eeda2010-03-231-3/+1
| * | | | Ocfs2: Handle deletion of reflinked oprhan inodes correctly.Tristan Ye2010-03-231-0/+15
| * | | | Ocfs2: Journaling i_flags and i_orphaned_slot when adding inode to orphan dir.Tristan Ye2010-03-231-5/+23
| * | | | ocfs2: Clear undo bits when local alloc is freedMark Fasheh2010-03-234-46/+95
| * | | | ocfs2: Init meta_ac properly in ocfs2_create_empty_xattr_block.Tao Ma2010-03-191-6/+4
| * | | | ocfs2: Fix the update of name_offset when removing xattrsTao Ma2010-03-191-1/+1
| * | | | ocfs2: Always try for maximum bits with new local alloc windowsMark Fasheh2010-03-181-2/+2
| * | | | ocfs2: set i_mode on disk during acl operationsMark Fasheh2010-03-171-5/+72
| * | | | ocfs2: Update i_blocks in reflink operations.Tao Ma2010-03-171-0/+1
| * | | | ocfs2: Change bg_chain check for ocfs2_validate_gd_parent.Tao Ma2010-03-171-5/+8
| * | | | [PATCH] Skip check for mandatory locks when unlockingSachin Prabhu2010-03-171-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2010-03-2912-91/+182
|\ \ \ \
| * | | | ceph: fix use after free on mds __unregister_requestSage Weil2010-03-281-1/+2
| * | | | ceph: fix possible double-free of mds request referenceSage Weil2010-03-231-1/+3
| * | | | ceph: fix session check on mds replySage Weil2010-03-231-1/+1
| * | | | ceph: handle kmalloc() failureDan Carpenter2010-03-231-0/+2
| * | | | ceph: propagate mds session allocation failures to callerSage Weil2010-03-231-1/+6
| * | | | ceph: make write_begin wait propagate ERESTARTSYSSage Weil2010-03-231-2/+8
| * | | | ceph: fix snap rebuild conditionSage Weil2010-03-231-2/+2
| * | | | ceph: avoid reopening osd connections when address hasn't changedSage Weil2010-03-233-1/+23
| * | | | ceph: rename r_sent_stamp r_stampSage Weil2010-03-232-7/+7
| * | | | ceph: fix connection fault con_work reentrancy problemSage Weil2010-03-231-2/+0
| * | | | ceph: prevent dup stale messages to console for restarting mdsSage Weil2010-03-231-1/+1
| * | | | ceph: fix pg pool decoding from incremental osdmap updateSage Weil2010-03-231-7/+10
| * | | | ceph: fix mds sync() race with completing requestsSage Weil2010-03-231-7/+20
| * | | | ceph: only release unused caps with mds requestsSage Weil2010-03-231-3/+10
| * | | | ceph: clean up handle_cap_grant, handle_caps wrt session mutexSage Weil2010-03-231-32/+25
| * | | | ceph: fix session locking in handle_caps, ceph_check_capsSage Weil2010-03-231-5/+9
| * | | | ceph: drop unnecessary WARN_ON in caps migrationSage Weil2010-03-231-2/+1
| * | | | ceph: fix null pointer deref of r_osd in debug outputSage Weil2010-03-231-1/+1
| * | | | ceph: clean up service ticket decodingSage Weil2010-03-231-8/+20
| * | | | ceph: release old ticket_blob bufferSage Weil2010-03-201-1/+5
OpenPOWER on IntegriCloud