diff --git a/[refs] b/[refs] index 8197ab8eeff8..3276d6b3af16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3612b49598c303cfb22a4b609427f829828e2427 +refs/heads/master: abd30bb0af9d4671506502278e8631bed9e3c35c diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c index 04b4fb9144a9..12dabe28cf54 100644 --- a/trunk/fs/btrfs/ioctl.c +++ b/trunk/fs/btrfs/ioctl.c @@ -2085,7 +2085,7 @@ static long btrfs_ioctl_trans_start(struct file *file) ret = -ENOMEM; trans = btrfs_start_ioctl_transaction(root, 0); - if (!trans) + if (IS_ERR(trans)) goto out_drop; file->private_data = trans;