Commit b8b3e905 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: (22 commits)
  9p: fix sparse warnings in new xattr code
  fs/9p: remove sparse warning in vfs_inode
  fs/9p: destroy fid on failed remove
  fs/9p: Prevent parallel rename when doing fid_lookup
  fs/9p: Add support user. xattr
  net/9p: Implement TXATTRCREATE 9p call
  net/9p: Implement attrwalk 9p call
  9p: Implement LOPEN
  fs/9p: This patch implements TLCREATE for 9p2000.L protocol.
  9p: Implement TMKDIR
  9p: Implement TMKNOD
  9p: Define and implement TSYMLINK for 9P2000.L
  9p: Define and implement TLINK for 9P2000.L
  9p: Define and implement TLINK for 9P2000.L
  9p: Implement client side of setattr for 9P2000.L protocol.
  9p: getattr client implementation for 9P2000.L protocol.
  fs/9p: Pass the correct user credentials during attach
  net/9p: Handle the server returned error properly
  9p: readdir implementation for 9p2000.L
  9p: Make use of iounit for read/write
  ...
parents 51102ee5 327aec03

fs/9p/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ obj-$(CONFIG_9P_FS) := 9p.o 
	vfs_dir.o \

	vfs_dentry.o \

	v9fs.o \

	fid.o

	fid.o  \

	xattr.o \

	xattr_user.o



9p-$(CONFIG_9P_FSCACHE) += cache.o

fs/9p/fid.c

+77 −34
Original line number Diff line number Diff line
@@ -97,6 +97,34 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, u32 uid, int any) 
	return ret;

}



/*

 * We need to hold v9ses->rename_sem as long as we hold references

 * to returned path array. Array element contain pointers to

 * dentry names.

 */

static int build_path_from_dentry(struct v9fs_session_info *v9ses,

				  struct dentry *dentry, char ***names)

{

	int n = 0, i;

	char **wnames;

	struct dentry *ds;



	for (ds = dentry; !IS_ROOT(ds); ds = ds->d_parent)

		n++;



	wnames = kmalloc(sizeof(char *) * n, GFP_KERNEL);

	if (!wnames)

		goto err_out;



	for (ds = dentry, i = (n-1); i >= 0; i--, ds = ds->d_parent)

		wnames[i] = (char  *)ds->d_name.name;



	*names = wnames;

	return n;

err_out:

	return -ENOMEM;

}



/**

 * v9fs_fid_lookup - lookup for a fid, try to walk if not found

 * @dentry: dentry to look for fid in
@@ -112,7 +140,7 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) 
	int i, n, l, clone, any, access;

	u32 uid;

	struct p9_fid *fid, *old_fid = NULL;

	struct dentry *d, *ds;

	struct dentry *ds;

	struct v9fs_session_info *v9ses;

	char **wnames, *uname;
@@ -139,49 +167,62 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) 
	fid = v9fs_fid_find(dentry, uid, any);

	if (fid)

		return fid;



	/*

	 * we don't have a matching fid. To do a TWALK we need

	 * parent fid. We need to prevent rename when we want to

	 * look at the parent.

	 */

	down_read(&v9ses->rename_sem);

	ds = dentry->d_parent;

	fid = v9fs_fid_find(ds, uid, any);

	if (!fid) { /* walk from the root */

		n = 0;

		for (ds = dentry; !IS_ROOT(ds); ds = ds->d_parent)

			n++;

	if (fid) {

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

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

		goto fid_out;

	}

	up_read(&v9ses->rename_sem);



		fid = v9fs_fid_find(ds, uid, any);

		if (!fid) { /* the user is not attached to the fs yet */

	/* start from the root and try to do a lookup */

	fid = v9fs_fid_find(dentry->d_sb->s_root, uid, any);

	if (!fid) {

		/* the user is not attached to the fs yet */

		if (access == V9FS_ACCESS_SINGLE)

			return ERR_PTR(-EPERM);



			if (v9fs_proto_dotu(v9ses))

		if (v9fs_proto_dotu(v9ses) || v9fs_proto_dotl(v9ses))

				uname = NULL;

		else

			uname = v9ses->uname;



		fid = p9_client_attach(v9ses->clnt, NULL, uname, uid,

				       v9ses->aname);



		if (IS_ERR(fid))

			return fid;



			v9fs_fid_add(ds, fid);

		v9fs_fid_add(dentry->d_sb->s_root, fid);

	}

	} else /* walk from the parent */

		n = 1;



	if (ds == dentry)

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

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

		return fid;



	wnames = kmalloc(sizeof(char *) * n, GFP_KERNEL);

	if (!wnames)

		return ERR_PTR(-ENOMEM);



	for (d = dentry, i = (n-1); i >= 0; i--, d = d->d_parent)

		wnames[i] = (char *) d->d_name.name;



	/*

	 * Do a multipath walk with attached root.

	 * When walking parent we need to make sure we

	 * don't have a parallel rename happening

	 */

	down_read(&v9ses->rename_sem);

	n  = build_path_from_dentry(v9ses, dentry, &wnames);

	if (n < 0) {

		fid = ERR_PTR(n);

		goto err_out;

	}

	clone = 1;

	i = 0;

	while (i < n) {

		l = min(n - i, P9_MAXWELEM);

		/*

		 * We need to hold rename lock when doing a multipath

		 * walk to ensure none of the patch component change

		 */

		fid = p9_client_walk(fid, l, &wnames[i], clone);

		if (IS_ERR(fid)) {

			if (old_fid) {
@@ -193,15 +234,17 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) 
				p9_client_clunk(old_fid);

			}

			kfree(wnames);

			return fid;

			goto err_out;

		}

		old_fid = fid;

		i += l;

		clone = 0;

	}



	kfree(wnames);

fid_out:

	v9fs_fid_add(dentry, fid);

err_out:

	up_read(&v9ses->rename_sem);

	return fid;

}

fs/9p/v9fs.c

+2 −1
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses, 
		__putname(v9ses->uname);

		return ERR_PTR(-ENOMEM);

	}

	init_rwsem(&v9ses->rename_sem);



	rc = bdi_setup_and_register(&v9ses->bdi, "9p", BDI_CAP_MAP_COPY);

	if (rc) {
@@ -278,7 +279,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses, 
	v9ses->maxdata = v9ses->clnt->msize - P9_IOHDRSZ;



	/* for legacy mode, fall back to V9FS_ACCESS_ANY */

	if (!v9fs_proto_dotu(v9ses) &&

	if (!(v9fs_proto_dotu(v9ses) || v9fs_proto_dotl(v9ses)) &&

		((v9ses->flags&V9FS_ACCESS_MASK) == V9FS_ACCESS_USER)) {



		v9ses->flags &= ~V9FS_ACCESS_MASK;

fs/9p/v9fs.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ struct v9fs_session_info { 
	struct p9_client *clnt;	/* 9p client */

	struct list_head slist; /* list of sessions registered with v9fs */

	struct backing_dev_info bdi;

	struct rw_semaphore rename_sem;

};



struct p9_fid *v9fs_session_init(struct v9fs_session_info *, const char *,

fs/9p/v9fs_vfs.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ struct inode *v9fs_get_inode(struct super_block *sb, int mode); 
void v9fs_clear_inode(struct inode *inode);

ino_t v9fs_qid2ino(struct p9_qid *qid);

void v9fs_stat2inode(struct p9_wstat *, struct inode *, struct super_block *);

void v9fs_stat2inode_dotl(struct p9_stat_dotl *, struct inode *);

int v9fs_dir_release(struct inode *inode, struct file *filp);

int v9fs_file_open(struct inode *inode, struct file *file);

void v9fs_inode2stat(struct inode *inode, struct p9_wstat *stat);

CRA Git | Maintained and supported by SUSTech CRA and CCSE