fs/9p: Add inode hashing (5ffc0cb3) · Commits · e / devices / android_kernel_fairphone_FP4

fs/9p/acl.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,8 @@
	#include <linux/posix_acl_xattr.h>		#include <linux/posix_acl_xattr.h>
	#include "xattr.h"		#include "xattr.h"
	#include "acl.h"		#include "acl.h"
	#include "v9fs_vfs.h"
	#include "v9fs.h"		#include "v9fs.h"
			#include "v9fs_vfs.h"

	static struct posix_acl __v9fs_get_acl(struct p9_fid fid, char *name)		static struct posix_acl __v9fs_get_acl(struct p9_fid fid, char *name)
	{		{

fs/9p/v9fs_vfs.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,8 @@ void v9fs_destroy_inode(struct inode *inode);
	#endif		#endif

	struct inode v9fs_get_inode(struct super_block sb, int mode);		struct inode v9fs_get_inode(struct super_block sb, int mode);
			int v9fs_init_inode(struct v9fs_session_info *v9ses,
			struct inode *inode, int mode);
	void v9fs_evict_inode(struct inode *inode);		void v9fs_evict_inode(struct inode *inode);
	ino_t v9fs_qid2ino(struct p9_qid *qid);		ino_t v9fs_qid2ino(struct p9_qid *qid);
	void v9fs_stat2inode(struct p9_wstat , struct inode , struct super_block *);		void v9fs_stat2inode(struct p9_wstat , struct inode , struct super_block *);

fs/9p/vfs_inode.c

+75 −46

Original line number	Original line	Diff line number	Diff line
	@@ -243,26 +243,10 @@ void v9fs_destroy_inode(struct inode *inode)
	}		}
	#endif		#endif

	/**		int v9fs_init_inode(struct v9fs_session_info *v9ses,
	* v9fs_get_inode - helper function to setup an inode		struct inode *inode, int mode)
	* @sb: superblock
	* @mode: mode to setup inode with
	*
	*/

	struct inode v9fs_get_inode(struct super_block sb, int mode)
	{		{
	int err;		int err = 0;
	struct inode *inode;
	struct v9fs_session_info *v9ses = sb->s_fs_info;

	P9_DPRINTK(P9_DEBUG_VFS, "super block: %p mode: %o\n", sb, mode);

	inode = new_inode(sb);
	if (!inode) {
	P9_EPRINTK(KERN_WARNING, "Problem allocating inode\n");
	return ERR_PTR(-ENOMEM);
	}

	inode_init_owner(inode, NULL, mode);		inode_init_owner(inode, NULL, mode);
	inode->i_blocks = 0;		inode->i_blocks = 0;
	@@ -306,7 +290,6 @@ struct inode v9fs_get_inode(struct super_block sb, int mode)
	}		}

	break;		break;

	case S_IFLNK:		case S_IFLNK:
	if (!v9fs_proto_dotu(v9ses) && !v9fs_proto_dotl(v9ses)) {		if (!v9fs_proto_dotu(v9ses) && !v9fs_proto_dotl(v9ses)) {
	P9_DPRINTK(P9_DEBUG_ERROR, "extended modes used with "		P9_DPRINTK(P9_DEBUG_ERROR, "extended modes used with "
	@@ -342,13 +325,38 @@ struct inode v9fs_get_inode(struct super_block sb, int mode)
	err = -EINVAL;		err = -EINVAL;
	goto error;		goto error;
	}		}
			error:
			return err;

	return inode;		}

	error:		/**
			* v9fs_get_inode - helper function to setup an inode
			* @sb: superblock
			* @mode: mode to setup inode with
			*
			*/

			struct inode v9fs_get_inode(struct super_block sb, int mode)
			{
			int err;
			struct inode *inode;
			struct v9fs_session_info *v9ses = sb->s_fs_info;

			P9_DPRINTK(P9_DEBUG_VFS, "super block: %p mode: %o\n", sb, mode);

			inode = new_inode(sb);
			if (!inode) {
			P9_EPRINTK(KERN_WARNING, "Problem allocating inode\n");
			return ERR_PTR(-ENOMEM);
			}
			err = v9fs_init_inode(v9ses, inode, mode);
			if (err) {
	iput(inode);		iput(inode);
	return ERR_PTR(err);		return ERR_PTR(err);
	}		}
			return inode;
			}

	/*		/*
	static struct v9fs_fid*		static struct v9fs_fid*
	@@ -424,39 +432,60 @@ void v9fs_evict_inode(struct inode *inode)
	}		}
	}		}

			static struct inode v9fs_qid_iget(struct super_block sb,
			struct p9_qid *qid,
			struct p9_wstat *st)
			{
			int retval, umode;
			unsigned long i_ino;
			struct inode *inode;
			struct v9fs_session_info *v9ses = sb->s_fs_info;

			i_ino = v9fs_qid2ino(qid);
			inode = iget_locked(sb, i_ino);
			if (!inode)
			return ERR_PTR(-ENOMEM);
			if (!(inode->i_state & I_NEW))
			return inode;
			/*
			* initialize the inode with the stat info
			* FIXME!! we may need support for stale inodes
			* later.
			*/
			umode = p9mode2unixmode(v9ses, st->mode);
			retval = v9fs_init_inode(v9ses, inode, umode);
			if (retval)
			goto error;

			v9fs_stat2inode(st, inode, sb);
			#ifdef CONFIG_9P_FSCACHE
			v9fs_vcookie_set_qid(ret, &st->qid);
			v9fs_cache_inode_get_cookie(inode);
			#endif
			unlock_new_inode(inode);
			return inode;
			error:
			unlock_new_inode(inode);
			iput(inode);
			return ERR_PTR(retval);

			}

	struct inode *		struct inode *
	v9fs_inode(struct v9fs_session_info v9ses, struct p9_fid fid,		v9fs_inode(struct v9fs_session_info v9ses, struct p9_fid fid,
	struct super_block *sb)		struct super_block *sb)
	{		{
	int err, umode;
	struct inode *ret = NULL;
	struct p9_wstat *st;		struct p9_wstat *st;
			struct inode *inode = NULL;

	st = p9_client_stat(fid);		st = p9_client_stat(fid);
	if (IS_ERR(st))		if (IS_ERR(st))
	return ERR_CAST(st);		return ERR_CAST(st);

	umode = p9mode2unixmode(v9ses, st->mode);		inode = v9fs_qid_iget(sb, &st->qid, st);
	ret = v9fs_get_inode(sb, umode);
	if (IS_ERR(ret)) {
	err = PTR_ERR(ret);
	goto error;
	}

	v9fs_stat2inode(st, ret, sb);
	ret->i_ino = v9fs_qid2ino(&st->qid);

	#ifdef CONFIG_9P_FSCACHE
	v9fs_vcookie_set_qid(ret, &st->qid);
	v9fs_cache_inode_get_cookie(ret);
	#endif
	p9stat_free(st);
	kfree(st);
	return ret;
	error:
	p9stat_free(st);		p9stat_free(st);
	kfree(st);		kfree(st);
	return ERR_PTR(err);		return inode;
	}		}

	/**		/**

fs/9p/vfs_inode_dotl.c

+46 −23

Original line number	Original line	Diff line number	Diff line
	@@ -86,40 +86,63 @@ static struct dentry v9fs_dentry_from_dir_inode(struct inode inode)
	return dentry;		return dentry;
	}		}

			static struct inode v9fs_qid_iget_dotl(struct super_block sb,
			struct p9_qid *qid,
			struct p9_fid *fid,
			struct p9_stat_dotl *st)
			{
			int retval;
			unsigned long i_ino;
			struct inode *inode;
			struct v9fs_session_info *v9ses = sb->s_fs_info;

			i_ino = v9fs_qid2ino(qid);
			inode = iget_locked(sb, i_ino);
			if (!inode)
			return ERR_PTR(-ENOMEM);
			if (!(inode->i_state & I_NEW))
			return inode;
			/*
			* initialize the inode with the stat info
			* FIXME!! we may need support for stale inodes
			* later.
			*/
			retval = v9fs_init_inode(v9ses, inode, st->st_mode);
			if (retval)
			goto error;

			v9fs_stat2inode_dotl(st, inode);
			#ifdef CONFIG_9P_FSCACHE
			v9fs_vcookie_set_qid(inode, &st->qid);
			v9fs_cache_inode_get_cookie(inode);
			#endif
			retval = v9fs_get_acl(inode, fid);
			if (retval)
			goto error;

			unlock_new_inode(inode);
			return inode;
			error:
			unlock_new_inode(inode);
			iput(inode);
			return ERR_PTR(retval);

			}

	struct inode *		struct inode *
	v9fs_inode_dotl(struct v9fs_session_info v9ses, struct p9_fid fid,		v9fs_inode_dotl(struct v9fs_session_info v9ses, struct p9_fid fid,
	struct super_block *sb)		struct super_block *sb)
	{		{
	struct inode *ret = NULL;
	int err;
	struct p9_stat_dotl *st;		struct p9_stat_dotl *st;
			struct inode *inode = NULL;

	st = p9_client_getattr_dotl(fid, P9_STATS_BASIC);		st = p9_client_getattr_dotl(fid, P9_STATS_BASIC);
	if (IS_ERR(st))		if (IS_ERR(st))
	return ERR_CAST(st);		return ERR_CAST(st);

	ret = v9fs_get_inode(sb, st->st_mode);		inode = v9fs_qid_iget_dotl(sb, &st->qid, fid, st);
	if (IS_ERR(ret)) {
	err = PTR_ERR(ret);
	goto error;
	}

	v9fs_stat2inode_dotl(st, ret);
	ret->i_ino = v9fs_qid2ino(&st->qid);
	#ifdef CONFIG_9P_FSCACHE
	v9fs_vcookie_set_qid(ret, &st->qid);
	v9fs_cache_inode_get_cookie(ret);
	#endif
	err = v9fs_get_acl(ret, fid);
	if (err) {
	iput(ret);
	goto error;
	}
	kfree(st);
	return ret;
	error:
	kfree(st);		kfree(st);
	return ERR_PTR(err);		return inode;
	}		}

	/**		/**