Commit 469c82b5 authored by David Howells's avatar David Howells
Browse files

afs: Drop the net parameter from afs_unuse_cell() 



Remove the redundant net parameter to afs_unuse_cell() as cell->net can be
used instead.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/20250224234154.2014840-12-dhowells@redhat.com/ # v1
Link: https://lore.kernel.org/r/20250310094206.801057-8-dhowells@redhat.com/ # v4
parent 92c48157

fs/afs/cell.c

+6 −6
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ struct afs_cell *afs_lookup_cell(struct afs_net *net, 
		goto wait_for_cell;

	goto error_noput;

error:

	afs_unuse_cell(net, cell, afs_cell_trace_unuse_lookup);

	afs_unuse_cell(cell, afs_cell_trace_unuse_lookup_error);

error_noput:

	_leave(" = %d [error]", ret);

	return ERR_PTR(ret);
@@ -402,7 +402,7 @@ int afs_cell_init(struct afs_net *net, const char *rootcell) 
				       lockdep_is_held(&net->cells_lock));

	up_write(&net->cells_lock);



	afs_unuse_cell(net, old_root, afs_cell_trace_unuse_ws);

	afs_unuse_cell(old_root, afs_cell_trace_unuse_ws);

	_leave(" = 0");

	return 0;

}
@@ -520,7 +520,7 @@ static void afs_cell_destroy(struct rcu_head *rcu) 
	trace_afs_cell(cell->debug_id, r, atomic_read(&cell->active), afs_cell_trace_free);



	afs_put_vlserverlist(net, rcu_access_pointer(cell->vl_servers));

	afs_unuse_cell(net, cell->alias_of, afs_cell_trace_unuse_alias);

	afs_unuse_cell(cell->alias_of, afs_cell_trace_unuse_alias);

	key_put(cell->anonymous_key);

	idr_remove(&net->cells_dyn_ino, cell->dynroot_ino);

	kfree(cell->name - 1);
@@ -608,7 +608,7 @@ struct afs_cell *afs_use_cell(struct afs_cell *cell, enum afs_cell_trace reason) 
 * Record a cell becoming less active.  When the active counter reaches 1, it

 * is scheduled for destruction, but may get reactivated.

 */

void afs_unuse_cell(struct afs_net *net, struct afs_cell *cell, enum afs_cell_trace reason)

void afs_unuse_cell(struct afs_cell *cell, enum afs_cell_trace reason)

{

	unsigned int debug_id;

	time64_t now, expire_delay;
@@ -632,7 +632,7 @@ void afs_unuse_cell(struct afs_net *net, struct afs_cell *cell, enum afs_cell_tr 
	WARN_ON(a == 0);

	if (a == 1)

		/* 'cell' may now be garbage collected. */

		afs_set_cell_timer(net, expire_delay);

		afs_set_cell_timer(cell->net, expire_delay);

}



/*
@@ -957,7 +957,7 @@ void afs_cell_purge(struct afs_net *net) 
	ws = rcu_replace_pointer(net->ws_cell, NULL,

				 lockdep_is_held(&net->cells_lock));

	up_write(&net->cells_lock);

	afs_unuse_cell(net, ws, afs_cell_trace_unuse_ws);

	afs_unuse_cell(ws, afs_cell_trace_unuse_ws);



	_debug("del timer");

	if (del_timer_sync(&net->cells_timer))

fs/afs/dynroot.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static struct dentry *afs_dynroot_lookup_cell(struct inode *dir, struct dentry * 
	return d_splice_alias(inode, dentry);



out:

	afs_unuse_cell(cell->net, cell, afs_cell_trace_unuse_lookup_dynroot);

	afs_unuse_cell(cell, afs_cell_trace_unuse_lookup_dynroot);

out_no_cell:

	if (!inode)

		return d_splice_alias(inode, dentry);
@@ -167,7 +167,7 @@ static void afs_dynroot_d_release(struct dentry *dentry) 
{

	struct afs_cell *cell = dentry->d_fsdata;



	afs_unuse_cell(cell->net, cell, afs_cell_trace_unuse_dynroot_mntpt);

	afs_unuse_cell(cell, afs_cell_trace_unuse_dynroot_mntpt);

}



/*

fs/afs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ struct afs_cell *afs_lookup_cell(struct afs_net *net, 
				 const char *vllist, bool excl,

				 enum afs_cell_trace trace);

extern struct afs_cell *afs_use_cell(struct afs_cell *, enum afs_cell_trace);

extern void afs_unuse_cell(struct afs_net *, struct afs_cell *, enum afs_cell_trace);

void afs_unuse_cell(struct afs_cell *cell, enum afs_cell_trace reason);

extern struct afs_cell *afs_get_cell(struct afs_cell *, enum afs_cell_trace);

extern void afs_see_cell(struct afs_cell *, enum afs_cell_trace);

extern void afs_put_cell(struct afs_cell *, enum afs_cell_trace);

fs/afs/mntpt.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt) 
		ctx->force = true;

	}

	if (ctx->cell) {

		afs_unuse_cell(ctx->net, ctx->cell, afs_cell_trace_unuse_mntpt);

		afs_unuse_cell(ctx->cell, afs_cell_trace_unuse_mntpt);

		ctx->cell = NULL;

	}

	if (test_bit(AFS_VNODE_PSEUDODIR, &vnode->flags)) {

fs/afs/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int afs_proc_cells_write(struct file *file, char *buf, size_t size) 
		}



		if (test_and_set_bit(AFS_CELL_FL_NO_GC, &cell->flags))

			afs_unuse_cell(net, cell, afs_cell_trace_unuse_no_pin);

			afs_unuse_cell(cell, afs_cell_trace_unuse_no_pin);

	} else {

		goto inval;

	}