Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[linux-2.6.git] / fs / jfs / namei.c
index 45e5c6f65b2cf77175b4536c1dbb3e055a77862c..e17545e15664d77cf5d3af35c2c34c99123b929d 100644 (file)
@@ -1536,7 +1536,7 @@ const struct inode_operations jfs_dir_inode_operations = {
        .removexattr    = jfs_removexattr,
        .setattr        = jfs_setattr,
 #ifdef CONFIG_JFS_POSIX_ACL
-       .check_acl      = jfs_check_acl,
+       .get_acl        = jfs_get_acl,
 #endif
 };