From: Andreas Gruenbacher <agruen@suse.de>
This pattern from 2.4 times doesn't work very well anymore :(
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/fs/nfs/inode.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -puN fs/nfs/inode.c~nfsacl-client-side-of-nfsacl-fix fs/nfs/inode.c
--- 25/fs/nfs/inode.c~nfsacl-client-side-of-nfsacl-fix Thu Jan 27 16:07:35 2005
+++ 25-akpm/fs/nfs/inode.c Thu Jan 27 16:07:35 2005
@@ -674,7 +674,7 @@ nfs_init_locked(struct inode *inode, voi
#define NFS_LIMIT_READDIRPLUS (8*PAGE_SIZE)
#ifdef CONFIG_NFS_ACL
-static struct inode_operations nfs_special_inode_operations[] = {{
+static struct inode_operations nfs_special_inode_operations = {
.permission = nfs_permission,
.getattr = nfs_getattr,
.setattr = nfs_setattr,
@@ -682,9 +682,7 @@ static struct inode_operations nfs_speci
.getxattr = nfs_getxattr,
.setxattr = nfs_setxattr,
.removexattr = nfs_removexattr,
-}};
-#else
-#define nfs_special_inode_operations NULL
+};
#endif /* CONFIG_NFS_ACL */
/*
@@ -741,7 +739,9 @@ nfs_fhget(struct super_block *sb, struct
} else if (S_ISLNK(inode->i_mode))
inode->i_op = &nfs_symlink_inode_operations;
else {
- inode->i_op = nfs_special_inode_operations;
+#ifdef CONFIG_NFS_ACL
+ inode->i_op = &nfs_special_inode_operations;
+#endif
init_special_inode(inode, inode->i_mode, fattr->rdev);
}
_