diff options
| author | Chris Mason <clm@fb.com> | 2014-10-04 18:56:45 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-10-04 18:56:45 +0200 |
| commit | bbf65cf0b5b67843ca094df01019222b85af2183 (patch) | |
| tree | 35e1a8c54876cc8a105a2ad0230526195d3cafbf /fs/btrfs/send.c | |
| parent | Btrfs: send, don't delay dir move if there's a new parent inode (diff) | |
| parent | btrfs: move checks for DUMMY_ROOT into a helper (diff) | |
| download | linux-bbf65cf0b5b67843ca094df01019222b85af2183.tar.xz linux-bbf65cf0b5b67843ca094df01019222b85af2183.zip | |
Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/extent_io.c
Diffstat (limited to 'fs/btrfs/send.c')
| -rw-r--r-- | fs/btrfs/send.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index b9c27aa38d76..874828dd0a86 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -5728,7 +5728,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) NULL); sort_clone_roots = 1; - current->journal_info = (void *)BTRFS_SEND_TRANS_STUB; + current->journal_info = BTRFS_SEND_TRANS_STUB; ret = send_subvol(sctx); current->journal_info = NULL; if (ret < 0) |