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

---
 [refs]                        | 2 +-
 trunk/arch/s390/hypfs/inode.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4afeafce9b79..367b48a86d28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2833eb2b465a274d1a2529fed76c6d2904f8022b
+refs/heads/master: dc78610228fdcf84a45ff030ca6a7f0fc4913319
diff --git a/trunk/arch/s390/hypfs/inode.c b/trunk/arch/s390/hypfs/inode.c
index 6fe874fc5f8e..7ae0d0d985a8 100644
--- a/trunk/arch/s390/hypfs/inode.c
+++ b/trunk/arch/s390/hypfs/inode.c
@@ -109,8 +109,6 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode)
 		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
 		if (mode & S_IFDIR)
 			ret->i_nlink = 2;
-		else
-			ret->i_nlink = 1;
 	}
 	return ret;
 }