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

Commit 091a0f27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.18-ofs' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux 

Pull orangefs updates from Mike Marshall:
 "Fixes and cleanups:

   - fix some sparse warnings

   - cleanup some code formatting

   - fix up some attribute/meta-data related code"

* tag 'for-linus-4.18-ofs' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: use sparse annotations for holding locks across function calls.
  orangefs: make debug_help_fops static
  orangefs: remove unused function orangefs_get_bufmap_init
  orangefs: specify user pointers when using dev_map_desc and bufmap
  orangefs: formatting cleanups
  orangefs: set i_size on new symlink
  orangefs: report attributes_mask and attributes for statx
  orangefs: make struct orangefs_file_vm_ops static
  orangefs: revamp block sizes
parents 70f2ae1f b1116bc0

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/file.c

+2 −2
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static int orangefs_fault(struct vm_fault *vmf) 
	return filemap_fault(vmf);

}



const struct vm_operations_struct orangefs_file_vm_ops = {

static const struct vm_operations_struct orangefs_file_vm_ops = {

	.fault = orangefs_fault,

	.map_pages = filemap_map_pages,

	.page_mkwrite = filemap_page_mkwrite,

fs/orangefs/inode.c

+35 −22
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ static int read_one_page(struct page *page) 
	int max_block;

	ssize_t bytes_read = 0;

	struct inode *inode = page->mapping->host;

	const __u32 blocksize = PAGE_SIZE;	/* inode->i_blksize */

	const __u32 blockbits = PAGE_SHIFT;	/* inode->i_blkbits */

	const __u32 blocksize = PAGE_SIZE;

	const __u32 blockbits = PAGE_SHIFT;

	struct iov_iter to;

	struct bio_vec bv = {.bv_page = page, .bv_len = PAGE_SIZE};
@@ -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;

}
@@ -262,13 +263,19 @@ int orangefs_getattr(const struct path *path, struct kstat *stat, 


		/* override block size reported to stat */

		orangefs_inode = ORANGEFS_I(inode);

		stat->blksize = orangefs_inode->blksize;



		if (request_mask & STATX_SIZE)

			stat->result_mask = STATX_BASIC_STATS;

		else

			stat->result_mask = STATX_BASIC_STATS &

			    ~STATX_SIZE;



		stat->attributes_mask = STATX_ATTR_IMMUTABLE |

		    STATX_ATTR_APPEND;

		if (inode->i_flags & S_IMMUTABLE)

			stat->attributes |= STATX_ATTR_IMMUTABLE;

		if (inode->i_flags & S_APPEND)

			stat->attributes |= STATX_ATTR_APPEND;

	}

	return ret;

}
@@ -306,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,
@@ -325,7 +332,6 @@ static int orangefs_init_iops(struct inode *inode) 
	case S_IFREG:

		inode->i_op = &orangefs_file_inode_operations;

		inode->i_fop = &orangefs_file_operations;

		inode->i_blkbits = PAGE_SHIFT;

		break;

	case S_IFLNK:

		inode->i_op = &orangefs_symlink_inode_operations;
@@ -345,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)
@@ -376,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);

}



/*
@@ -385,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/namei.c

+7 −0
Original line number Diff line number Diff line
@@ -278,6 +278,13 @@ static int orangefs_symlink(struct inode *dir, 
		ret = PTR_ERR(inode);

		goto out;

	}

	/*

	 * This is necessary because orangefs_inode_getattr will not

	 * re-read symlink size as it is impossible for it to change.

	 * Invalidating the cache does not help.  orangefs_new_inode

	 * does not set the correct size (it does not know symname).

	 */

	inode->i_size = strlen(symname);



	gossip_debug(GOSSIP_NAME_DEBUG,

		     "Assigned symlink inode new number of %pU\n",

fs/orangefs/orangefs-bufmap.c

+3 −17
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int get(struct slot_map *m) 


/* used to describe mapped buffers */

struct orangefs_bufmap_desc {

	void *uaddr;			/* user space address pointer */

	void __user *uaddr;		/* user space address pointer */

	struct page **page_array;	/* array of mapped pages */

	int array_count;		/* size of above arrays */

	struct list_head list_link;
@@ -215,20 +215,6 @@ int orangefs_bufmap_shift_query(void) 
static DECLARE_WAIT_QUEUE_HEAD(bufmap_waitq);

static DECLARE_WAIT_QUEUE_HEAD(readdir_waitq);



/*

 * orangefs_get_bufmap_init

 *

 * If bufmap_init is 1, then the shared memory system, including the

 * buffer_index_array, is available.  Otherwise, it is not.

 *

 * returns the value of bufmap_init

 */

int orangefs_get_bufmap_init(void)

{

	return __orangefs_bufmap ? 1 : 0;

}





static struct orangefs_bufmap *

orangefs_bufmap_alloc(struct ORANGEFS_dev_map_desc *user_desc)

{