From patchwork Sat Jul 30 21:45:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaun Tancheff X-Patchwork-Id: 9253247 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A82256075F for ; Sat, 30 Jul 2016 21:54:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82D9C26E5D for ; Sat, 30 Jul 2016 21:54:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62A9F2846F; Sat, 30 Jul 2016 21:54:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE7DF26E5D for ; Sat, 30 Jul 2016 21:54:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753295AbcG3VyO (ORCPT ); Sat, 30 Jul 2016 17:54:14 -0400 Received: from smtp78.mediacombb.net ([68.66.77.78]:37053 "EHLO dsmdc-mail-smtp.mcomdc.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753010AbcG3VyL (ORCPT ); Sat, 30 Jul 2016 17:54:11 -0400 X-Greylist: delayed 496 seconds by postgrey-1.27 at vger.kernel.org; Sat, 30 Jul 2016 17:54:11 EDT Received: from helios ([173.23.249.37]) by njtocomv03.mcomdc.com with bizsmtp id R9lo1t0100p9T5H019lpEY; Sat, 30 Jul 2016 17:45:52 -0400 X-Originating-IP: 173.23.249.37 X-Authenticated-User: shaun@helios.aeonazure.com X-COS-Tag: onnet X-Outbound-Route: TO X-Authenticated-Sender: shaun@helios.aeonazure.com X-Authority-Analysis: v=2.1 cv=DPgB4k9b c=1 sm=1 tr=0 a=ZifPZbLpJbm8c8CM908FCQ==:117 a=ZifPZbLpJbm8c8CM908FCQ==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=cAmyUtKerLwA:10 a=EuZcC4tqAAAA:8 a=FOH2dFAWAAAA:8 a=iox4zFpeAAAA:8 a=20KFwNOVAAAA:8 a=YkbxKbqCtXjs65w6EY0A:9 a=YWHuETu_l3oCD8oP:21 a=3m2A88XW22T3Chw0:21 a=l7Wp3zg9uN2vRs__q-dP:22 a=i3VuKzQdj-NEYjvDI-p3:22 a=WzC6qhA0u3u7Ye7llzcV:22 a=e_O65bzb51kRm2y5VmPK:22 X-Authenticated-Sender: shaun@helios.aeonazure.com Received: from shaun by helios with local (Exim 4.87) (envelope-from ) id 1bTc4q-0005Ka-DN; Sat, 30 Jul 2016 16:45:48 -0500 From: Shaun Tancheff To: linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Shaun Tancheff , Jens Axboe , Jens Axboe , Chris Mason , Josef Bacik , David Sterba , Mike Christie Subject: Fixup direct bi_rw modifiers Date: Sat, 30 Jul 2016 16:45:48 -0500 Message-Id: <1469915148-20452-1-git-send-email-shaun@tancheff.com> X-Mailer: git-send-email 2.8.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP bi_rw should be using bio_set_op_attrs to set bi_rw. Signed-off-by: Shaun Tancheff Cc: Chris Mason Cc: Josef Bacik Cc: David Sterba Cc: Mike Christie Reviewed-by: Christoph Hellwig --- Patch is against linux-next tag next-20160729 NOTE: In 4.7 this was not including the 'WRITE' macro so may have it may not have been operating as intended. --- fs/btrfs/extent_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index f67d6a1..720e6ef 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2050,7 +2050,7 @@ int repair_io_failure(struct inode *inode, u64 start, u64 length, u64 logical, return -EIO; } bio->bi_bdev = dev->bdev; - bio->bi_rw = WRITE_SYNC; + bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_SYNC); bio_add_page(bio, page, length, pg_offset); if (btrfsic_submit_bio_wait(bio)) {