1
0
Fork 0
alistair23-linux/fs/ocfs2
Linus Torvalds 275220f0fc Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block: (43 commits)
  block: ensure that completion error gets properly traced
  blktrace: add missing probe argument to block_bio_complete
  block cfq: don't use atomic_t for cfq_group
  block cfq: don't use atomic_t for cfq_queue
  block: trace event block fix unassigned field
  block: add internal hd part table references
  block: fix accounting bug on cross partition merges
  kref: add kref_test_and_get
  bio-integrity: mark kintegrityd_wq highpri and CPU intensive
  block: make kblockd_workqueue smarter
  Revert "sd: implement sd_check_events()"
  block: Clean up exit_io_context() source code.
  Fix compile warnings due to missing removal of a 'ret' variable
  fs/block: type signature of major_to_index(int) to major_to_index(unsigned)
  block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p)
  cfq-iosched: don't check cfqg in choose_service_tree()
  fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors
  cdrom: export cdrom_check_events()
  sd: implement sd_check_events()
  sr: implement sr_check_events()
  ...
2011-01-13 10:45:01 -08:00
..
cluster Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block 2011-01-13 10:45:01 -08:00
dlm Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 2011-01-11 11:28:34 -08:00
dlmfs fs: icache RCU free inodes 2011-01-07 17:50:26 +11:00
Kconfig ocfs2: Add DEBUG_FS dependency 2010-12-22 18:34:48 -08:00
Makefile
acl.c fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
acl.h fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
alloc.c ocfs2: Remove unused truncate function from alloc.c 2011-01-07 18:03:00 -08:00
alloc.h ocfs2: Remove unused truncate function from alloc.c 2011-01-07 18:03:00 -08:00
aops.c Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 2011-01-11 11:28:34 -08:00
aops.h Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem. 2010-12-09 15:36:48 -08:00
blockcheck.c
blockcheck.h
buffer_head_io.c
buffer_head_io.h
dcache.c fs: dcache per-inode inode alias locking 2011-01-07 17:50:31 +11:00
dcache.h
dir.c ocfs2: Hold ip_lock when set/clear flags for indexed dir. 2010-12-16 00:36:15 -08:00
dir.h
dlmglue.c
dlmglue.h
export.c switch ocfs2, close races 2011-01-12 20:02:46 -05:00
export.h
extent_map.c
extent_map.h
file.c Ocfs2: handle hole punching via fallocate properly 2011-01-12 20:16:43 -05:00
file.h fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
heartbeat.c
heartbeat.h
inode.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
inode.h
ioctl.c
ioctl.h
journal.c
journal.h
localalloc.c
localalloc.h
locks.c
locks.h
mmap.c
mmap.h
namei.c switch ocfs2, close races 2011-01-12 20:02:46 -05:00
namei.h
ocfs1_fs_compat.h
ocfs2.h ocfs2: Try to free truncate log when meeting ENOSPC in write. 2010-12-16 00:46:02 -08:00
ocfs2_fs.h ocfs2: Fix system inodes cache overflow. 2010-12-22 02:35:36 -08:00
ocfs2_ioctl.h
ocfs2_lockid.h
ocfs2_lockingver.h
quota.h
quota_global.c
quota_local.c
refcounttree.c
refcounttree.h
reservations.c
reservations.h
resize.c
resize.h
slot_map.c
slot_map.h
stack_o2cb.c
stack_user.c ocfs2_connection_find() returns pointer to bad structure 2010-11-18 15:41:41 -08:00
stackglue.c
stackglue.h
suballoc.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
suballoc.h
super.c switch ocfs2, close races 2011-01-12 20:02:46 -05:00
super.h
symlink.c
symlink.h
sysfile.c
sysfile.h
uptodate.c
uptodate.h
ver.c
ver.h
xattr.c
xattr.h