aboutsummaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri...Linus Torvalds2010-04-056-7/+41
|\
| * 9p: return on mutex_lock_interruptible()Dan Carpenter2010-04-051-0/+2
| * 9p: Creating files with names too long should fail with ENAMETOOLONG.Sripathi Kodi2010-04-051-0/+3
| * 9p: Make sure we are able to clunk the cached fid on umountAneesh Kumar K.V2010-04-053-1/+16
| * 9p: drop nlink removeAneesh Kumar K.V2010-04-051-1/+5
| * fs/9p: Clunk the fid resulting from partial walk of the nameAneesh Kumar K.V2010-04-051-2/+10
| * 9p: Fix setting of protocol flags in v9fs_session_info structure.Sripathi Kodi2010-04-051-3/+5
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds2010-04-0512-204/+90
|\ \
| * | Btrfs: add check for changed leaves in setup_leaf_for_splitChris Mason2010-04-051-0/+4
| * | Btrfs: create snapshot references in same commit as snapshotSage Weil2010-04-051-66/+31
| * | Btrfs: fix small race with delalloc flushing waitqueue'sJosef Bacik2010-04-051-5/+4
| * | Btrfs: use add_to_page_cache_lru, use __page_cache_allocNick Piggin2010-04-052-32/+5
| * | Btrfs: fix chunk allocate size calculationJosef Bacik2010-03-301-1/+3
| * | Btrfs: kill max_extent mount optionJosef Bacik2010-03-306-81/+13
| * | Btrfs: fail to mount if we have problems reading the block groupsJosef Bacik2010-03-302-4/+12
| * | Btrfs: check btrfs_get_extent return for IS_ERR()Dan Carpenter2010-03-301-1/+1
| * | Btrfs: handle kmalloc() failure in inode lookup ioctlDan Carpenter2010-03-301-0/+3
| * | Btrfs: dereferencing freed memoryDan Carpenter2010-03-301-0/+1
| * | Btrfs: Simplify num_stripes's calculation logical for __btrfs_alloc_chunk()Zhao Lei2010-03-301-2/+2
| * | Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree()Zhao Lei2010-03-301-0/+2
| * | Btrfs: Remove unnecessary finish_wait() in wait_current_trans()Zhao Lei2010-03-301-10/+5
| * | Btrfs: add NULL check for do_walk_down()Miao Xie2010-03-301-1/+4
| * | Btrfs: remove duplicate include in ioctl.cAndrea Gelmini2010-03-301-1/+0
* | | Merge branch 'master' into export-slabhTejun Heo2010-04-0511-96/+115
|\ \ \ | | |/ | |/|
| * | proc: pagemap: Hold mmap_sem during page walkKAMEZAWA Hiroyuki2010-04-041-49/+38
| * | Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2010-04-021-6/+4
| |\ \
| | * | reiserfs: Fix locking BUG during mount failureJeff Mahoney2010-03-301-6/+4
| * | | oom: fix the unsafe usage of badness() in proc_oom_score()Oleg Nesterov2010-04-011-2/+3
| * | | fat: fix buffer overflow in vfat_create_shortname()Nikolaus Schulz2010-03-311-3/+3
| |/ /
| * | 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
* | | | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-30353-72/+300
|/ / /
* | | 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