From 43587cc5bdd66bd3cea9c55baae1fdcbd3f9f758 Mon Sep 17 00:00:00 2001 From: Sedat Dilek Date: Sat, 2 Apr 2011 12:28:37 +0200 Subject: [PATCH 2/3] nilfs2,ubifs: Fix error empty_aops undefined With the ->sync_page() hook gone, we have a few users that add their own static address_space_operations without any functions defined. This patch fixes the following issues: ERROR: "empty_aops" [fs/ubifs/ubifs.ko] undefined! ERROR: "empty_aops" [fs/nilfs2/nilfs2.ko] undefined! Note: "fs: export empty_aops" patch needs to be reverted first! Signed-off-by: Sedat Dilek --- fs/nilfs2/page.c | 2 +- fs/ubifs/xattr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 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..29d5681 100644 --- a/fs/ubifs/xattr.c +++ b/fs/ubifs/xattr.c @@ -80,7 +80,6 @@ enum { }; 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; /** @@ -100,6 +99,7 @@ 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 = {}; int err; struct inode *inode; struct ubifs_inode *ui, *host_ui = ubifs_inode(host); @@ -130,7 +130,7 @@ 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_mapping->a_ops = &empty_aops; inode->i_op = &none_inode_operations; inode->i_fop = &none_file_operations; -- 1.7.4.3