1
0
Fork 0
alistair23-linux/fs/omfs
Linus Torvalds 6c51038900 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
  Documentation/iostats.txt: bit-size reference etc.
  cfq-iosched: removing unnecessary think time checking
  cfq-iosched: Don't clear queue stats when preempt.
  blk-throttle: Reset group slice when limits are changed
  blk-cgroup: Only give unaccounted_time under debug
  cfq-iosched: Don't set active queue in preempt
  block: fix non-atomic access to genhd inflight structures
  block: attempt to merge with existing requests on plug flush
  block: NULL dereference on error path in __blkdev_get()
  cfq-iosched: Don't update group weights when on service tree
  fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
  block: Require subsystems to explicitly allocate bio_set integrity mempool
  jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  fs: make fsync_buffers_list() plug
  mm: make generic_writepages() use plugging
  blk-cgroup: Add unaccounted time to timeslice_used.
  block: fixup plugging stubs for !CONFIG_BLOCK
  block: remove obsolete comments for blkdev_issue_zeroout.
  blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
  ...

Fix up conflicts in fs/{aio.c,super.c}
2011-03-24 10:16:26 -07:00
..
Kconfig fs/Kconfig: move omfs out 2009-01-22 13:15:58 +03:00
Makefile omfs: update kbuild to include OMFS 2008-07-26 12:00:05 -07:00
bitmap.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
dir.c omfs: make readdir stop when filldir says so 2011-03-05 16:24:12 -05:00
file.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
inode.c new helper: mount_bdev() 2010-10-29 04:16:13 -04:00
omfs.h omfs: check bounds on block numbers before passing to sb_bread 2010-07-10 14:37:06 -04:00
omfs_fs.h omfs: sanity check cluster size 2010-07-10 14:38:11 -04:00