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

Commit 8bb8aefd authored by Yi Liu's avatar Yi Liu Committed by Mike Marshall
Browse files

OrangeFS: Change almost all instances of the string PVFS2 to OrangeFS. 



OrangeFS was formerly known as PVFS2 and retains the name in many places.

I leave the device /dev/pvfs2-req since this affects userspace.

I leave the filesystem type pvfs2 since this affects userspace. Further
the OrangeFS sysint library reads fstab for an entry of type pvfs2
independently of kernel mounts.

I leave extended attribute keys user.pvfs2 and system.pvfs2 as the
sysint library understands these.

I leave references to userspace binaries still named pvfs2.

I leave the filenames.

Signed-off-by: default avatarYi Liu <yi9@clemson.edu>
[martin@omnibond.com: clairify above constraints and merge]
Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent 555fa0fa

fs/orangefs/acl.c

+21 −21
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/posix_acl_xattr.h>

#include <linux/fs_struct.h>



struct posix_acl *pvfs2_get_acl(struct inode *inode, int type)

struct posix_acl *orangefs_get_acl(struct inode *inode, int type)

{

	struct posix_acl *acl;

	int ret;
@@ -18,23 +18,23 @@ struct posix_acl *pvfs2_get_acl(struct inode *inode, int type) 


	switch (type) {

	case ACL_TYPE_ACCESS:

		key = PVFS2_XATTR_NAME_ACL_ACCESS;

		key = ORANGEFS_XATTR_NAME_ACL_ACCESS;

		break;

	case ACL_TYPE_DEFAULT:

		key = PVFS2_XATTR_NAME_ACL_DEFAULT;

		key = ORANGEFS_XATTR_NAME_ACL_DEFAULT;

		break;

	default:

		gossip_err("pvfs2_get_acl: bogus value of type %d\n", type);

		gossip_err("orangefs_get_acl: bogus value of type %d\n", type);

		return ERR_PTR(-EINVAL);

	}

	/*

	 * Rather than incurring a network call just to determine the exact

	 * length of the attribute, I just allocate a max length to save on

	 * the network call. Conceivably, we could pass NULL to

	 * pvfs2_inode_getxattr() to probe the length of the value, but

	 * orangefs_inode_getxattr() to probe the length of the value, but

	 * I don't do that for now.

	 */

	value = kmalloc(PVFS_MAX_XATTR_VALUELEN, GFP_KERNEL);

	value = kmalloc(ORANGEFS_MAX_XATTR_VALUELEN, GFP_KERNEL);

	if (value == NULL)

		return ERR_PTR(-ENOMEM);
@@ -43,11 +43,11 @@ struct posix_acl *pvfs2_get_acl(struct inode *inode, int type) 
		     get_khandle_from_ino(inode),

		     key,

		     type);

	ret = pvfs2_inode_getxattr(inode,

	ret = orangefs_inode_getxattr(inode,

				   "",

				   key,

				   value,

				   PVFS_MAX_XATTR_VALUELEN);

				   ORANGEFS_MAX_XATTR_VALUELEN);

	/* if the key exists, convert it to an in-memory rep */

	if (ret > 0) {

		acl = posix_acl_from_xattr(&init_user_ns, value, ret);
@@ -64,9 +64,9 @@ struct posix_acl *pvfs2_get_acl(struct inode *inode, int type) 
	return acl;

}



int pvfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)

int orangefs_set_acl(struct inode *inode, struct posix_acl *acl, int type)

{

	struct pvfs2_inode_s *pvfs2_inode = PVFS2_I(inode);

	struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode);

	int error = 0;

	void *value = NULL;

	size_t size = 0;
@@ -74,7 +74,7 @@ int pvfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type) 


	switch (type) {

	case ACL_TYPE_ACCESS:

		name = PVFS2_XATTR_NAME_ACL_ACCESS;

		name = ORANGEFS_XATTR_NAME_ACL_ACCESS;

		if (acl) {

			umode_t mode = inode->i_mode;

			/*
@@ -90,7 +90,7 @@ int pvfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
			}



			if (inode->i_mode != mode)

				SetModeFlag(pvfs2_inode);

				SetModeFlag(orangefs_inode);

			inode->i_mode = mode;

			mark_inode_dirty_sync(inode);

			if (error == 0)
@@ -98,7 +98,7 @@ int pvfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
		}

		break;

	case ACL_TYPE_DEFAULT:

		name = PVFS2_XATTR_NAME_ACL_DEFAULT;

		name = ORANGEFS_XATTR_NAME_ACL_DEFAULT;

		break;

	default:

		gossip_err("%s: invalid type %d!\n", __func__, type);
@@ -131,7 +131,7 @@ int pvfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	 * will xlate to a removexattr. However, we don't want removexattr

	 * complain if attributes does not exist.

	 */

	error = pvfs2_inode_setxattr(inode, "", name, value, size, 0);

	error = orangefs_inode_setxattr(inode, "", name, value, size, 0);



out:

	kfree(value);
@@ -140,35 +140,35 @@ int pvfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	return error;

}



int pvfs2_init_acl(struct inode *inode, struct inode *dir)

int orangefs_init_acl(struct inode *inode, struct inode *dir)

{

	struct pvfs2_inode_s *pvfs2_inode = PVFS2_I(inode);

	struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode);

	struct posix_acl *default_acl, *acl;

	umode_t mode = inode->i_mode;

	int error = 0;



	ClearModeFlag(pvfs2_inode);

	ClearModeFlag(orangefs_inode);



	error = posix_acl_create(dir, &mode, &default_acl, &acl);

	if (error)

		return error;



	if (default_acl) {

		error = pvfs2_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);

		error = orangefs_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);

		posix_acl_release(default_acl);

	}



	if (acl) {

		if (!error)

			error = pvfs2_set_acl(inode, acl, ACL_TYPE_ACCESS);

			error = orangefs_set_acl(inode, acl, ACL_TYPE_ACCESS);

		posix_acl_release(acl);

	}



	/* If mode of the inode was changed, then do a forcible ->setattr */

	if (mode != inode->i_mode) {

		SetModeFlag(pvfs2_inode);

		SetModeFlag(orangefs_inode);

		inode->i_mode = mode;

		pvfs2_flush_inode(inode);

		orangefs_flush_inode(inode);

	}



	return error;

fs/orangefs/dcache.c

+12 −12
Original line number Diff line number Diff line
@@ -12,27 +12,27 @@ 
#include "pvfs2-kernel.h"



/* Returns 1 if dentry can still be trusted, else 0. */

static int pvfs2_revalidate_lookup(struct dentry *dentry)

static int orangefs_revalidate_lookup(struct dentry *dentry)

{

	struct dentry *parent_dentry = dget_parent(dentry);

	struct inode *parent_inode = parent_dentry->d_inode;

	struct pvfs2_inode_s *parent = PVFS2_I(parent_inode);

	struct orangefs_inode_s *parent = ORANGEFS_I(parent_inode);

	struct inode *inode = dentry->d_inode;

	struct pvfs2_kernel_op_s *new_op;

	struct orangefs_kernel_op_s *new_op;

	int ret = 0;

	int err = 0;



	gossip_debug(GOSSIP_DCACHE_DEBUG, "%s: attempting lookup.\n", __func__);



	new_op = op_alloc(PVFS2_VFS_OP_LOOKUP);

	new_op = op_alloc(ORANGEFS_VFS_OP_LOOKUP);

	if (!new_op)

		goto out_put_parent;



	new_op->upcall.req.lookup.sym_follow = PVFS2_LOOKUP_LINK_NO_FOLLOW;

	new_op->upcall.req.lookup.sym_follow = ORANGEFS_LOOKUP_LINK_NO_FOLLOW;

	new_op->upcall.req.lookup.parent_refn = parent->refn;

	strncpy(new_op->upcall.req.lookup.d_name,

		dentry->d_name.name,

		PVFS2_NAME_LEN);

		ORANGEFS_NAME_LEN);



	gossip_debug(GOSSIP_DCACHE_DEBUG,

		     "%s:%s:%d interrupt flag [%d]\n",
@@ -41,7 +41,7 @@ static int pvfs2_revalidate_lookup(struct dentry *dentry) 
		     __LINE__,

		     get_interruptible_flag(parent_inode));



	err = service_operation(new_op, "pvfs2_lookup",

	err = service_operation(new_op, "orangefs_lookup",

			get_interruptible_flag(parent_inode));

	if (err)

		goto out_drop;
@@ -79,7 +79,7 @@ static int pvfs2_revalidate_lookup(struct dentry *dentry) 
 *

 * Should return 1 if dentry can still be trusted, else 0

 */

static int pvfs2_d_revalidate(struct dentry *dentry, unsigned int flags)

static int orangefs_d_revalidate(struct dentry *dentry, unsigned int flags)

{

	struct inode *inode;

	int ret = 0;
@@ -105,7 +105,7 @@ static int pvfs2_d_revalidate(struct dentry *dentry, unsigned int flags) 
	 * exists, but is still in the expected place in the name space

	 */

	if (!is_root_handle(inode)) {

		if (!pvfs2_revalidate_lookup(dentry))

		if (!orangefs_revalidate_lookup(dentry))

			goto invalid_exit;

	} else {

		gossip_debug(GOSSIP_DCACHE_DEBUG,
@@ -119,7 +119,7 @@ static int pvfs2_d_revalidate(struct dentry *dentry, unsigned int flags) 
		     __func__,

		     inode,

		     get_khandle_from_ino(inode));

	ret = pvfs2_inode_getattr(inode, PVFS_ATTR_SYS_ALL_NOHINT);

	ret = orangefs_inode_getattr(inode, ORANGEFS_ATTR_SYS_ALL_NOHINT);

	gossip_debug(GOSSIP_DCACHE_DEBUG,

		     "%s: getattr %s (ret = %d), returning %s for dentry i_count=%d\n",

		     __func__,
@@ -137,6 +137,6 @@ static int pvfs2_d_revalidate(struct dentry *dentry, unsigned int flags) 
	return 0;

}



const struct dentry_operations pvfs2_dentry_operations = {

	.d_revalidate = pvfs2_d_revalidate,

const struct dentry_operations orangefs_dentry_operations = {

	.d_revalidate = orangefs_d_revalidate,

};