From 68f5602c102cf6cb4024d3ffb4641a6a53990ce3 Mon Sep 17 00:00:00 2001 From: Tao Ma Date: Fri, 16 Apr 2010 13:59:25 +0800 Subject: [PATCH] --- yaml --- r: 190550 b: refs/heads/master c: 79681842e160c3211eeeb47ea31b061038d1e41e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/file.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7aac01298198..90707b21c014 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a42ab8e1a37257da37e0f018e707bf365ac24531 +refs/heads/master: 79681842e160c3211eeeb47ea31b061038d1e41e diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c index 2b4235c5831d..20e0ee58dd39 100644 --- a/trunk/fs/ocfs2/file.c +++ b/trunk/fs/ocfs2/file.c @@ -684,6 +684,7 @@ static int __ocfs2_extend_allocation(struct inode *inode, u32 logical_start, if (why == RESTART_META) { mlog(0, "restarting function.\n"); restart_func = 1; + status = 0; } else { BUG_ON(why != RESTART_TRANS);