From ae5d9541ca9eefbc529f7f98c37d877fe1b65880 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Fri, 28 Oct 2011 14:13:26 +0200
Subject: [PATCH] --- yaml --- r: 273194 b: refs/heads/master c:
 a7732b05f775a5575baac34c03bb0e8d16950edf h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ocfs2/namei.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a7af9dc5a1c3..a9401984ad6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c818b682c955aa4d13212512deb529cb8bd1348b
+refs/heads/master: a7732b05f775a5575baac34c03bb0e8d16950edf
diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c
index 53aa41ed7bf3..0181f63dd463 100644
--- a/trunk/fs/ocfs2/namei.c
+++ b/trunk/fs/ocfs2/namei.c
@@ -200,8 +200,6 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, int mode)
 	 * callers. */
 	if (S_ISDIR(mode))
 		inode->i_nlink = 2;
-	else
-		inode->i_nlink = 1;
 	inode_init_owner(inode, dir, mode);
 	dquot_initialize(inode);
 	return inode;