Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42869c8a authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Eric Van Hensbergen
Browse files

fs/9p: Add v9fs_dentry2v9ses 



Add the new static inline and use the same

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 7add697a

fs/9p/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int v9fs_xattr_get_acl(struct dentry *dentry, const char *name, 
	if (strcmp(name, "") != 0)

		return -EINVAL;



	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	v9ses = v9fs_dentry2v9ses(dentry);

	/*

	 * We allow set/get/list of acl when access=client is not specified

	 */
@@ -312,7 +312,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name, 
	if (strcmp(name, "") != 0)

		return -EINVAL;



	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	v9ses = v9fs_dentry2v9ses(dentry);

	/*

	 * set the attribute on the remote. Without even looking at the

	 * xattr value. We leave it to the server to validate

fs/9p/fid.c

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry, 
	struct v9fs_session_info *v9ses;

	struct p9_fid *fid, *old_fid = NULL;



	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	v9ses = v9fs_dentry2v9ses(dentry);

	access = v9ses->flags & V9FS_ACCESS_MASK;

	fid = v9fs_fid_find(dentry, uid, any);

	if (fid)
@@ -237,7 +237,7 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) 
	int  any, access;

	struct v9fs_session_info *v9ses;



	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	v9ses = v9fs_dentry2v9ses(dentry);

	access = v9ses->flags & V9FS_ACCESS_MASK;

	switch (access) {

	case V9FS_ACCESS_SINGLE:
@@ -290,7 +290,7 @@ struct p9_fid *v9fs_writeback_fid(struct dentry *dentry) 
	struct p9_fid *fid;

	struct v9fs_session_info *v9ses;



	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	v9ses = v9fs_dentry2v9ses(dentry);

	fid = v9fs_fid_clone_with_uid(dentry, 0);

	if (IS_ERR(fid))

		goto error_out;

fs/9p/v9fs.h

+5 −0
Original line number Diff line number Diff line
@@ -174,6 +174,11 @@ static inline struct v9fs_session_info *v9fs_inode2v9ses(struct inode *inode) 
	return (inode->i_sb->s_fs_info);

}



static inline struct v9fs_session_info *v9fs_dentry2v9ses(struct dentry *dentry)

{

	return dentry->d_sb->s_fs_info;

}



static inline int v9fs_proto_dotu(struct v9fs_session_info *v9ses)

{

	return v9ses->flags & V9FS_PROTO_2000U;

fs/9p/vfs_inode.c

+3 −3
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 


	P9_DPRINTK(P9_DEBUG_VFS, "dentry: %p\n", dentry);

	err = -EPERM;

	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	v9ses = v9fs_dentry2v9ses(dentry);

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

		generic_fillattr(dentry->d_inode, stat);

		return 0;
@@ -977,7 +977,7 @@ static int v9fs_vfs_setattr(struct dentry *dentry, struct iattr *iattr) 
		return retval;



	retval = -EPERM;

	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	v9ses = v9fs_dentry2v9ses(dentry);

	fid = v9fs_fid_lookup(dentry);

	if(IS_ERR(fid))

		return PTR_ERR(fid);
@@ -1139,7 +1139,7 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen) 


	P9_DPRINTK(P9_DEBUG_VFS, " %s\n", dentry->d_name.name);

	retval = -EPERM;

	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	v9ses = v9fs_dentry2v9ses(dentry);

	fid = v9fs_fid_lookup(dentry);

	if (IS_ERR(fid))

		return PTR_ERR(fid);

fs/9p/vfs_inode_dotl.c

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ v9fs_vfs_getattr_dotl(struct vfsmount *mnt, struct dentry *dentry, 


	P9_DPRINTK(P9_DEBUG_VFS, "dentry: %p\n", dentry);

	err = -EPERM;

	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	v9ses = v9fs_dentry2v9ses(dentry);

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

		generic_fillattr(dentry->d_inode, stat);

		return 0;
@@ -452,7 +452,7 @@ int v9fs_vfs_setattr_dotl(struct dentry *dentry, struct iattr *iattr) 
	p9attr.mtime_nsec = iattr->ia_mtime.tv_nsec;



	retval = -EPERM;

	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	v9ses = v9fs_dentry2v9ses(dentry);

	fid = v9fs_fid_lookup(dentry);

	if (IS_ERR(fid))

		return PTR_ERR(fid);