diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2012-01-11 12:35:05 +0000 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-01-11 12:35:05 +0000 |
| commit | 66ad863b410efb7f537719006f9ac52400c1a5c5 (patch) | |
| tree | 17db44f069274b4f42805c8fabdea841e4153737 /fs/gfs2 | |
| parent | 376d37788b56bc2800e5bd56b7a36b3544d89f97 (diff) | |
| download | op-kernel-dev-66ad863b410efb7f537719006f9ac52400c1a5c5.zip op-kernel-dev-66ad863b410efb7f537719006f9ac52400c1a5c5.tar.gz | |
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>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/inode.c | 4 |
1 files changed, 1 insertions, 3 deletions
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); |
