Commit 95f5f88f authored by Mike Marshall's avatar Mike Marshall
Browse files

orangefs: formatting cleanups 



Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent f6a4b4c9

fs/orangefs/devorangefs-req.c

+10 −7
Original line number Diff line number Diff line
@@ -284,10 +284,13 @@ static ssize_t orangefs_devreq_read(struct file *file, 
	ret = copy_to_user(buf + sizeof(__s32), &magic, sizeof(__s32));

	if (ret != 0)

		goto error;

	ret = copy_to_user(buf+2 * sizeof(__s32), &cur_op->tag, sizeof(__u64));

	ret = copy_to_user(buf + 2 * sizeof(__s32),

		&cur_op->tag,

		sizeof(__u64));

	if (ret != 0)

		goto error;

	ret = copy_to_user(buf+2*sizeof(__s32)+sizeof(__u64), &cur_op->upcall,

	ret = copy_to_user(buf + 2 * sizeof(__s32) + sizeof(__u64),

		&cur_op->upcall,

		sizeof(struct orangefs_upcall_s));

	if (ret != 0)

		goto error;

fs/orangefs/inode.c

+26 −18
Original line number Diff line number Diff line
@@ -181,16 +181,15 @@ static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr) 
	new_op->upcall.req.truncate.refn = orangefs_inode->refn;

	new_op->upcall.req.truncate.size = (__s64) iattr->ia_size;



	ret = service_operation(new_op, __func__,

	ret = service_operation(new_op,

		__func__,

		get_interruptible_flag(inode));



	/*

	 * the truncate has no downcall members to retrieve, but

	 * the status value tells us if it went through ok or not

	 */

	gossip_debug(GOSSIP_INODE_DEBUG,

		     "orangefs: orangefs_truncate got return value of %d\n",

		     ret);

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



	op_release(new_op);
@@ -212,7 +211,8 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr) 
	struct inode *inode = dentry->d_inode;



	gossip_debug(GOSSIP_INODE_DEBUG,

		     "orangefs_setattr: called on %pd\n",

		"%s: called on %pd\n",

		__func__,

		dentry);



	ret = setattr_prepare(dentry, iattr);
@@ -230,7 +230,8 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr) 


	ret = orangefs_inode_setattr(inode, iattr);

	gossip_debug(GOSSIP_INODE_DEBUG,

		     "orangefs_setattr: inode_setattr returned %d\n",

		"%s: orangefs_inode_setattr returned %d\n",

		__func__,

		ret);



	if (!ret && (iattr->ia_valid & ATTR_MODE))
@@ -238,7 +239,7 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr) 
		ret = posix_acl_chmod(inode, inode->i_mode);



out:

	gossip_debug(GOSSIP_INODE_DEBUG, "orangefs_setattr: returning %d\n", ret);

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

	return ret;

}
@@ -312,7 +313,7 @@ int orangefs_update_time(struct inode *inode, struct timespec *time, int flags) 
	return orangefs_inode_setattr(inode, &iattr);

}



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

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

static const struct inode_operations orangefs_file_inode_operations = {

	.get_acl = orangefs_get_acl,

	.set_acl = orangefs_set_acl,
@@ -350,8 +351,8 @@ static int orangefs_init_iops(struct inode *inode) 
}



/*

 * Given a ORANGEFS object identifier (fsid, handle), convert it into a ino_t type

 * that will be used as a hash-index from where the handle will

 * Given an ORANGEFS object identifier (fsid, handle), convert it into

 * a ino_t type that will be used as a hash-index from where the handle will

 * be searched for in the VFS hash table of inodes.

 */

static inline ino_t orangefs_handle_hash(struct orangefs_object_kref *ref)
@@ -381,8 +382,10 @@ static int orangefs_test_inode(struct inode *inode, void *data) 
	struct orangefs_inode_s *orangefs_inode = NULL;



	orangefs_inode = ORANGEFS_I(inode);

	return (!ORANGEFS_khandle_cmp(&(orangefs_inode->refn.khandle), &(ref->khandle))

		&& orangefs_inode->refn.fs_id == ref->fs_id);

	/* test handles and fs_ids... */

	return (!ORANGEFS_khandle_cmp(&(orangefs_inode->refn.khandle),

				&(ref->khandle)) &&

			orangefs_inode->refn.fs_id == ref->fs_id);

}



/*
@@ -390,16 +393,21 @@ static int orangefs_test_inode(struct inode *inode, void *data) 
 * file handle.

 *

 * @sb: the file system super block instance.

 * @ref: The ORANGEFS object for which we are trying to locate an inode structure.

 * @ref: The ORANGEFS object for which we are trying to locate an inode.

 */

struct inode *orangefs_iget(struct super_block *sb, struct orangefs_object_kref *ref)

struct inode *orangefs_iget(struct super_block *sb,

		struct orangefs_object_kref *ref)

{

	struct inode *inode = NULL;

	unsigned long hash;

	int error;



	hash = orangefs_handle_hash(ref);

	inode = iget5_locked(sb, hash, orangefs_test_inode, orangefs_set_inode, ref);

	inode = iget5_locked(sb,

			hash,

			orangefs_test_inode,

			orangefs_set_inode,

			ref);

	if (!inode || !(inode->i_state & I_NEW))

		return inode;

fs/orangefs/orangefs-utils.c

+11 −7
Original line number Diff line number Diff line
@@ -183,9 +183,9 @@ static inline int copy_attributes_from_inode(struct inode *inode, 
		attrs->mask |= ORANGEFS_ATTR_SYS_CTIME;



	/*

	 * ORANGEFS cannot set size with a setattr operation.  Probably not likely

	 * to be requested through the VFS, but just in case, don't worry about

	 * ATTR_SIZE

	 * ORANGEFS cannot set size with a setattr operation. Probably not

	 * likely to be requested through the VFS, but just in case, don't

	 * worry about ATTR_SIZE

	 */



	if (iattr->ia_valid & ATTR_MODE) {
@@ -200,14 +200,16 @@ static inline int copy_attributes_from_inode(struct inode *inode, 
				tmp_mode -= S_ISVTX;

			} else {

				gossip_debug(GOSSIP_UTILS_DEBUG,

					     "User attempted to set sticky bit on non-root directory; returning EINVAL.\n");

					"%s: setting sticky bit not supported.\n",

					__func__);

				return -EINVAL;

			}

		}



		if (tmp_mode & (S_ISUID)) {

			gossip_debug(GOSSIP_UTILS_DEBUG,

				     "Attempting to set setuid bit (not supported); returning EINVAL.\n");

				"%s: setting setuid bit not supported.\n",

				__func__);

			return -EINVAL;

		}
@@ -521,7 +523,9 @@ int orangefs_normalize_to_errno(__s32 error_code) 
			error_code = -ETIMEDOUT;

		} else {

			/* assume a default error code */

			gossip_err("orangefs: warning: got error code without errno equivalent: %d.\n", error_code);

			gossip_err("%s: bad error code :%d:.\n",

				__func__,

				error_code);

			error_code = -EINVAL;

		}
@@ -538,7 +542,7 @@ int orangefs_normalize_to_errno(__s32 error_code) 
	 * there is a bug somewhere.

	 */

	} else {

		gossip_err("orangefs: orangefs_normalize_to_errno: got error code which is not from ORANGEFS.\n");

		gossip_err("%s: unknown error code.\n", __func__);

		error_code = -EINVAL;

	}

	return error_code;

fs/orangefs/super.c

+5 −4
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	sb = dentry->d_sb;



	gossip_debug(GOSSIP_SUPER_DEBUG,

		     "orangefs_statfs: called on sb %p (fs_id is %d)\n",

			"%s: called on sb %p (fs_id is %d)\n",

			__func__,

			sb,

			(int)(ORANGEFS_SB(sb)->fs_id));
@@ -198,7 +199,7 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf) 


out_op_release:

	op_release(new_op);

	gossip_debug(GOSSIP_SUPER_DEBUG, "orangefs_statfs: returning %d\n", ret);

	gossip_debug(GOSSIP_SUPER_DEBUG, "%s: returning %d\n", __func__, ret);

	return ret;

}

fs/orangefs/file.c

+1 −1

File changed.

Contains only whitespace changes.

fs/orangefs/orangefs-bufmap.c

+2 −2

File changed.

Contains only whitespace changes.