From: Steven Whitehouse <swhiteho@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 5/5] GFS2: Fix nlink setting on inode creation
Date: Wed, 11 Jan 2012 12:57:28 +0000 [thread overview]
Message-ID: <1326286648-5515-6-git-send-email-swhiteho@redhat.com> (raw)
In-Reply-To: <1326286648-5515-1-git-send-email-swhiteho@redhat.com>
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);
--
1.7.4
prev parent reply other threads:[~2012-01-11 12:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-11 12:57 [Cluster-devel] GFS2: Pre-pull patch posting (merge window set #2) Steven Whitehouse
2012-01-11 12:57 ` [Cluster-devel] [PATCH 1/5] GFS2: dlm based recovery coordination Steven Whitehouse
2012-01-11 12:57 ` [Cluster-devel] [PATCH 2/5] GFS2: Fix a use-after-free that coverity spotted Steven Whitehouse
2012-01-11 12:57 ` [Cluster-devel] [PATCH 3/5] GFS2: let spectator mount do read only recovery Steven Whitehouse
2012-01-11 12:57 ` [Cluster-devel] [PATCH 4/5] GFS2: fail mount if journal recovery fails Steven Whitehouse
2012-01-11 12:57 ` Steven Whitehouse [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1326286648-5515-6-git-send-email-swhiteho@redhat.com \
--to=swhiteho@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).