Commit 2976c19c authored by Chengguang Xu's avatar Chengguang Xu Committed by Richard Weinberger
Browse files

ubifs: Code cleanup by removing ifdef macro surrounding 



Define ubifs_listxattr and ubifs_xattr_handlers to NULL
when CONFIG_UBIFS_FS_XATTR is not enabled, then we can
remove many ugly ifdef macros in the code.

Signed-off-by: default avatarChengguang Xu <cgxu519@mykernel.net>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 8fdaaf4c

fs/ubifs/dir.c

+0 −2
Original line number Diff line number Diff line
@@ -1630,9 +1630,7 @@ const struct inode_operations ubifs_dir_inode_operations = { 
	.rename      = ubifs_rename,

	.setattr     = ubifs_setattr,

	.getattr     = ubifs_getattr,

#ifdef CONFIG_UBIFS_FS_XATTR

	.listxattr   = ubifs_listxattr,

#endif

	.update_time = ubifs_update_time,

	.tmpfile     = ubifs_tmpfile,

};

fs/ubifs/file.c

+0 −4
Original line number Diff line number Diff line
@@ -1645,9 +1645,7 @@ const struct address_space_operations ubifs_file_address_operations = { 
const struct inode_operations ubifs_file_inode_operations = {

	.setattr     = ubifs_setattr,

	.getattr     = ubifs_getattr,

#ifdef CONFIG_UBIFS_FS_XATTR

	.listxattr   = ubifs_listxattr,

#endif

	.update_time = ubifs_update_time,

};
@@ -1655,9 +1653,7 @@ const struct inode_operations ubifs_symlink_inode_operations = { 
	.get_link    = ubifs_get_link,

	.setattr     = ubifs_setattr,

	.getattr     = ubifs_getattr,

#ifdef CONFIG_UBIFS_FS_XATTR

	.listxattr   = ubifs_listxattr,

#endif

	.update_time = ubifs_update_time,

};

fs/ubifs/super.c

+0 −2
Original line number Diff line number Diff line
@@ -2207,9 +2207,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) 
	if (c->max_inode_sz > MAX_LFS_FILESIZE)

		sb->s_maxbytes = c->max_inode_sz = MAX_LFS_FILESIZE;

	sb->s_op = &ubifs_super_operations;

#ifdef CONFIG_UBIFS_FS_XATTR

	sb->s_xattr = ubifs_xattr_handlers;

#endif

	fscrypt_set_ops(sb, &ubifs_crypt_operations);



	mutex_lock(&c->umount_mutex);

fs/ubifs/ubifs.h

+4 −2
Original line number Diff line number Diff line
@@ -2000,17 +2000,19 @@ int ubifs_getattr(const struct path *path, struct kstat *stat, 
int ubifs_check_dir_empty(struct inode *dir);



/* xattr.c */

extern const struct xattr_handler *ubifs_xattr_handlers[];

ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size);

int ubifs_xattr_set(struct inode *host, const char *name, const void *value,

		    size_t size, int flags, bool check_lock);

ssize_t ubifs_xattr_get(struct inode *host, const char *name, void *buf,

			size_t size);



#ifdef CONFIG_UBIFS_FS_XATTR

extern const struct xattr_handler *ubifs_xattr_handlers[];

ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size);

void ubifs_evict_xattr_inode(struct ubifs_info *c, ino_t xattr_inum);

int ubifs_purge_xattrs(struct inode *host);

#else

#define ubifs_listxattr NULL

#define ubifs_xattr_handlers NULL

static inline void ubifs_evict_xattr_inode(struct ubifs_info *c,

					   ino_t xattr_inum) { }

static inline int ubifs_purge_xattrs(struct inode *host)