diff options
| author | Chris Mason <clm@fb.com> | 2014-10-04 09:56:45 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-10-04 09:56:45 -0700 |
| commit | bbf65cf0b5b67843ca094df01019222b85af2183 (patch) | |
| tree | 35e1a8c54876cc8a105a2ad0230526195d3cafbf /fs/btrfs/transaction.c | |
| parent | bf8e8ca6fd4ac6e8edc58b92cffb2ffd51933138 (diff) | |
| parent | fccb84c94a9755f48668e43d0a44d6ecc750900f (diff) | |
| download | talos-obmc-linux-bbf65cf0b5b67843ca094df01019222b85af2183.tar.gz talos-obmc-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/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 86ef8d79c19f..0bcdcc65627f 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -386,7 +386,7 @@ start_transaction(struct btrfs_root *root, u64 num_items, unsigned int type, int ret; /* Send isn't supposed to start transactions. */ - ASSERT(current->journal_info != (void *)BTRFS_SEND_TRANS_STUB); + ASSERT(current->journal_info != BTRFS_SEND_TRANS_STUB); if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state)) return ERR_PTR(-EROFS); |
