X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=fs%2Focfs2%2Fnamei.c;h=b66e488558253e994ad21ec7bd747b134e97a29a;hb=ab41fdc8fdd9f0942430941c1e2b516fd481371d;hp=b1eb50ae40979a6451cbc5db003313a013868d54;hpb=186837ca3a6dd6b422a5ea316ed38eea183dca5d;p=linux-2.6-microblaze.git

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index b1eb50ae4097..b66e48855825 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -1811,6 +1811,7 @@ bail:
 	if (xattr_ac)
 		ocfs2_free_alloc_context(xattr_ac);
 	if ((status < 0) && inode) {
+		OCFS2_I(inode)->ip_flags |= OCFS2_INODE_SKIP_ORPHAN_DIR;
 		clear_nlink(inode);
 		iput(inode);
 	}
@@ -1976,6 +1977,7 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb,
 	}
 
 	le32_add_cpu(&fe->i_flags, OCFS2_ORPHANED_FL);
+	OCFS2_I(inode)->ip_flags &= ~OCFS2_INODE_SKIP_ORPHAN_DIR;
 
 	/* Record which orphan dir our inode now resides
 	 * in. delete_inode will use this to determine which orphan