microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

GFS2: Remove vestigial parameter ip from function rs_deltree 

The functions that delete block reservations from the rgrp block
reservations rbtree no longer use the ip parameter. This patch
eliminates the parameter.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Bob Peterson 2013-03-13 10:26:38 -04:00 коммит произвёл Steven Whitehouse
Родитель 79ba74808d
Коммит 20095218fb
4 изменённых файлов: 11 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
fs/gfs2/bmap.c
Просмотреть файл

@ -787,7 +787,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh,
goto out_rlist; goto out_rlist;
if (gfs2_rs_active(ip->i_res)) /* needs to be done with the rgrp glock held */ if (gfs2_rs_active(ip->i_res)) /* needs to be done with the rgrp glock held */
gfs2_rs_deltree(ip, ip->i_res); gfs2_rs_deltree(ip->i_res);
error = gfs2_trans_begin(sdp, rg_blocks + RES_DINODE + error = gfs2_trans_begin(sdp, rg_blocks + RES_DINODE +
RES_INDIRECT + RES_STATFS + RES_QUOTA, RES_INDIRECT + RES_STATFS + RES_QUOTA,

16
fs/gfs2/rgrp.c
Просмотреть файл

@ -592,7 +592,7 @@ static void dump_rs(struct seq_file *seq, const struct gfs2_blkreserv *rs)
* @rs: The reservation to remove * @rs: The reservation to remove
* *
*/ */
static void __rs_deltree(struct gfs2_inode *ip, struct gfs2_blkreserv *rs) static void __rs_deltree(struct gfs2_blkreserv *rs)
{ {
struct gfs2_rgrpd *rgd; struct gfs2_rgrpd *rgd;
@ -605,7 +605,7 @@ static void __rs_deltree(struct gfs2_inode *ip, struct gfs2_blkreserv *rs)
RB_CLEAR_NODE(&rs->rs_node); RB_CLEAR_NODE(&rs->rs_node);
if (rs->rs_free) { if (rs->rs_free) {
/* return reserved blocks to the rgrp and the ip */ /* return reserved blocks to the rgrp */
BUG_ON(rs->rs_rbm.rgd->rd_reserved < rs->rs_free); BUG_ON(rs->rs_rbm.rgd->rd_reserved < rs->rs_free);
rs->rs_rbm.rgd->rd_reserved -= rs->rs_free; rs->rs_rbm.rgd->rd_reserved -= rs->rs_free;
rs->rs_free = 0; rs->rs_free = 0;
@ -619,14 +619,14 @@ static void __rs_deltree(struct gfs2_inode *ip, struct gfs2_blkreserv *rs)
* @rs: The reservation to remove * @rs: The reservation to remove
* *
*/ */
void gfs2_rs_deltree(struct gfs2_inode *ip, struct gfs2_blkreserv *rs) void gfs2_rs_deltree(struct gfs2_blkreserv *rs)
{ {
struct gfs2_rgrpd *rgd; struct gfs2_rgrpd *rgd;
rgd = rs->rs_rbm.rgd; rgd = rs->rs_rbm.rgd;
if (rgd) { if (rgd) {
spin_lock(&rgd->rd_rsspin); spin_lock(&rgd->rd_rsspin);
__rs_deltree(ip, rs); __rs_deltree(rs);
spin_unlock(&rgd->rd_rsspin); spin_unlock(&rgd->rd_rsspin);
} }
} }
@ -640,7 +640,7 @@ void gfs2_rs_delete(struct gfs2_inode *ip)
{ {
down_write(&ip->i_rw_mutex); down_write(&ip->i_rw_mutex);
if (ip->i_res) { if (ip->i_res) {
gfs2_rs_deltree(ip, ip->i_res); gfs2_rs_deltree(ip->i_res);
BUG_ON(ip->i_res->rs_free); BUG_ON(ip->i_res->rs_free);
kmem_cache_free(gfs2_rsrv_cachep, ip->i_res); kmem_cache_free(gfs2_rsrv_cachep, ip->i_res);
ip->i_res = NULL; ip->i_res = NULL;
@ -664,7 +664,7 @@ static void return_all_reservations(struct gfs2_rgrpd *rgd)
spin_lock(&rgd->rd_rsspin); spin_lock(&rgd->rd_rsspin);
while ((n = rb_first(&rgd->rd_rstree))) { while ((n = rb_first(&rgd->rd_rstree))) {
rs = rb_entry(n, struct gfs2_blkreserv, rs_node); rs = rb_entry(n, struct gfs2_blkreserv, rs_node);
__rs_deltree(NULL, rs); __rs_deltree(rs);
} }
spin_unlock(&rgd->rd_rsspin); spin_unlock(&rgd->rd_rsspin);
} }
@ -1874,7 +1874,7 @@ int gfs2_inplace_reserve(struct gfs2_inode *ip, u32 requested, u32 aflags)
/* Drop reservation, if we couldn't use reserved rgrp */ /* Drop reservation, if we couldn't use reserved rgrp */
if (gfs2_rs_active(rs)) if (gfs2_rs_active(rs))
gfs2_rs_deltree(ip, rs); gfs2_rs_deltree(rs);
check_rgrp: check_rgrp:
/* Check for unlinked inodes which can be reclaimed */ /* Check for unlinked inodes which can be reclaimed */
if (rs->rs_rbm.rgd->rd_flags & GFS2_RDF_CHECK) if (rs->rs_rbm.rgd->rd_flags & GFS2_RDF_CHECK)
@ -2087,7 +2087,7 @@ static void gfs2_adjust_reservation(struct gfs2_inode *ip,
if (rs->rs_free && !ret) if (rs->rs_free && !ret)
goto out; goto out;
} }
__rs_deltree(ip, rs); __rs_deltree(rs);
} }
out: out:
spin_unlock(&rgd->rd_rsspin); spin_unlock(&rgd->rd_rsspin);

2
fs/gfs2/rgrp.h
Просмотреть файл

@ -47,7 +47,7 @@ extern int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *n,
bool dinode, u64 *generation); bool dinode, u64 *generation);
extern int gfs2_rs_alloc(struct gfs2_inode *ip); extern int gfs2_rs_alloc(struct gfs2_inode *ip);
extern void gfs2_rs_deltree(struct gfs2_inode *ip, struct gfs2_blkreserv *rs); extern void gfs2_rs_deltree(struct gfs2_blkreserv *rs);
extern void gfs2_rs_delete(struct gfs2_inode *ip); extern void gfs2_rs_delete(struct gfs2_inode *ip);
extern void __gfs2_free_blocks(struct gfs2_inode *ip, u64 bstart, u32 blen, int meta); extern void __gfs2_free_blocks(struct gfs2_inode *ip, u64 bstart, u32 blen, int meta);
extern void gfs2_free_meta(struct gfs2_inode *ip, u64 bstart, u32 blen); extern void gfs2_free_meta(struct gfs2_inode *ip, u64 bstart, u32 blen);

2
fs/gfs2/super.c
Просмотреть файл

@ -1512,7 +1512,7 @@ out_truncate:
out_unlock: out_unlock:
/* Error path for case 1 */ /* Error path for case 1 */
if (gfs2_rs_active(ip->i_res)) if (gfs2_rs_active(ip->i_res))
gfs2_rs_deltree(ip, ip->i_res); gfs2_rs_deltree(ip->i_res);
if (test_bit(HIF_HOLDER, &ip->i_iopen_gh.gh_iflags)) if (test_bit(HIF_HOLDER, &ip->i_iopen_gh.gh_iflags))
gfs2_glock_dq(&ip->i_iopen_gh); gfs2_glock_dq(&ip->i_iopen_gh);