Merge remote-tracking branch 'scott/next' into next

[~andy/linux] / fs / reiserfs / file.c

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index dcaafcfc23b007c845f490a4f293cc485c324b51..ed58d843d57856ac3cdc87288465d0d5156708e9 100644 (file)
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -260,4 +260,5 @@ const struct inode_operations reiserfs_file_inode_operations = {
        .removexattr = reiserfs_removexattr,
        .permission = reiserfs_permission,
        .get_acl = reiserfs_get_acl,
+       .set_acl = reiserfs_set_acl,
 };