projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
send.c
diff --git
a/fs/btrfs/send.c
b/fs/btrfs/send.c
index b9c27aa38d76017eb6dce34f2298749bf882174f..874828dd0a8627d8c57097d17303f6db68f76775 100644
(file)
--- 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)