Linus Torvalds 45e62974fb 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:
  ocfs2/trivial: Use le16_to_cpu for a disk value in xattr.c
  ocfs2/trivial: Use proper mask for 2 places in hearbeat.c
  Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink.
  Ocfs2: Should ocfs2 support fiemap for S_IFDIR inode?
  ocfs2: Use FIEMAP_EXTENT_SHARED
  fiemap: Add new extent flag FIEMAP_EXTENT_SHARED
  ocfs2: replace u8 by __u8 in ocfs2_fs.h
  ocfs2: explicit declare uninitialized var in user_cluster_connect()
  ocfs2-devel: remove redundant OCFS2_MOUNT_POSIX_ACL check in ocfs2_get_acl_nolock()
  ocfs2: return -EAGAIN instead of EAGAIN in dlm
  ocfs2/cluster: Make fence method configurable - v2
  ocfs2: Set MS_POSIXACL on remount
  ocfs2: Make acl use the default
  ocfs2: Always include ACL support

2009-12-24 12:59:11 -08:00

..

cluster

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-12-24 12:59:11 -08:00

dlm

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-12-24 12:59:11 -08:00

acl.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-12-24 12:59:11 -08:00

acl.h

ocfs2: Always include ACL support

2009-10-28 23:05:57 -07:00

alloc.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-12-23 13:33:07 -08:00

alloc.h

ocfs2: Find proper end cpos for a leaf refcount block.

2009-12-02 16:14:57 -08:00

aops.c

cleanup blockdev_direct_IO locking

2009-12-16 12:16:49 -05:00

aops.h

ocfs2: Add CoW support.

2009-09-22 20:09:36 -07:00

blockcheck.c

tree-wide: fix typos "offest" -> "offset"

2009-12-04 15:39:50 +01:00

blockcheck.h

ocfs2: Add statistics for the checksum and ecc operations.

2009-06-03 19:15:36 -07:00

buffer_head_io.c

ocfs2: Take the inode out of the metadata read/write paths.

2009-09-04 16:07:48 -07:00

buffer_head_io.h

ocfs2: Take the inode out of the metadata read/write paths.

2009-09-04 16:07:48 -07:00

dcache.c

ocfs2: invalidate dentry if its dentry_lock isn't initialized.

2009-08-27 18:10:54 -07:00

dcache.h

ocfs2: Fix deadlock on umount

2009-07-21 15:47:55 -07:00

dir.c

ocfs2: Pass ocfs2_caching_info into ocfs_init_*_extent_tree().

2009-09-04 16:08:13 -07:00

dir.h

ocfs2: Introduce dir free space list

2009-04-03 11:39:16 -07:00

dlmglue.c

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

dlmglue.h

ocfs2: Add new refcount tree lock resource in dlmglue.

2009-09-22 20:09:28 -07:00

export.c

ocfs2: Fix some printk() warnings.

2009-04-21 16:31:20 -07:00

export.h

…

extent_map.c

Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink.

2009-12-23 17:52:09 -08:00

extent_map.h

ocfs2: Return extent flags for xattr value tree.

2009-09-22 20:09:39 -07:00

file.c

vfs: Implement proper O_SYNC semantics

2009-12-10 15:02:50 +01:00

file.h

ocfs2: Integrate CoW in file write.

2009-09-22 20:09:37 -07:00

heartbeat.c

…

heartbeat.h

…

inode.c

ocfs2: Call refcount tree remove process properly.

2009-09-22 20:09:44 -07:00

inode.h

ocfs2: Drop struct inode from ocfs2_extent_tree_operations.

2009-09-04 16:07:57 -07:00

ioctl.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-09-23 09:29:20 -07:00

ioctl.h

…

journal.c

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

journal.h

ocfs2: Decrement refcount when truncating refcounted extents.

2009-09-22 20:09:35 -07:00

Kconfig

ocfs2: Always include ACL support

2009-10-28 23:05:57 -07:00

localalloc.c

ocfs2: Pass struct ocfs2_caching_info to the journal functions.

2009-09-04 16:07:50 -07:00

localalloc.h

…

locks.c

…

locks.h

…

Makefile

ocfs2: Always include ACL support

2009-10-28 23:05:57 -07:00

mmap.c

const: mark struct vm_struct_operations

2009-09-27 11:39:25 -07:00

mmap.h

…

namei.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-12-24 12:59:11 -08:00

namei.h

ocfs2: Create reflinked file in orphan dir.

2009-09-22 20:09:48 -07:00

ocfs1_fs_compat.h

…

ocfs2_fs.h

ocfs2: replace u8 by __u8 in ocfs2_fs.h

2009-12-17 20:55:54 -08:00

ocfs2_lockid.h

ocfs2: Add new refcount tree lock resource in dlmglue.

2009-09-22 20:09:28 -07:00

ocfs2_lockingver.h

…

ocfs2.h

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-12-24 12:59:11 -08:00

quota_global.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-09-23 09:29:20 -07:00

quota_local.c

const: struct quota_format_ops

2009-12-10 15:02:51 +01:00

quota.h

quota: Move definition of QFMT_OCFS2 to linux/quota.h

2009-12-10 15:02:53 +01:00

refcounttree.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-12-23 13:33:07 -08:00

refcounttree.h

ocfs2: Add ioctl for reflink.

2009-09-22 20:09:51 -07:00

resize.c

ocfs2: Pass struct ocfs2_caching_info to the journal functions.

2009-09-04 16:07:50 -07:00

resize.h

…

slot_map.c

ocfs2: Take the inode out of the metadata read/write paths.

2009-09-04 16:07:48 -07:00

slot_map.h

…

stack_o2cb.c

ocfs2: keep index within status_map[]

2009-08-07 13:16:50 -07:00

stack_user.c

ocfs2: explicit declare uninitialized var in user_cluster_connect()

2009-12-17 20:55:52 -08:00

stackglue.c

sysctl: Drop & in front of every proc_handler.

2009-11-18 08:37:40 -08:00

stackglue.h

ocfs2: Provide the ocfs2_dlm_lvb_valid() stack API.

2009-06-22 14:24:30 -07:00

suballoc.c

ocfs2: Pass ocfs2_caching_info to ocfs2_read_extent_block().

2009-09-04 16:07:52 -07:00

suballoc.h

ocfs2: fix rare stale inode errors when exporting via nfs

2009-04-03 11:39:25 -07:00

super.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-12-24 12:59:11 -08:00

super.h

…

symlink.c

Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink.

2009-12-23 17:52:09 -08: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

ocfs2: Trivial cleanup of jbd compatibility layer removal

2009-11-13 15:45:05 -08:00

uptodate.h

ocfs2: Pass struct ocfs2_caching_info to the journal functions.

2009-09-04 16:07:50 -07:00

ver.c

…

ver.h

…

xattr.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2009-12-24 12:59:11 -08:00

xattr.h

ocfs2: Always include ACL support

2009-10-28 23:05:57 -07:00