similar to: [PATCH 1/1] fixes a dangerous typo

fails ocfs2_get_block() immediately when hit -EIO Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> --- fs/ocfs2/aops.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index a10c989..9dfdf46 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -195,6 +195,7 @@ static int ocfs2_get_block(struct inode *inode, sector_t

>From c70adcaca99acf93bc00cf2edc4d549b83e2f95d Mon Sep 17 00:00:00 2001 From: Wengang Wang <wen.gang.wang at oracle.com> Date: Tue, 21 Jul 2009 10:52:52 +0800 Subject: [PATCH 1/1] ocfs2: adds mlogs to aops.c -V2 this patch adds some mlogs to apos.c helping tracing and narrowing down bugs. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> --- fs/ocfs2/aops.c | 242

this patch adds mlogs to apos to help tracing. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> --- fs/ocfs2/aops.c | 233 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 189 insertions(+), 44 deletions(-) diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index b2c52b3..b730010 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -90,7 +90,7 @@ static int

in ocfs2_file_aio_write(), log_exit() could don't log the value which is really returned. this patch fixes it. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> --- fs/ocfs2/file.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 62442e4..a49fa44 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1918,8

this patch adds some mlogs to apos.c helping tracing and narrowing down bugs. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> --- fs/ocfs2/aops.c | 242 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 198 insertions(+), 44 deletions(-) diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index b2c52b3..4527f16 100644 --- a/fs/ocfs2/aops.c +++

Linus, et al, Here are all the outstanding ocfs2 fixes for 2.6.31. The major fixes are for aio write and for non-sparse file extending. There are also a couple of b-tree fixes as well as some for quotas. Please pull. Joel The following changes since commit 44b572809581d5a10dbe35aa6bf689f32b9c5ad6: Yinghai Lu (1): x86: don't clear nodes_states[N_NORMAL_MEMORY] when numa is not

add error check for ocfs2_read_locked_inode() call. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> -- Index: inode.c =================================================================== --- inode.c (revision 149) +++ inode.c (working copy) @@ -118,6 +118,7 @@ struct inode *ocfs2_iget(struct ocfs2_su struct inode *inode = NULL; struct super_block *sb = osb->sb; struct

checks IO error in ocfs2_get_sector(). this patch is based on 1.4 git. Signed-off-by: Wengang wang <wen.gang.wang at oracle.com> -- Index: fs/ocfs2/super.c =================================================================== --- fs/ocfs2/super.c (revision 128) +++ fs/ocfs2/super.c (working copy) @@ -1203,6 +1203,12 @@ static int ocfs2_get_sector(struct super unlock_buffer(*bh);

nlink should be also checked in ocfs2_inode_revalidate(). before setting flag OCFS2_INODE_DELETED ip_flags (between unlink and delete vote), the nlink may be 0. the patch is against 1.4 git. 1.2 svn should has the same patch with different line number. Signed-off-by: Wengang wang <wen.gang.wang at oracle.com> -- diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 591e693..6b5a83e

checks IO error in ocfs2_get_sector(). this patch is based on Linus' git. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> -- diff -up ./fs/ocfs2/super.c.orig ./fs/ocfs2/super.c --- ./fs/ocfs2/super.c.orig 2009-02-12 18:05:19.023685000 -0800 +++ ./fs/ocfs2/super.c 2009-02-12 18:07:13.995623000 -0800 @@ -1537,6 +1537,13 @@ static int ocfs2_get_sector(struct super

ocfs2_getattr() uses generic_fillattr() to set inode number(and other attributes). generic_fillattr() inturn fills inode number with inode->i_ino which is a 32-bit(unsigned long) value. if the ocfs2 partition is huge enough, that may become an incorrect value. the fix is filling it again after generic_fillattr() with ip_blkno(u64). Signed-off-by: Wengang Wang <wen.gang.wang at

We should check dlm->dlm_state under dlm->spinlock though maybe in this case it doesn't hurt. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> --- fs/ocfs2/dlm/dlmdomain.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 6b5a492..ab82add 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++

The lock type string for NFS Sync lock is missing from the last patch http://oss.oracle.com/pipermail/ocfs2-devel/2009-March/004117.html This patch is to add the lock type string. This patch also applies to 1.4 git. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> -- diff --git a/fs/ocfs2/ocfs2_lockid.h b/fs/ocfs2/ocfs2_lockid.h index a53ce87..e95cc7b 100644 ---

This patch logs(ERROR) -EIO errors just when they are hitted. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> -- diff -up ./linux-2.6.29.y.build/fs/ocfs2/buffer_head_io.c.orig ./linux-2.6.29.y.build/fs/ocfs2/buffer_head_io.c --- ./linux-2.6.29.y.build/fs/ocfs2/buffer_head_io.c.orig 2009-04-17 13:55:52.000000000 +0800 +++ ./linux-2.6.29.y.build/fs/ocfs2/buffer_head_io.c 2009-04-17

use i_size_read() instead of accessing inode->i_size directly. Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> -- diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index b2c52b3..4491851 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -1920,7 +1920,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping, out_write_size: pos += copied; - if (pos >

/an ocfs2 bug: a truncate races with ocfs2_get_block(...,0). 1) 'dd' is doing a truncate, clearing the page cache and reset inode size./ /2) between clearing page cache and resizing inode, a read comes and create a / /new page and insert it to page cache./ /3) the read(from `cat`) set buffer head in the new page as mapped but doesn't increase / /ip_mmu_private in ocfs2_get_block()

#backporting the 3 patches at http://kernel.us.oracle.com/~smushran/srini/ to 1.2. enlarge hash_table capacity to fasten hash_table lookups. Signed-off-by: Wengang wang <wen.gang.wang at oracle.com> -- diff -up ./svnocfs2-1.2/fs/ocfs2/dlm/dlmdebug.c.orig ./svnocfs2-1.2/fs/ocfs2/dlm/dlmdebug.c --- ./svnocfs2-1.2/fs/ocfs2/dlm/dlmdebug.c.orig 2009-04-22 11:00:37.000000000 +0800 +++

Wether the dlm_lock needs to access lvb or not depends on dlm_lock_resource it belongs to. So a new parameter "struct dlm_lock_resource *res" is added to dlm_new_lock() so that we can know if we need to allocate lvb for the dlm_lock. And we have to make the lockres availale for calling dlm_new_lock(). Signed-off-by: Wengang Wang <wen.gang.wang at oracle.com> ---

Ocfs2 supports exporting. PROBLEM: There are 2 problems (1) Current version of ocfs2_get_dentry() may read from disk the inode WITHOUT any cross cluster lock. This may lead to load a stale inode. (2) for deleting an inode, ocfs2_remove_inode() doesn't sync/checkpoint to disk. This also may lead ocfs2_get_dentry() from other node read out stale inode. PROBLEM DETAIL: for problem (1), For

For nfs exporting, ocfs2_get_dentry() returns the dentry for fh. ocfs2_get_dentry() may read from disk(when inode not in memory) without any cross cluster lock. this leads to load a stale inode. this patch fixes above problem. solution is that in case of inode is not in memory, we get the cluster lock(PR) of alloc inode where the inode in question is allocated from(this causes node on which