From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 11 Jan 2012 12:35:05 +0000 (+0000)
Subject: GFS2: Fix nlink setting on inode creation
X-Git-Tag: upstream/snapshot3+hdmi~8345^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66ad863b410efb7f537719006f9ac52400c1a5c5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

GFS2: Fix nlink setting on inode creation

Since the nlink count will be 0, we need to use set_nlink rather
than inc_nlink in order to avoid triggering the inc_nlink warning
which was added recently.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 017960c..a7d611b 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -599,9 +599,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name,
 	error = gfs2_meta_inode_buffer(ip, &dibh);
 	if (error)
 		goto fail_end_trans;
-	inc_nlink(&ip->i_inode);
-	if (S_ISDIR(ip->i_inode.i_mode))
-		inc_nlink(&ip->i_inode);
+	set_nlink(&ip->i_inode, S_ISDIR(ip->i_inode.i_mode) ? 2 : 1);
 	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
 	gfs2_dinode_out(ip, dibh->b_data);
 	brelse(dibh);