Commit ae839184 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lustre: make all struct file_operations constant 



Checkpatch reported several cases of struct file_operations
not being const. This resolves those warnings.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ada25dc

drivers/staging/lustre/lustre/fld/lproc_fld.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ fld_debugfs_cache_flush_release(struct inode *inode, struct file *file) 
	return 0;

}



static struct file_operations fld_debugfs_cache_flush_fops = {

static const struct file_operations fld_debugfs_cache_flush_fops = {

	.owner		= THIS_MODULE,

	.open           = simple_open,

	.write		= fld_debugfs_cache_flush_write,

drivers/staging/lustre/lustre/include/lprocfs_status.h

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 


struct lprocfs_vars {

	const char		*name;

	struct file_operations	*fops;

	const struct file_operations	*fops;

	void			*data;

	/**

	 * sysfs file mode.
@@ -449,7 +449,7 @@ int lprocfs_exp_cleanup(struct obd_export *exp); 
struct dentry *ldebugfs_add_simple(struct dentry *root,

				   char *name,

				   void *data,

				   struct file_operations *fops);

				   const struct file_operations *fops);



int ldebugfs_register_stats(struct dentry *parent,

			    const char *name,
@@ -536,7 +536,7 @@ static int name##_single_open(struct inode *inode, struct file *file) \ 
{									\

	return single_open(file, name##_seq_show, inode->i_private);	\

}									\

static struct file_operations name##_fops = {				\

static const struct file_operations name##_fops = {			\

	.owner   = THIS_MODULE,					    \

	.open    = name##_single_open,				     \

	.read    = seq_read,					       \
@@ -581,7 +581,7 @@ static struct file_operations name##_fops = { \ 
	{								\

		return single_open(file, NULL, inode->i_private);	\

	}								\

	static struct file_operations name##_##type##_fops = {	\

	static const struct file_operations name##_##type##_fops = {	\

		.open	= name##_##type##_open,				\

		.write	= name##_##type##_write,			\

		.release = lprocfs_single_release,			\

drivers/staging/lustre/lustre/llite/file.c

+3 −3
Original line number Diff line number Diff line
@@ -3114,7 +3114,7 @@ int ll_inode_permission(struct inode *inode, int mask) 
}



/* -o localflock - only provides locally consistent flock locks */

struct file_operations ll_file_operations = {

const struct file_operations ll_file_operations = {

	.read_iter = ll_file_read_iter,

	.write_iter = ll_file_write_iter,

	.unlocked_ioctl = ll_file_ioctl,
@@ -3127,7 +3127,7 @@ struct file_operations ll_file_operations = { 
	.flush	  = ll_flush

};



struct file_operations ll_file_operations_flock = {

const struct file_operations ll_file_operations_flock = {

	.read_iter    = ll_file_read_iter,

	.write_iter   = ll_file_write_iter,

	.unlocked_ioctl = ll_file_ioctl,
@@ -3143,7 +3143,7 @@ struct file_operations ll_file_operations_flock = { 
};



/* These are for -o noflock - to return ENOSYS on flock calls */

struct file_operations ll_file_operations_noflock = {

const struct file_operations ll_file_operations_noflock = {

	.read_iter    = ll_file_read_iter,

	.write_iter   = ll_file_write_iter,

	.unlocked_ioctl = ll_file_ioctl,

drivers/staging/lustre/lustre/llite/llite_internal.h

+4 −4
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ struct ll_sb_info { 


	struct ll_ra_info	 ll_ra_info;

	unsigned int	      ll_namelen;

	struct file_operations   *ll_fop;

	const struct file_operations	*ll_fop;



	unsigned int		  ll_md_brw_pages; /* readdir pages per RPC */
@@ -736,9 +736,9 @@ void ll_cl_remove(struct file *file, const struct lu_env *env); 
extern const struct address_space_operations ll_aops;



/* llite/file.c */

extern struct file_operations ll_file_operations;

extern struct file_operations ll_file_operations_flock;

extern struct file_operations ll_file_operations_noflock;

extern const struct file_operations ll_file_operations;

extern const struct file_operations ll_file_operations_flock;

extern const struct file_operations ll_file_operations_noflock;

extern const struct inode_operations ll_file_inode_operations;

int ll_have_md_lock(struct inode *inode, __u64 *bits,

		    enum ldlm_mode l_req_mode);

drivers/staging/lustre/lustre/llite/lproc_llite.c

+3 −3
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
#include "vvp_internal.h"



/* debugfs llite mount point registration */

static struct file_operations ll_rw_extents_stats_fops;

static struct file_operations ll_rw_extents_stats_pp_fops;

static struct file_operations ll_rw_offset_stats_fops;

static const struct file_operations ll_rw_extents_stats_fops;

static const struct file_operations ll_rw_extents_stats_pp_fops;

static const struct file_operations ll_rw_offset_stats_fops;



static ssize_t blocksize_show(struct kobject *kobj, struct attribute *attr,

			      char *buf)

CRA Git | Maintained and supported by SUSTech CRA and CCSE