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

Commit 0125f504 authored by Julia Lawall's avatar Julia Lawall Committed by Al Viro
Browse files

adfs: constify adfs_dir_ops structures 



The adfs_dir_ops structures are never modified, so declare them as const.

Done with the help of Coccinelle.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b896fb35

fs/adfs/adfs.h

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct adfs_dir_ops; 
struct adfs_sb_info {

	union { struct {

		struct adfs_discmap *s_map;	/* bh list containing map	 */

		struct adfs_dir_ops *s_dir;	/* directory operations		 */

		const struct adfs_dir_ops *s_dir; /* directory operations	 */

		};

		struct rcu_head rcu;		/* used only at shutdown time	 */

	};
@@ -168,8 +168,8 @@ void __adfs_error(struct super_block *sb, const char *function, 
extern const struct inode_operations adfs_dir_inode_operations;

extern const struct file_operations adfs_dir_operations;

extern const struct dentry_operations adfs_dentry_operations;

extern struct adfs_dir_ops adfs_f_dir_ops;

extern struct adfs_dir_ops adfs_fplus_dir_ops;

extern const struct adfs_dir_ops adfs_f_dir_ops;

extern const struct adfs_dir_ops adfs_fplus_dir_ops;



extern int adfs_dir_update(struct super_block *sb, struct object_info *obj,

			   int wait);

fs/adfs/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ adfs_readdir(struct file *file, struct dir_context *ctx) 
{

	struct inode *inode = file_inode(file);

	struct super_block *sb = inode->i_sb;

	struct adfs_dir_ops *ops = ADFS_SB(sb)->s_dir;

	const struct adfs_dir_ops *ops = ADFS_SB(sb)->s_dir;

	struct object_info obj;

	struct adfs_dir dir;

	int ret = 0;
@@ -69,7 +69,7 @@ adfs_dir_update(struct super_block *sb, struct object_info *obj, int wait) 
{

	int ret = -EINVAL;

#ifdef CONFIG_ADFS_FS_RW

	struct adfs_dir_ops *ops = ADFS_SB(sb)->s_dir;

	const struct adfs_dir_ops *ops = ADFS_SB(sb)->s_dir;

	struct adfs_dir dir;



	printk(KERN_INFO "adfs_dir_update: object %06X in dir %06X\n",
@@ -129,7 +129,7 @@ static int 
adfs_dir_lookup_byname(struct inode *inode, struct qstr *name, struct object_info *obj)

{

	struct super_block *sb = inode->i_sb;

	struct adfs_dir_ops *ops = ADFS_SB(sb)->s_dir;

	const struct adfs_dir_ops *ops = ADFS_SB(sb)->s_dir;

	struct adfs_dir dir;

	int ret;

fs/adfs/dir_f.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ adfs_f_free(struct adfs_dir *dir) 
	dir->sb = NULL;

}



struct adfs_dir_ops adfs_f_dir_ops = {

const struct adfs_dir_ops adfs_f_dir_ops = {

	.read		= adfs_f_read,

	.setpos		= adfs_f_setpos,

	.getnext	= adfs_f_getnext,

fs/adfs/dir_fplus.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ adfs_fplus_free(struct adfs_dir *dir) 
	dir->sb = NULL;

}



struct adfs_dir_ops adfs_fplus_dir_ops = {

const struct adfs_dir_ops adfs_fplus_dir_ops = {

	.read		= adfs_fplus_read,

	.setpos		= adfs_fplus_setpos,

	.getnext	= adfs_fplus_getnext,