Commit 9197b73f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull 9p fixes from Dominique Martinet:
 "Mashed-up update that I sat on too long:

   - fix for multiple slabs created with the same name

   - enable multipage folios

   - theorical fix to also look for opened fids by inode if none was
     found by dentry"

[ Enabling multi-page folios should have been done during the merge
  window, but it's a one-liner, and the actual meat of the enablement
  is in netfs and already in use for other filesystems...  - Linus ]

* tag '9p-for-6.12-rc4' of https://github.com/martinetd/linux:
  9p: Avoid creating multiple slab caches with the same name
  9p: Enable multipage folios
  9p: v9fs_fid_find: also lookup by inode if not found dentry
parents 4e6bd4a3 79efebae

fs/9p/fid.c

+2 −3
Original line number Diff line number Diff line
@@ -131,10 +131,9 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any) 
			}

		}

		spin_unlock(&dentry->d_lock);

	} else {

		if (dentry->d_inode)

			ret = v9fs_fid_find_inode(dentry->d_inode, false, uid, any);

	}

	if (!ret && dentry->d_inode)

		ret = v9fs_fid_find_inode(dentry->d_inode, false, uid, any);



	return ret;

}

fs/9p/vfs_inode.c

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ int v9fs_init_inode(struct v9fs_session_info *v9ses, 
			inode->i_op = &v9fs_file_inode_operations;

			inode->i_fop = &v9fs_file_operations;

		}

		mapping_set_large_folios(inode->i_mapping);



		break;

	case S_IFLNK:

net/9p/client.c

+9 −1
Original line number Diff line number Diff line
@@ -979,6 +979,7 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) 
	int err;

	struct p9_client *clnt;

	char *client_id;

	char *cache_name;



	clnt = kmalloc(sizeof(*clnt), GFP_KERNEL);

	if (!clnt)
@@ -1035,15 +1036,22 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) 
	if (err)

		goto close_trans;



	cache_name = kasprintf(GFP_KERNEL, "9p-fcall-cache-%s", dev_name);

	if (!cache_name) {

		err = -ENOMEM;

		goto close_trans;

	}



	/* P9_HDRSZ + 4 is the smallest packet header we can have that is

	 * followed by data accessed from userspace by read

	 */

	clnt->fcall_cache =

		kmem_cache_create_usercopy("9p-fcall-cache", clnt->msize,

		kmem_cache_create_usercopy(cache_name, clnt->msize,

					   0, 0, P9_HDRSZ + 4,

					   clnt->msize - (P9_HDRSZ + 4),

					   NULL);



	kfree(cache_name);

	return clnt;



close_trans: