Linus Torvalds bc7af9ba15 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (22 commits) ocfs2: Fix possible deadlock when extending quota file ocfs2: keep index within status_map[] ocfs2: Initialize the cluster we're writing to in a non-sparse extend ocfs2: Remove redundant BUG_ON in __dlm_queue_ast() ocfs2/quota: Release lock for error in ocfs2_quota_write. ocfs2: Define credit counts for quota operations ocfs2: Remove syncjiff field from quota info ocfs2: Fix initialization of blockcheck stats ocfs2: Zero out padding of on disk dquot structure ocfs2: Initialize blocks allocated to local quota file ocfs2: Mark buffer uptodate before calling ocfs2_journal_access_dq() ocfs2: Make global quota files blocksize aligned ocfs2: Use ocfs2_rec_clusters in ocfs2_adjust_adjacent_records. ocfs2: Fix deadlock on umount ocfs2: Add extra credits and access the modified bh in update_edge_lengths. ocfs2: Fail ocfs2_get_block() immediately when a block needs allocation ocfs2: Fix error return in ocfs2_write_cluster() ocfs2: Fix compilation warning for fs/ocfs2/xattr.c ocfs2: Initialize count in aio_write before generic_write_checks ocfs2: log the actual return value of ocfs2_file_aio_write() ...		2009-08-13 11:17:40 -07:00
..
cluster	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-06-16 12:11:57 -07:00
dlm	ocfs2: Remove redundant BUG_ON in __dlm_queue_ast()	2009-07-31 13:43:44 -07:00
acl.c
acl.h
alloc.c	ocfs2: Use ocfs2_rec_clusters in ocfs2_adjust_adjacent_records.	2009-07-23 10:58:46 -07:00
alloc.h
aops.c	ocfs2: Initialize the cluster we're writing to in a non-sparse extend	2009-08-07 13:16:23 -07:00
aops.h
blockcheck.c	ocfs2: Add statistics for the checksum and ecc operations.	2009-06-03 19:15:36 -07:00
blockcheck.h	ocfs2: Add statistics for the checksum and ecc operations.	2009-06-03 19:15:36 -07:00
buffer_head_io.c
buffer_head_io.h
dcache.c	ocfs2: Fix deadlock on umount	2009-07-21 15:47:55 -07:00
dcache.h	ocfs2: Fix deadlock on umount	2009-07-21 15:47:55 -07:00
dir.c	ocfs2: Correct ordering of ip_alloc_sem and localloc locks for directories	2009-06-03 19:14:30 -07:00
dir.h
dlmglue.c	ocfs2: Add lockdep annotations	2009-06-22 14:34:26 -07:00
dlmglue.h	ocfs2: Add lockdep annotations	2009-06-22 14:34:26 -07:00
export.c	ocfs2: Fix some printk() warnings.	2009-04-21 16:31:20 -07:00
export.h
extent_map.c
extent_map.h
file.c	ocfs2: Initialize count in aio_write before generic_write_checks	2009-07-20 15:47:58 -07:00
file.h
heartbeat.c
heartbeat.h
inode.c	ocfs2: Add lockdep annotations	2009-06-22 14:34:26 -07:00
inode.h
ioctl.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
ioctl.h
journal.c	ocfs2: Fixup orphan scan cleanup after failed mount	2009-07-08 15:34:02 -07:00
journal.h	ocfs2: Fix possible deadlock when extending quota file	2009-08-10 12:20:22 -07:00
Kconfig
localalloc.c
localalloc.h
locks.c
locks.h
Makefile
mmap.c
mmap.h
namei.c	ocfs2: Add lockdep annotations	2009-06-22 14:34:26 -07:00
namei.h
ocfs1_fs_compat.h
ocfs2_fs.h
ocfs2_lockid.h	ocfs2: timer to queue scan of all orphan slots	2009-06-03 19:14:31 -07:00
ocfs2_lockingver.h
ocfs2.h	ocfs2: Fix deadlock on umount	2009-07-21 15:47:55 -07:00
quota_global.c	ocfs2: Fix possible deadlock when extending quota file	2009-08-10 12:20:22 -07:00
quota_local.c	ocfs2: Define credit counts for quota operations	2009-07-23 10:59:31 -07:00
quota.h	ocfs2: Remove syncjiff field from quota info	2009-07-23 10:59:27 -07:00
resize.c
resize.h
slot_map.c
slot_map.h
stack_o2cb.c	ocfs2: keep index within status_map[]	2009-08-07 13:16:50 -07:00
stack_user.c	ocfs2: Provide the ocfs2_dlm_lvb_valid() stack API.	2009-06-22 14:24:30 -07:00
stackglue.c	ocfs2: Provide the ocfs2_dlm_lvb_valid() stack API.	2009-06-22 14:24:30 -07:00
stackglue.h	ocfs2: Provide the ocfs2_dlm_lvb_valid() stack API.	2009-06-22 14:24:30 -07:00
suballoc.c	ocfs2: Pin journal head before accessing jh->b_committed_data	2009-06-22 14:24:47 -07:00
suballoc.h
super.c	ocfs2: Fix initialization of blockcheck stats	2009-07-23 10:59:24 -07:00
super.h
symlink.c	ocfs2: Use nd_set_link().	2009-05-09 10:49:40 -04:00
symlink.h
sysfile.c	ocfs2/trivial: Wrap ocfs2_sysfile_cluster_lock_key within define.	2009-06-22 14:34:29 -07:00
sysfile.h
uptodate.c
uptodate.h
ver.c
ver.h
xattr.c	ocfs2: Fix compilation warning for fs/ocfs2/xattr.c	2009-07-20 15:52:57 -07:00
xattr.h