Linus Torvalds 1ca7318cac 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: Change some lock status member in ocfs2_lock_res to char.

2010-11-14 13:04:53 -08:00

..

cluster

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-10-24 13:41:39 -07:00

dlm

Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window

2010-10-15 13:03:09 -07:00

dlmfs

convert get_sb_nodev() users

2010-10-29 04:16:31 -04:00

acl.c

ocfs2: update ctime when changing the file's permission by setfacl

2010-09-23 14:16:21 -07:00

acl.h

…

alloc.c

ocfs2: Fix deadlock when allocating page

2010-09-08 14:25:57 +08:00

alloc.h

Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2-merge-window

2010-05-18 16:40:42 -07:00

aops.c

fs: kill block_prepare_write

2010-10-25 21:18:20 -04:00

aops.h

fs: kill block_prepare_write

2010-10-25 21:18:20 -04:00

blockcheck.c

ocfs2: Fix metaecc error messages

2010-09-08 14:25:53 +08:00

blockcheck.h

…

buffer_head_io.c

…

buffer_head_io.h

…

dcache.c

Track negative entries v3

2010-09-10 09:18:15 -07:00

dcache.h

Track negative entries v3

2010-09-10 09:18:15 -07:00

dir.c

Ocfs2: Re-access the journal after ocfs2_insert_extent() in dxdir codes.

2010-09-10 09:19:11 -07:00

dir.h

…

dlmglue.c

Track negative entries v3

2010-09-10 09:18:15 -07:00

dlmglue.h

ocfs2: Fix lockdep warning in reflink.

2010-09-10 09:19:06 -07:00

export.c

…

export.h

…

extent_map.c

…

extent_map.h

…

file.c

fs: kill block_prepare_write

2010-10-25 21:18:20 -04:00

file.h

ocfs2: Zero the tail cluster when extending past i_size.

2010-07-08 13:25:35 -07:00

heartbeat.c

…

heartbeat.h

…

inode.c

Track negative entries v3

2010-09-10 09:18:15 -07:00

inode.h

Track negative entries v3

2010-09-10 09:18:15 -07:00

ioctl.c

Ocfs2: Add new OCFS2_IOC_INFO ioctl for ocfs2 v8.

2010-09-10 08:35:41 -07:00

ioctl.h

…

journal.c

ocfs2: Remove obsolete comments before ocfs2_start_trans.

2010-09-10 08:40:18 -07:00

journal.h

Reorganize data elements to reduce struct sizes

2010-09-10 08:39:27 -07:00

Kconfig

…

localalloc.c

ocfs2: Limit default local alloc size within bitmap range.

2010-06-15 16:50:43 -07:00

localalloc.h

…

locks.c

…

locks.h

…

Makefile

…

mmap.c

Merge branch 'cow_readahead' of git://oss.oracle.com/git/tma/linux-2.6 into merge-2

2010-09-10 08:41:04 -07:00

mmap.h

…

namei.c

new helper: ihold()

2010-10-25 21:26:11 -04:00

namei.h

…

ocfs1_fs_compat.h

…

ocfs2_fs.h

Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window

2010-10-15 13:03:09 -07:00

ocfs2_ioctl.h

Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window

2010-10-15 13:03:09 -07:00

ocfs2_lockid.h

…

ocfs2_lockingver.h

…

ocfs2.h

ocfs2: Change some lock status member in ocfs2_lock_res to char.

2010-11-13 03:15:08 -08:00

quota_global.c

ocfs2: Zero the tail cluster when extending past i_size.

2010-07-08 13:25:35 -07:00

quota_local.c

ocfs2: Zero the tail cluster when extending past i_size.

2010-07-08 13:25:35 -07:00

quota.h

ocfs2: Fix NULL pointer deref when writing local dquot

2010-05-21 19:30:48 +02:00

refcounttree.c

Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window

2010-10-15 13:03:09 -07:00

refcounttree.h

Merge branch 'cow_readahead' of git://oss.oracle.com/git/tma/linux-2.6 into merge-2

2010-09-10 08:41:04 -07:00

reservations.c

ocfs2: Move 'wanted' into parens of ocfs2_resmap_resv_bits.

2010-09-23 14:16:47 -07:00

reservations.h

…

resize.c

…

resize.h

…

slot_map.c

When I tried to compile I got the following warning:

2010-10-11 13:45:52 -07:00

slot_map.h

…

stack_o2cb.c

ocfs2: Print message if user mounts without starting global heartbeat

2010-10-06 17:55:29 -07:00

stack_user.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

stackglue.c

…

stackglue.h

…

suballoc.c

Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window

2010-10-15 13:03:09 -07:00

suballoc.h

ocfs2: allow return of new inode block location before allocation of the inode

2010-09-08 14:25:59 +08:00

super.c

new helper: mount_bdev()

2010-10-29 04:16:13 -04:00

super.h

ocfs2: Wrap signal blocking in void functions.

2010-05-10 11:50:10 -07:00

symlink.c

ocfs2: Don't walk off the end of fast symlinks.

2010-09-29 17:33:05 -07:00

symlink.h

…

sysfile.c

ocfs2: Cache system inodes of other slots.

2010-09-10 08:56:24 -07:00

sysfile.h

…

uptodate.c

…

uptodate.h

…

ver.c

…

ver.h

…

xattr.c

ocfs2: Avoid to evaluate xattr block flags again.

2010-10-15 13:03:43 -07:00

xattr.h

ocfs: constify xattr_handler

2010-05-21 18:31:20 -04:00