1 files changed, 11 insertions, 11 deletions

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8fc99fb0c0aa..91419ef79b00 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8563,13 +8563,13 @@ out:
         return retval;
 }
 
-static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
-                               loff_t offset)
+static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
         struct btrfs_root *root = BTRFS_I(inode)->root;
         struct btrfs_dio_data dio_data = { 0 };
+        loff_t offset = iocb->ki_pos;
         size_t count = 0;
         int flags = 0;
         bool wakeup = true;
@@ -8629,7 +8629,7 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
 
         ret = __blockdev_direct_IO(iocb, inode,
                                    BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev,
-                                   iter, offset, btrfs_get_blocks_direct, NULL,
+                                   iter, btrfs_get_blocks_direct, NULL,
                                    btrfs_submit_direct, flags);
         if (iov_iter_rw(iter) == WRITE) {
                 current->journal_info = NULL;
@@ -10494,10 +10494,10 @@ static const struct inode_operations btrfs_dir_inode_operations = {
         .symlink        = btrfs_symlink,
         .setattr        = btrfs_setattr,
         .mknod          = btrfs_mknod,
-        .setxattr       = btrfs_setxattr,
+        .setxattr       = generic_setxattr,
         .getxattr       = generic_getxattr,
         .listxattr      = btrfs_listxattr,
-        .removexattr    = btrfs_removexattr,
+        .removexattr    = generic_removexattr,
         .permission     = btrfs_permission,
         .get_acl        = btrfs_get_acl,
         .set_acl        = btrfs_set_acl,
@@ -10571,10 +10571,10 @@ static const struct address_space_operations btrfs_symlink_aops = {
 static const struct inode_operations btrfs_file_inode_operations = {
         .getattr        = btrfs_getattr,
         .setattr        = btrfs_setattr,
-        .setxattr       = btrfs_setxattr,
+        .setxattr       = generic_setxattr,
         .getxattr       = generic_getxattr,
         .listxattr      = btrfs_listxattr,
-        .removexattr    = btrfs_removexattr,
+        .removexattr    = generic_removexattr,
         .permission     = btrfs_permission,
         .fiemap         = btrfs_fiemap,
         .get_acl        = btrfs_get_acl,
@@ -10585,10 +10585,10 @@ static const struct inode_operations btrfs_special_inode_operations = {
         .getattr        = btrfs_getattr,
         .setattr        = btrfs_setattr,
         .permission     = btrfs_permission,
-        .setxattr       = btrfs_setxattr,
+        .setxattr       = generic_setxattr,
         .getxattr       = generic_getxattr,
         .listxattr      = btrfs_listxattr,
-        .removexattr    = btrfs_removexattr,
+        .removexattr    = generic_removexattr,
         .get_acl        = btrfs_get_acl,
         .set_acl        = btrfs_set_acl,
         .update_time    = btrfs_update_time,
@@ -10599,10 +10599,10 @@ static const struct inode_operations btrfs_symlink_inode_operations = {
         .getattr        = btrfs_getattr,
         .setattr        = btrfs_setattr,
         .permission     = btrfs_permission,
-        .setxattr       = btrfs_setxattr,
+        .setxattr       = generic_setxattr,
         .getxattr       = generic_getxattr,
         .listxattr      = btrfs_listxattr,
-        .removexattr    = btrfs_removexattr,
+        .removexattr    = generic_removexattr,
         .update_time    = btrfs_update_time,
 };