From 8e4229b3f2fba246d87b5963fcc4ab3a507b699a Mon Sep 17 00:00:00 2001 From: Sedat Dilek Date: Sat, 2 Apr 2011 10:25:13 +0200 Subject: [PATCH] nilfs2,ubifs: Use empty_aops without any functions defined With the ->sync_page() hook gone, we have a few users that add their own static address_space_operations without any functions defined. Furthermore for UBIFS: 1. Consider inode_operations and file_operations have also no functions defined 2. Move {address_space,inode,file}_operations to create_xattr() 3. Transform to empty_{aops,fops,iops} Signed-off-by: Sedat Dilek --- fs/nilfs2/page.c | 2 +- fs/ubifs/xattr.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 9d2dc6b..e7df3f9 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c @@ -495,7 +495,7 @@ unsigned nilfs_page_count_clean_buffers(struct page *page, void nilfs_mapping_init(struct address_space *mapping, struct backing_dev_info *bdi) { - static const struct address_space_operations empty_aops; + static const struct address_space_operations empty_aops = {}; mapping->host = NULL; mapping->flags = 0; diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c index c74400f..d237c4f 100644 --- a/fs/ubifs/xattr.c +++ b/fs/ubifs/xattr.c @@ -79,10 +79,6 @@ enum { SECURITY_XATTR, }; -static const struct inode_operations none_inode_operations; -static const struct address_space_operations none_address_operations; -static const struct file_operations none_file_operations; - /** * create_xattr - create an extended attribute. * @c: UBIFS file-system description object @@ -100,6 +96,9 @@ static const struct file_operations none_file_operations; static int create_xattr(struct ubifs_info *c, struct inode *host, const struct qstr *nm, const void *value, int size) { + static const struct address_space_operations empty_aops = {}; + static const struct inode_operations empty_iops = {}; + static const struct file_operations empty_fops = {}; int err; struct inode *inode; struct ubifs_inode *ui, *host_ui = ubifs_inode(host); @@ -130,9 +129,9 @@ static int create_xattr(struct ubifs_info *c, struct inode *host, } /* Re-define all operations to be "nothing" */ - inode->i_mapping->a_ops = &none_address_operations; - inode->i_op = &none_inode_operations; - inode->i_fop = &none_file_operations; + inode->i_mapping->a_ops = &empty_aops; + inode->i_op = &empty_iops; + inode->i_fop = &empty_fops; inode->i_flags |= S_SYNC | S_NOATIME | S_NOCMTIME | S_NOQUOTA; ui = ubifs_inode(inode); -- 1.7.4.2