Merge branch 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[cascardo/linux.git] / fs / btrfs / ioctl.c

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 7fd939b..18e1aa0 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -349,7 +349,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
 
        btrfs_update_iflags(inode);
        inode_inc_iversion(inode);
-       inode->i_ctime = current_fs_time(inode->i_sb);
+       inode->i_ctime = current_time(inode);
        ret = btrfs_update_inode(trans, root, inode);
 
        btrfs_end_transaction(trans, root);
@@ -445,7 +445,7 @@ static noinline int create_subvol(struct inode *dir,
        struct btrfs_root *root = BTRFS_I(dir)->root;
        struct btrfs_root *new_root;
        struct btrfs_block_rsv block_rsv;
-       struct timespec cur_time = current_fs_time(dir->i_sb);
+       struct timespec cur_time = current_time(dir);
        struct inode *inode;
        int ret;
        int err;
@@ -1903,8 +1903,9 @@ static noinline int may_destroy_subvol(struct btrfs_root *root)
                btrfs_dir_item_key_to_cpu(path->nodes[0], di, &key);
                if (key.objectid == root->root_key.objectid) {
                        ret = -EPERM;
-                       btrfs_err(root->fs_info, "deleting default subvolume "
-                                 "%llu is not allowed", key.objectid);
+                       btrfs_err(root->fs_info,
+                                 "deleting default subvolume %llu is not allowed",
+                                 key.objectid);
                        goto out;
                }
                btrfs_release_path(path);
@@ -3291,7 +3292,7 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans,
 
        inode_inc_iversion(inode);
        if (!no_time_update)
-               inode->i_mtime = inode->i_ctime = current_fs_time(inode->i_sb);
+               inode->i_mtime = inode->i_ctime = current_time(inode);
        /*
         * We round up to the block size at eof when determining which
         * extents to clone above, but shouldn't round up the file size.
@@ -4097,8 +4098,8 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)
        if (IS_ERR_OR_NULL(di)) {
                btrfs_free_path(path);
                btrfs_end_transaction(trans, root);
-               btrfs_err(new_root->fs_info, "Umm, you don't have the default dir"
-                          "item, this isn't going to work");
+               btrfs_err(new_root->fs_info,
+                         "Umm, you don't have the default diritem, this isn't going to work");
                ret = -ENOENT;
                goto out;
        }
@@ -5106,7 +5107,7 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
        struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_root_item *root_item = &root->root_item;
        struct btrfs_trans_handle *trans;
-       struct timespec ct = current_fs_time(inode->i_sb);
+       struct timespec ct = current_time(inode);
        int ret = 0;
        int received_uuid_changed;
 
@@ -5307,8 +5308,9 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)
                return -EFAULT;
 
        if (strnlen(label, BTRFS_LABEL_SIZE) == BTRFS_LABEL_SIZE) {
-               btrfs_err(root->fs_info, "unable to set label with more than %d bytes",
-                      BTRFS_LABEL_SIZE - 1);
+               btrfs_err(root->fs_info,
+                         "unable to set label with more than %d bytes",
+                         BTRFS_LABEL_SIZE - 1);
                return -EINVAL;
        }