Linus Torvalds b64ada6b23 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: (85 commits) ocfs2: Use buffer IO if we are appending a file. ocfs2: add spinlock protection when dealing with lockres->purge. dlmglue.c: add missed mlog lines ocfs2: __ocfs2_abort() should not enable panic for local mounts ocfs2: Add ioctl for reflink. ocfs2: Enable refcount tree support. ocfs2: Implement ocfs2_reflink. ocfs2: Add preserve to reflink. ocfs2: Create reflinked file in orphan dir. ocfs2: Use proper parameter for some inode operation. ocfs2: Make transaction extend more efficient. ocfs2: Don't merge in 1st refcount ops of reflink. ocfs2: Modify removing xattr process for refcount. ocfs2: Add reflink support for xattr. ocfs2: Create an xattr indexed block if needed. ocfs2: Call refcount tree remove process properly. ocfs2: Attach xattr clusters to refcount tree. ocfs2: Abstract ocfs2 xattr tree extend rec iteration process. ocfs2: Abstract the creation of xattr block. ocfs2: Remove inode from ocfs2_xattr_bucket_get_name_value. ...		2009-09-23 09:29:20 -07:00
..
dlmapi.h	ocfs2: Negotiate locking protocol versions.	2008-02-06 16:11:29 -08:00
dlmast.c	ocfs2: Remove redundant BUG_ON in __dlm_queue_ast()	2009-07-31 13:43:44 -07:00
dlmcommon.h	ocfs2/dlm: Remove struct dlm_lock_name in struct dlm_master_list_entry	2009-04-03 11:39:23 -07:00
dlmconvert.c	ocfs2: Use dlm_print_one_lock_resource for lock resource print	2008-03-10 15:13:50 -07:00
dlmconvert.h
dlmdebug.c	seq_file: constify seq_operations	2009-09-23 07:39:29 -07:00
dlmdebug.h	[PATCH 2/3] ocfs2/dlm: Silence build warnings	2008-05-30 15:15:10 -07:00
dlmdomain.c	ocfs2/dlm: Improve lockres counts	2009-04-03 11:39:21 -07:00
dlmdomain.h
dlmfs.c	writeback: add name to backing_dev_info	2009-09-11 09:20:26 +02:00
dlmfsver.c	ocfs2: bump version number	2008-01-25 15:05:46 -08:00
dlmfsver.h
dlmlock.c	ocfs2/dlm: Create slabcaches for lock and lockres	2008-04-18 08:56:08 -07:00
dlmmaster.c	ocfs2/dlm: Remove struct dlm_lock_name in struct dlm_master_list_entry	2009-04-03 11:39:23 -07:00
dlmrecovery.c	ocfs2: trivial fix for s/migrate/migration/ in dlmrecovery.c logging	2009-07-08 15:34:40 -07:00
dlmthread.c	ocfs2: add spinlock protection when dealing with lockres->purge.	2009-09-23 01:54:48 -07:00
dlmunlock.c	ocfs2/dlm: Wait on lockres instead of erroring cancel requests	2009-08-20 18:42:34 -07:00
dlmver.c	ocfs2: bump version number	2008-01-25 15:05:46 -08:00
dlmver.h
Makefile	ocfs2: Only build ocfs2/dlm with the o2cb stack module	2008-04-18 08:56:12 -07:00
userdlm.c	ocfs2: Negotiate locking protocol versions.	2008-02-06 16:11:29 -08:00
userdlm.h	ocfs2: comments typo fix	2008-12-01 14:46:31 -08:00