From: jiangyiwen Date: Tue, 7 Apr 2015 23:43:57 +0000 (+1000) Subject: ocfs2: fix a tiny case that inode can not removed. X-Git-Tag: KARO-TXA5-2015-06-26~18^2~464 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=16831628b564e90ea829a8fc6c9e85ff5dec3f64;p=karo-tx-linux.git ocfs2: fix a tiny case that inode can not removed. 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 Cc: Mark Fasheh Cc: Joel Becker Signed-off-by: Andrew Morton --- diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 09f90cbf0e24..f35cb7a7b601 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -1291,6 +1291,15 @@ static int ocfs2_rename(struct inode *old_dir, } parents_locked = 1; + if (!new_dir->i_nlink) { + mlog(ML_ERROR, "new dir %llu has been removed, inode %llu " + "can not be moved into it.", + (unsigned long long)new_dir->i_ino, + (unsigned long long)old_inode->i_ino); + 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) {