Commit 92c48157 authored by David Howells's avatar David Howells
Browse files

afs: Make afs_lookup_cell() take a trace note 



Pass a note to be added to the afs_cell tracepoint to afs_lookup_cell() so
that different callers can be distinguished.

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-11-dhowells@redhat.com/ # v1
Link: https://lore.kernel.org/r/20250310094206.801057-7-dhowells@redhat.com/ # v4
parent 76daa300

fs/afs/cell.c

+8 −5
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net, 
 * @namesz:	The strlen of the cell name.

 * @vllist:	A colon/comma separated list of numeric IP addresses or NULL.

 * @excl:	T if an error should be given if the cell name already exists.

 * @trace:	The reason to be logged if the lookup is successful.

 *

 * Look up a cell record by name and query the DNS for VL server addresses if

 * needed.  Note that that actual DNS query is punted off to the manager thread
@@ -241,7 +242,8 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net, 
 */

struct afs_cell *afs_lookup_cell(struct afs_net *net,

				 const char *name, unsigned int namesz,

				 const char *vllist, bool excl)

				 const char *vllist, bool excl,

				 enum afs_cell_trace trace)

{

	struct afs_cell *cell, *candidate, *cursor;

	struct rb_node *parent, **pp;
@@ -251,7 +253,7 @@ struct afs_cell *afs_lookup_cell(struct afs_net *net, 
	_enter("%s,%s", name, vllist);



	if (!excl) {

		cell = afs_find_cell(net, name, namesz, afs_cell_trace_use_lookup);

		cell = afs_find_cell(net, name, namesz, trace);

		if (!IS_ERR(cell))

			goto wait_for_cell;

	}
@@ -327,7 +329,7 @@ struct afs_cell *afs_lookup_cell(struct afs_net *net, 
	if (excl) {

		ret = -EEXIST;

	} else {

		afs_use_cell(cursor, afs_cell_trace_use_lookup);

		afs_use_cell(cursor, trace);

		ret = 0;

	}

	up_write(&net->cells_lock);
@@ -382,8 +384,9 @@ int afs_cell_init(struct afs_net *net, const char *rootcell) 
	if (cp && cp < rootcell + len)

		return -EINVAL;



	/* allocate a cell record for the root cell */

	new_root = afs_lookup_cell(net, rootcell, len, vllist, false);

	/* allocate a cell record for the root/workstation cell */

	new_root = afs_lookup_cell(net, rootcell, len, vllist, false,

				   afs_cell_trace_use_lookup_ws);

	if (IS_ERR(new_root)) {

		_leave(" = %ld", PTR_ERR(new_root));

		return PTR_ERR(new_root);

fs/afs/dynroot.c

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ static struct dentry *afs_dynroot_lookup_cell(struct inode *dir, struct dentry * 
		dotted = true;

	}



	cell = afs_lookup_cell(net, name, len, NULL, false);

	cell = afs_lookup_cell(net, name, len, NULL, false,

			       afs_cell_trace_use_lookup_dynroot);

	if (IS_ERR(cell)) {

		ret = PTR_ERR(cell);

		goto out_no_cell;

fs/afs/internal.h

+4 −2
Original line number Diff line number Diff line
@@ -1046,8 +1046,10 @@ static inline bool afs_cb_is_broken(unsigned int cb_break, 
extern int afs_cell_init(struct afs_net *, const char *);

extern struct afs_cell *afs_find_cell(struct afs_net *, const char *, unsigned,

				      enum afs_cell_trace);

extern struct afs_cell *afs_lookup_cell(struct afs_net *, const char *, unsigned,

					const char *, bool);

struct afs_cell *afs_lookup_cell(struct afs_net *net,

				 const char *name, unsigned int namesz,

				 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);

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

fs/afs/mntpt.c

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ static int afs_mntpt_set_params(struct fs_context *fc, struct dentry *mntpt) 
		if (size > AFS_MAXCELLNAME)

			return -ENAMETOOLONG;



		cell = afs_lookup_cell(ctx->net, p, size, NULL, false);

		cell = afs_lookup_cell(ctx->net, p, size, NULL, false,

				       afs_cell_trace_use_lookup_mntpt);

		if (IS_ERR(cell)) {

			pr_err("kAFS: unable to lookup cell '%pd'\n", mntpt);

			return PTR_ERR(cell);

fs/afs/proc.c

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ static int afs_proc_cells_write(struct file *file, char *buf, size_t size) 
	if (strcmp(buf, "add") == 0) {

		struct afs_cell *cell;



		cell = afs_lookup_cell(net, name, strlen(name), args, true);

		cell = afs_lookup_cell(net, name, strlen(name), args, true,

				       afs_cell_trace_use_lookup_add);

		if (IS_ERR(cell)) {

			ret = PTR_ERR(cell);

			goto done;