OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[GFS2] make gfs2_change_nlink_i() static 

On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
>  git-gfs2-nmw.patch
>...
>  git trees
>...

This patch makes the needlessly globlal gfs2_change_nlink_i() static.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Adrian Bunk 2007-01-13 10:56:41 +01:00 committed by Steven Whitehouse
parent 7083146564
commit 03dc6a538e
2 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
fs/gfs2/inode.c
View File

@ -280,6 +280,50 @@ out:
return error;
}
static int gfs2_change_nlink_i(struct gfs2_inode *ip)
{
struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
struct gfs2_glock *ri_gl = rindex->i_gl;
struct gfs2_rgrpd *rgd;
struct gfs2_holder ri_gh, rg_gh;
int existing, error;
/* if we come from rename path, we could have the lock already */
existing = gfs2_glock_is_locked_by_me(ri_gl);
if (!existing) {
error = gfs2_rindex_hold(sdp, &ri_gh);
if (error)
goto out;
}
/* find the matching rgd */
error = -EIO;
rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
if (!rgd)
goto out_norgrp;
/*
* Eventually we may want to move rgd(s) to a linked list
* and piggyback the free logic into one of gfs2 daemons
* to gain some performance.
*/
if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
if (error)
goto out_norgrp;
gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
gfs2_glock_dq_uninit(&rg_gh);
}
out_norgrp:
if (!existing)
gfs2_glock_dq_uninit(&ri_gh);
out:
return error;
}
/**
* gfs2_change_nlink - Change nlink count on inode
* @ip: The GFS2 inode
@ -326,50 +370,6 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff)
return error;
}
int gfs2_change_nlink_i(struct gfs2_inode *ip)
{
struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
struct gfs2_glock *ri_gl = rindex->i_gl;
struct gfs2_rgrpd *rgd;
struct gfs2_holder ri_gh, rg_gh;
int existing, error;
/* if we come from rename path, we could have the lock already */
existing = gfs2_glock_is_locked_by_me(ri_gl);
if (!existing) {
error = gfs2_rindex_hold(sdp, &ri_gh);
if (error)
goto out;
}
/* find the matching rgd */
error = -EIO;
rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
if (!rgd)
goto out_norgrp;
/*
* Eventually we may want to move rgd(s) to a linked list
* and piggyback the free logic into one of gfs2 daemons
* to gain some performance.
*/
if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
if (error)
goto out_norgrp;
gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
gfs2_glock_dq_uninit(&rg_gh);
}
out_norgrp:
if (!existing)
gfs2_glock_dq_uninit(&ri_gh);
out:
return error;
}
struct inode *gfs2_lookup_simple(struct inode *dip, const char *name)
{
struct qstr qstr;

1
fs/gfs2/inode.h
View File

@ -40,7 +40,6 @@ int gfs2_inode_refresh(struct gfs2_inode *ip);
int gfs2_dinode_dealloc(struct gfs2_inode *inode);
int gfs2_change_nlink(struct gfs2_inode *ip, int diff);
int gfs2_change_nlink_i(struct gfs2_inode *ip);
struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
int is_root, struct nameidata *nd);
struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,