Commit 70990afa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '9p-for-5.11-rc1' of git://github.com/martinetd/linux 

Pull 9p update from Dominique Martinet:

 - fix long-standing limitation on open-unlink-fop pattern

 - add refcount to p9_fid (fixes the above and will allow for more
   cleanups and simplifications in the future)

* tag '9p-for-5.11-rc1' of git://github.com/martinetd/linux:
  9p: Remove unnecessary IS_ERR() check
  9p: Uninitialized variable in v9fs_writeback_fid()
  9p: Fix writeback fid incorrectly being attached to dentry
  9p: apply review requests for fid refcounting
  9p: add refcount to p9_fid struct
  fs/9p: search open fids first
  fs/9p: track open fids
  fs/9p: fix create-unlink-getattr idiom
parents e37b12e4 cfd1d0f5

fs/9p/fid.c

+60 −5
Original line number Diff line number Diff line
@@ -38,6 +38,48 @@ void v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid) 
	spin_unlock(&dentry->d_lock);

}



/**

 * v9fs_fid_find_inode - search for an open fid off of the inode list

 * @inode: return a fid pointing to a specific inode

 * @uid: return a fid belonging to the specified user

 *

 */



static struct p9_fid *v9fs_fid_find_inode(struct inode *inode, kuid_t uid)

{

	struct hlist_head *h;

	struct p9_fid *fid, *ret = NULL;



	p9_debug(P9_DEBUG_VFS, " inode: %p\n", inode);



	spin_lock(&inode->i_lock);

	h = (struct hlist_head *)&inode->i_private;

	hlist_for_each_entry(fid, h, ilist) {

		if (uid_eq(fid->uid, uid)) {

			refcount_inc(&fid->count);

			ret = fid;

			break;

		}

	}

	spin_unlock(&inode->i_lock);

	return ret;

}



/**

 * v9fs_open_fid_add - add an open fid to an inode

 * @dentry: inode that the fid is being added to

 * @fid: fid to add

 *

 */



void v9fs_open_fid_add(struct inode *inode, struct p9_fid *fid)

{

	spin_lock(&inode->i_lock);

	hlist_add_head(&fid->ilist, (struct hlist_head *)&inode->i_private);

	spin_unlock(&inode->i_lock);

}





/**

 * v9fs_fid_find - retrieve a fid that belongs to the specified uid

 * @dentry: dentry to look for fid in
@@ -54,13 +96,18 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any) 
		 dentry, dentry, from_kuid(&init_user_ns, uid),

		 any);

	ret = NULL;



	if (d_inode(dentry))

		ret = v9fs_fid_find_inode(d_inode(dentry), uid);



	/* we'll recheck under lock if there's anything to look in */

	if (dentry->d_fsdata) {

	if (!ret && dentry->d_fsdata) {

		struct hlist_head *h = (struct hlist_head *)&dentry->d_fsdata;

		spin_lock(&dentry->d_lock);

		hlist_for_each_entry(fid, h, dlist) {

			if (any || uid_eq(fid->uid, uid)) {

				ret = fid;

				refcount_inc(&ret->count);

				break;

			}

		}
@@ -122,7 +169,10 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry, 
	fid = v9fs_fid_find(ds, uid, any);

	if (fid) {

		/* Found the parent fid do a lookup with that */

		fid = p9_client_walk(fid, 1, &dentry->d_name.name, 1);

		struct p9_fid *ofid = fid;



		fid = p9_client_walk(ofid, 1, &dentry->d_name.name, 1);

		p9_client_clunk(ofid);

		goto fid_out;

	}

	up_read(&v9ses->rename_sem);
@@ -147,8 +197,10 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry, 
		v9fs_fid_add(dentry->d_sb->s_root, fid);

	}

	/* If we are root ourself just return that */

	if (dentry->d_sb->s_root == dentry)

	if (dentry->d_sb->s_root == dentry) {

		refcount_inc(&fid->count);

		return fid;

	}

	/*

	 * Do a multipath walk with attached root.

	 * When walking parent we need to make sure we
@@ -195,6 +247,7 @@ fid_out: 
			fid = ERR_PTR(-ENOENT);

		} else {

			__add_fid(dentry, fid);

			refcount_inc(&fid->count);

			spin_unlock(&dentry->d_lock);

		}

	}
@@ -245,11 +298,13 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) 
struct p9_fid *v9fs_writeback_fid(struct dentry *dentry)

{

	int err;

	struct p9_fid *fid;

	struct p9_fid *fid, *ofid;



	fid = clone_fid(v9fs_fid_lookup_with_uid(dentry, GLOBAL_ROOT_UID, 0));

	ofid = v9fs_fid_lookup_with_uid(dentry, GLOBAL_ROOT_UID, 0);

	fid = clone_fid(ofid);

	if (IS_ERR(fid))

		goto error_out;

	p9_client_clunk(ofid);

	/*

	 * writeback fid will only be used to write back the

	 * dirty pages. We always request for the open fid in read-write

fs/9p/fid.h

+10 −1
Original line number Diff line number Diff line
@@ -15,12 +15,21 @@ static inline struct p9_fid *v9fs_parent_fid(struct dentry *dentry) 
}

void v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid);

struct p9_fid *v9fs_writeback_fid(struct dentry *dentry);

void v9fs_open_fid_add(struct inode *inode, struct p9_fid *fid);

static inline struct p9_fid *clone_fid(struct p9_fid *fid)

{

	return IS_ERR(fid) ? fid :  p9_client_walk(fid, 0, NULL, 1);

}

static inline struct p9_fid *v9fs_fid_clone(struct dentry *dentry)

{

	return clone_fid(v9fs_fid_lookup(dentry));

	struct p9_fid *fid, *nfid;



	fid = v9fs_fid_lookup(dentry);

	if (!fid || IS_ERR(fid))

		return fid;



	nfid = clone_fid(fid);

	p9_client_clunk(fid);

	return nfid;

}

#endif

fs/9p/vfs_dentry.c

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ static int v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags) 
			retval = v9fs_refresh_inode_dotl(fid, inode);

		else

			retval = v9fs_refresh_inode(fid, inode);

		p9_client_clunk(fid);



		if (retval == -ENOENT)

			return 0;

		if (retval < 0)

fs/9p/vfs_dir.c

+5 −1
Original line number Diff line number Diff line
@@ -210,8 +210,12 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) 
	fid = filp->private_data;

	p9_debug(P9_DEBUG_VFS, "inode: %p filp: %p fid: %d\n",

		 inode, filp, fid ? fid->fid : -1);

	if (fid)

	if (fid) {

		spin_lock(&inode->i_lock);

		hlist_del(&fid->ilist);

		spin_unlock(&inode->i_lock);

		p9_client_clunk(fid);

	}

	return 0;

}

fs/9p/vfs_file.c

+4 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ int v9fs_file_open(struct inode *inode, struct file *file) 
	int err;

	struct v9fs_inode *v9inode;

	struct v9fs_session_info *v9ses;

	struct p9_fid *fid;

	struct p9_fid *fid, *writeback_fid;

	int omode;



	p9_debug(P9_DEBUG_VFS, "inode: %p file: %p\n", inode, file);
@@ -85,17 +85,18 @@ int v9fs_file_open(struct inode *inode, struct file *file) 
		 * because we want write after unlink usecase

		 * to work.

		 */

		fid = v9fs_writeback_fid(file_dentry(file));

		writeback_fid = v9fs_writeback_fid(file_dentry(file));

		if (IS_ERR(fid)) {

			err = PTR_ERR(fid);

			mutex_unlock(&v9inode->v_mutex);

			goto out_error;

		}

		v9inode->writeback_fid = (void *) fid;

		v9inode->writeback_fid = (void *) writeback_fid;

	}

	mutex_unlock(&v9inode->v_mutex);

	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)

		v9fs_cache_inode_set_cookie(inode, file);

	v9fs_open_fid_add(inode, fid);

	return 0;

out_error:

	p9_client_clunk(file->private_data);

CRA Git | Maintained and supported by SUSTech CRA and CCSE