From patchwork Wed Sep 24 18:23:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 4969331 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 682949F2F0 for ; Wed, 24 Sep 2014 18:23:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7247020253 for ; Wed, 24 Sep 2014 18:23:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4372320115 for ; Wed, 24 Sep 2014 18:23:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751960AbaIXSXP (ORCPT ); Wed, 24 Sep 2014 14:23:15 -0400 Received: from mailrelay005.isp.belgacom.be ([195.238.6.171]:28543 "EHLO mailrelay005.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751134AbaIXSXO (ORCPT ); Wed, 24 Sep 2014 14:23:14 -0400 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AiYOAFkLI1RbtBU3/2dsb2JhbABggw63NgUBcpsRgQkXAXqEMS8jgRo3iEIBs2iQNIYSigwdhDUFnSGMNYkfg2Q7L4JKAQEB Received: from 55.21-180-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.180.21.55]) by relay.skynet.be with ESMTP; 24 Sep 2014 20:23:12 +0200 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: clm@fb.com, jbacik@fb.com, linux-btrfs@vger.kernel.org, Fabian Frederick Subject: [PATCH 1/1 linux-next] Btrfs: fix compilation errors under DEBUG Date: Wed, 24 Sep 2014 20:23:05 +0200 Message-Id: <1411582985-17734-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.9.3 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP bi_sector and bi_size moved to bi_iter since commit 4f024f3797c4 ("block: Abstract out bvec iterator") Signed-off-by: Fabian Frederick --- fs/btrfs/volumes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 5b5a5c4..d47289c 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5708,8 +5708,8 @@ static void submit_stripe_bio(struct btrfs_root *root, struct btrfs_bio *bbio, name = rcu_dereference(dev->name); pr_debug("btrfs_map_bio: rw %d, sector=%llu, dev=%lu " "(%s id %llu), size=%u\n", rw, - (u64)bio->bi_sector, (u_long)dev->bdev->bd_dev, - name->str, dev->devid, bio->bi_size); + (u64)bio->bi_iter.bi_sector, (u_long)dev->bdev->bd_dev, + name->str, dev->devid, bio->bi_iter.bi_size); rcu_read_unlock(); } #endif