Commit 397a83ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '9p-for-6.10-rc2' of https://github.com/martinetd/linux 

Pull 9p fixes from Dominique Martinet:
 "Two fixes headed to stable trees:

   - a trace event was dumping uninitialized values

   - a missing lock that was thought to have exclusive access, and it
     turned out not to"

* tag '9p-for-6.10-rc2' of https://github.com/martinetd/linux:
  9p: add missing locking around taking dentry fid list
  net/9p: fix uninit-value in p9_client_rpc()
parents db163660 c898afdc

fs/9p/vfs_dentry.c

+7 −2
Original line number Diff line number Diff line
@@ -48,12 +48,17 @@ static int v9fs_cached_dentry_delete(const struct dentry *dentry) 
static void v9fs_dentry_release(struct dentry *dentry)

{

	struct hlist_node *p, *n;

	struct hlist_head head;



	p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p)\n",

		 dentry, dentry);

	hlist_for_each_safe(p, n, (struct hlist_head *)&dentry->d_fsdata)



	spin_lock(&dentry->d_lock);

	hlist_move_list((struct hlist_head *)&dentry->d_fsdata, &head);

	spin_unlock(&dentry->d_lock);



	hlist_for_each_safe(p, n, &head)

		p9_fid_put(hlist_entry(p, struct p9_fid, dlist));

	dentry->d_fsdata = NULL;

}



static int v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags)

net/9p/client.c

+2 −0
Original line number Diff line number Diff line
@@ -236,6 +236,8 @@ static int p9_fcall_init(struct p9_client *c, struct p9_fcall *fc, 
	if (!fc->sdata)

		return -ENOMEM;

	fc->capacity = alloc_msize;

	fc->id = 0;

	fc->tag = P9_NOTAG;

	return 0;

}