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

Commit 933287da authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Mike Marshall
Browse files

orangefs: Implement inode_operations->permission(). 



Thus d_revalidate is not obliged to check on as much, which will
eventually lead the way to hammering the filesystem servers much less.

Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent fe88adc3

fs/orangefs/dcache.c

+2 −1
Original line number Diff line number Diff line
@@ -119,8 +119,9 @@ static int orangefs_d_revalidate(struct dentry *dentry, unsigned int flags) 
		goto out;



	/* Now we must perform a getattr to validate the inode contents. */



	ret = orangefs_inode_getattr(dentry->d_inode,

	    ORANGEFS_ATTR_SYS_ALL_NOHINT, 1);

	    ORANGEFS_ATTR_SYS_TYPE|ORANGEFS_ATTR_SYS_LNK_TARGET, 1);

	if (ret < 0) {

		gossip_debug(GOSSIP_DCACHE_DEBUG, "%s:%s:%d getattr failure.\n",

		    __FILE__, __func__, __LINE__);

fs/orangefs/inode.c

+19 −0
Original line number Diff line number Diff line
@@ -291,6 +291,24 @@ int orangefs_getattr(struct vfsmount *mnt, 
	return ret;

}



int orangefs_permission(struct inode *inode, int mask)

{

	int ret;



	if (mask & MAY_NOT_BLOCK)

		return -ECHILD;



	gossip_debug(GOSSIP_INODE_DEBUG, "%s: refreshing\n", __func__);



	/* Make sure the permission (and other common attrs) are up to date. */

	ret = orangefs_inode_getattr(inode,

	    ORANGEFS_ATTR_SYS_ALL_NOHINT_NOSIZE, 0);

	if (ret < 0)

		return ret;



	return generic_permission(inode, mask);

}



/* ORANGEDS2 implementation of VFS inode operations for files */

struct inode_operations orangefs_file_inode_operations = {

	.get_acl = orangefs_get_acl,
@@ -301,6 +319,7 @@ struct inode_operations orangefs_file_inode_operations = { 
	.getxattr = generic_getxattr,

	.listxattr = orangefs_listxattr,

	.removexattr = generic_removexattr,

	.permission = orangefs_permission,

};



static int orangefs_init_iops(struct inode *inode)

fs/orangefs/namei.c

+1 −0
Original line number Diff line number Diff line
@@ -443,4 +443,5 @@ struct inode_operations orangefs_dir_inode_operations = { 
	.getxattr = generic_getxattr,

	.removexattr = generic_removexattr,

	.listxattr = orangefs_listxattr,

	.permission = orangefs_permission,

};

fs/orangefs/orangefs-kernel.h

+2 −0
Original line number Diff line number Diff line
@@ -493,6 +493,8 @@ int orangefs_getattr(struct vfsmount *mnt, 
		  struct dentry *dentry,

		  struct kstat *kstat);



int orangefs_permission(struct inode *inode, int mask);



/*

 * defined in xattr.c

 */

fs/orangefs/protocol.h

+9 −0
Original line number Diff line number Diff line
@@ -205,6 +205,15 @@ typedef __s64 ORANGEFS_offset; 
	 ORANGEFS_ATTR_SYS_MIRROR_COPIES_COUNT	|	\

	 ORANGEFS_ATTR_SYS_DIRENT_COUNT		|	\

	 ORANGEFS_ATTR_SYS_BLKSIZE)



#define ORANGEFS_ATTR_SYS_ALL_NOHINT_NOSIZE		\

	(ORANGEFS_ATTR_SYS_COMMON_ALL		|	\

	 ORANGEFS_ATTR_SYS_LNK_TARGET		|	\

	 ORANGEFS_ATTR_SYS_DFILE_COUNT		|	\

	 ORANGEFS_ATTR_SYS_MIRROR_COPIES_COUNT	|	\

	 ORANGEFS_ATTR_SYS_DIRENT_COUNT		|	\

	 ORANGEFS_ATTR_SYS_BLKSIZE)



#define ORANGEFS_XATTR_REPLACE 0x2

#define ORANGEFS_XATTR_CREATE  0x1

#define ORANGEFS_MAX_SERVER_ADDR_LEN 256