Linus Torvalds 2584e7986f 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/dlm: Wait on lockres instead of erroring cancel requests
  ocfs2: Add missing lock name
  ocfs2: Don't oops in ocfs2_kill_sb on a failed mount
  ocfs2: release the buffer head in ocfs2_do_truncate.
  ocfs2: Handle quota file corruption more gracefully

2009-08-24 14:41:28 -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/dlm: Wait on lockres instead of erroring cancel requests

2009-08-20 18:42:34 -07:00

acl.c

New helper - current_umask()

2009-03-31 23:00:26 -04:00

acl.h

ocfs2: add ocfs2_init_acl in mknod

2009-01-05 08:34:20 -08:00

alloc.c

ocfs2: release the buffer head in ocfs2_do_truncate.

2009-08-17 12:50:35 -07:00

alloc.h

ocfs2: Add a name indexed b-tree to directory inodes

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

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

ocfs2: convert to new aops

2007-10-16 09:42:58 -07:00

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

ocfs2: Use BH_JBDPrivateStart instead of BH_Unshadow

2009-01-05 08:40:24 -08:00

buffer_head_io.h

ocfs2: Validate metadata only when it's read from disk.

2009-01-05 08:36:53 -08:00

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

ocfs2: Introduce dir free space list

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

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

exportfs: make struct export_operations const

2007-10-22 08:13:21 -07:00

extent_map.c

ocfs2: Wrap virtual block reads in ocfs2_read_virt_blocks()

2009-01-05 08:36:54 -08:00

extent_map.h

ocfs2: Wrap virtual block reads in ocfs2_read_virt_blocks()

2009-01-05 08:36:54 -08:00

file.c

ocfs2: Initialize count in aio_write before generic_write_checks

2009-07-20 15:47:58 -07:00

file.h

ocfs2: Implementation of local and global quota file handling

2009-01-05 08:40:23 -08:00

heartbeat.c

ocfs2: Move o2hb functionality into the stack glue.

2008-04-18 08:56:04 -07:00

heartbeat.h

ocfs2: Move o2hb functionality into the stack glue.

2008-04-18 08:56:04 -07:00

inode.c

ocfs2: Add lockdep annotations

2009-06-22 14:34:26 -07:00

inode.h

ocfs2: fix rare stale inode errors when exporting via nfs

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

ioctl.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

ioctl.h

ocfs2: Convert ocfs2 over to unlocked_ioctl

2008-04-18 08:56:11 -07:00

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

fs/Kconfig: move ocfs2 out

2009-01-22 13:15:54 +03:00

localalloc.c

ocfs2: Remove debugfs file local_alloc_stats

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

localalloc.h

ocfs2: throttle back local alloc when low on disk space

2008-10-13 13:57:57 -07:00

locks.c

ocfs2: POSIX file locks support

2008-10-13 13:57:57 -07:00

locks.h

ocfs2: POSIX file locks support

2008-10-13 13:57:57 -07:00

Makefile

ocfs2: Add the underlying blockcheck code.

2009-01-05 08:40:31 -08:00

mmap.c

mm: page_mkwrite change prototype to match fault

2009-04-01 08:59:14 -07:00

mmap.h

…

namei.c

ocfs2: Add lockdep annotations

2009-06-22 14:34:26 -07:00

namei.h

…

ocfs1_fs_compat.h

fs/: Spelling fixes

2008-02-03 17:33:42 +02:00

ocfs2_fs.h

ocfs2: Enable indexed directories

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

ocfs2_lockid.h

ocfs2: Add missing lock name

2009-08-20 16:41:53 -07:00

ocfs2_lockingver.h

ocfs2: Negotiate locking protocol versions.

2008-02-06 16:11:29 -08:00

ocfs2.h

ocfs2: Fix deadlock on umount

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

quota_global.c

ocfs2: Handle quota file corruption more gracefully

2009-08-17 12:50:12 -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

ocfs2: Use metadata-specific ocfs2_journal_access_*() functions.

2009-01-05 08:40:32 -08:00

resize.h

[PATCH 2/2] ocfs2: Implement group add for online resize

2008-01-25 15:04:24 -08:00

slot_map.c

ocfs2: Validate metadata only when it's read from disk.

2009-01-05 08:36:53 -08:00

slot_map.h

ocfs2: De-magic the in-memory slot map.

2008-04-18 08:56:03 -07:00

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

ocfs2: fix rare stale inode errors when exporting via nfs

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

super.c

ocfs2: Don't oops in ocfs2_kill_sb on a failed mount

2009-08-17 14:32: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

ocfs2: use smaller counters in ocfs2_remove_xattr_clusters_from_cache

2008-10-13 17:02:44 -07:00

uptodate.h

ocfs2: Add helper function in uptodate.c for removing xattr clusters

2008-10-13 13:57:59 -07:00

ver.c

ocfs2: bump version number

2008-01-25 15:05:46 -08:00

ver.h

…

xattr.c

ocfs2: Fix compilation warning for fs/ocfs2/xattr.c

2009-07-20 15:52:57 -07:00

xattr.h

ocfs2: Add a name indexed b-tree to directory inodes

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