diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2011-05-09 12:08:36 +0100 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2011-05-09 16:35:25 +0100 |
| commit | 2baee03fb916563d7cc597e5460e4cb938815c52 (patch) | |
| tree | 7fb2318e11be52f956c0b2af44a62a4746d034ab | |
| parent | 588da3b3be8b3225c2dd192aa782bf6c5c32eb84 (diff) | |
| download | blackbird-op-linux-2baee03fb916563d7cc597e5460e4cb938815c52.tar.gz blackbird-op-linux-2baee03fb916563d7cc597e5460e4cb938815c52.zip | |
GFS2: Don't use gfs2_change_nlink in link syscall
There are three users of gfs2_change_nlink which add to the link
count. Two of these are about to be removed in later patches, so
this means that there will no callers, when that happens allowing
removal of that function, also in a later patch.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| -rw-r--r-- | fs/gfs2/ops_inode.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index 1005f9eb456e..acb6f69b02ed 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c @@ -145,6 +145,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, struct inode *inode = old_dentry->d_inode; struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_holder ghs[2]; + struct buffer_head *dibh; int alloc_required; int error; @@ -230,12 +231,22 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, goto out_ipres; } - error = gfs2_dir_add(dir, &dentry->d_name, ip, IF2DT(inode->i_mode)); + error = gfs2_meta_inode_buffer(ip, &dibh); if (error) goto out_end_trans; - error = gfs2_change_nlink(ip, +1); + error = gfs2_dir_add(dir, &dentry->d_name, ip, IF2DT(inode->i_mode)); + if (error) + goto out_brelse; + + gfs2_trans_add_bh(ip->i_gl, dibh, 1); + inc_nlink(&ip->i_inode); + ip->i_inode.i_ctime = CURRENT_TIME; + gfs2_dinode_out(ip, dibh->b_data); + mark_inode_dirty(&ip->i_inode); +out_brelse: + brelse(dibh); out_end_trans: gfs2_trans_end(sdp); out_ipres: |
