diff --git a/[refs] b/[refs] index 9627b110e492..20d737acdbe1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04bd27aed1459ff4d63d1ab6b0ac26b1e550a121 +refs/heads/master: 9c017abc50f00e80aee6a705a9207fa818a48dda diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index 811d9f918b1c..d24a841a8722 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/fs/btrfs/disk-io.c @@ -2732,7 +2732,7 @@ static int write_dev_flush(struct btrfs_device *device, int wait) * one reference for us, and we leave it for the * caller */ - device->flush_bio = NULL;; + device->flush_bio = NULL; bio = bio_alloc(GFP_NOFS, 0); if (!bio) return -ENOMEM;