[V2] ocfs2: fix a tiny case that inode can not removed.
diff mbox

Message ID 55E403EF.3060702@huawei.com
State New
Headers show

Commit Message

jiangyiwen Aug. 31, 2015, 7:36 a.m. UTC
When running dirop_fileop_racer we found a case that inode
can not removed.

2 nodes, say Node A and Node B, mount the same ocfs2 volume. Create
two dirs /race/1/ and /race/2/ in the filesystem.

Node A                            Node B
rm -r /race/2/
                                  mv /race/1/ /race/2/
call ocfs2_unlink(), get
the EX mode of /race/2/
                                  wait for B unlock /race/2/
decrease i_nlink of /race/2/ to 0,
and add inode of /race/2/ into
orphan dir, unlock /race/2/
                                  got EX mode of /race/2/. because
                                  /race/1/ is dir, so inc i_nlink
                                  of /race/2/ and update into disk,
                                  unlock /race/2/
because i_nlink of /race/2/
is not zero, this inode will
always remain in orphan dir

This patch fixes this case by test whether i_nlink of new dir is zero.

Signed-off-by: Yiwen Jiang <jiangyiwen@huawei.com>
---
 fs/ocfs2/namei.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Mark Fasheh Sept. 1, 2015, 5:55 p.m. UTC | #1
On Mon, Aug 31, 2015 at 03:36:15PM +0800, jiangyiwen wrote:
> When running dirop_fileop_racer we found a case that inode
> can not removed.
> 
> 2 nodes, say Node A and Node B, mount the same ocfs2 volume. Create
> two dirs /race/1/ and /race/2/ in the filesystem.
> 
> Node A                            Node B
> rm -r /race/2/
>                                   mv /race/1/ /race/2/
> call ocfs2_unlink(), get
> the EX mode of /race/2/
>                                   wait for B unlock /race/2/
> decrease i_nlink of /race/2/ to 0,
> and add inode of /race/2/ into
> orphan dir, unlock /race/2/
>                                   got EX mode of /race/2/. because
>                                   /race/1/ is dir, so inc i_nlink
>                                   of /race/2/ and update into disk,
>                                   unlock /race/2/
> because i_nlink of /race/2/
> is not zero, this inode will
> always remain in orphan dir
> 
> This patch fixes this case by test whether i_nlink of new dir is zero.
> 
> Signed-off-by: Yiwen Jiang <jiangyiwen@huawei.com>

Looks great, thanks

Reviewed-by: Mark Fasheh <mfasheh@suse.de>
	--Mark

--
Mark Fasheh

Patch
diff mbox

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 6e6abb9..2092c88 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -1284,6 +1284,11 @@  static int ocfs2_rename(struct inode *old_dir,
 	}
 	parents_locked = 1;

+	if (!new_dir->i_nlink) {
+		status = -EACCES;
+		goto bail;
+	}
+
 	/* make sure both dirs have bhs
 	 * get an extra ref on old_dir_bh if old==new */
 	if (!new_dir_bh) {