net/mlx5: Change the acl enable prototype to return status

[cascardo/linux.git] / fs / nfs / nfs3proc.c

diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index a85fdae..dc925b5 100644 (file)
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -893,15 +893,12 @@ static const struct inode_operations nfs3_dir_inode_operations = {
        .mkdir          = nfs_mkdir,
        .rmdir          = nfs_rmdir,
        .mknod          = nfs_mknod,
-       .rename2        = nfs_rename,
+       .rename         = nfs_rename,
        .permission     = nfs_permission,
        .getattr        = nfs_getattr,
        .setattr        = nfs_setattr,
 #ifdef CONFIG_NFS_V3_ACL
        .listxattr      = nfs3_listxattr,
-       .getxattr       = generic_getxattr,
-       .setxattr       = generic_setxattr,
-       .removexattr    = generic_removexattr,
        .get_acl        = nfs3_get_acl,
        .set_acl        = nfs3_set_acl,
 #endif
@@ -913,9 +910,6 @@ static const struct inode_operations nfs3_file_inode_operations = {
        .setattr        = nfs_setattr,
 #ifdef CONFIG_NFS_V3_ACL
        .listxattr      = nfs3_listxattr,
-       .getxattr       = generic_getxattr,
-       .setxattr       = generic_setxattr,
-       .removexattr    = generic_removexattr,
        .get_acl        = nfs3_get_acl,
        .set_acl        = nfs3_set_acl,
 #endif