From patchwork Fri Oct 11 11:52:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 3023481 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 57FB69F243 for ; Fri, 11 Oct 2013 11:45:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A0C320322 for ; Fri, 11 Oct 2013 11:45:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C22120254 for ; Fri, 11 Oct 2013 11:45:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755102Ab3JKLp2 (ORCPT ); Fri, 11 Oct 2013 07:45:28 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:48974 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753214Ab3JKLp0 (ORCPT ); Fri, 11 Oct 2013 07:45:26 -0400 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r9BBjK84029021 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 Oct 2013 11:45:20 GMT Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r9BBjJhN022763 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 11 Oct 2013 11:45:19 GMT Received: from abhmt105.oracle.com (abhmt105.oracle.com [141.146.116.57]) by userz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r9BBjJ2a022745; Fri, 11 Oct 2013 11:45:19 GMT Received: from wish.sg.oracle.com (/10.186.101.18) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 11 Oct 2013 04:45:18 -0700 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH 2/2] btrfs-progs: use the marco BTRFS_UPDATE_KERNEL where needed Date: Fri, 11 Oct 2013 19:52:54 +0800 Message-Id: <1381492374-7227-2-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 1.8.1.164.g2d0029e In-Reply-To: <1381492374-7227-1-git-send-email-anand.jain@oracle.com> References: <1381492374-7227-1-git-send-email-anand.jain@oracle.com> X-Source-IP: ucsinet22.oracle.com [156.151.31.94] 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.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Anand Jain --- cmds-device.c | 2 +- utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmds-device.c b/cmds-device.c index 1315918..6f32356 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -203,7 +203,7 @@ static int cmd_scan_dev(int argc, char **argv) if(argc<=devstart){ int ret; printf("Scanning for Btrfs filesystems\n"); - ret = scan_for_btrfs(where, 1); + ret = scan_for_btrfs(where, BTRFS_UPDATE_KERNEL); if (ret){ fprintf(stderr, "ERROR: error %d while scanning\n", ret); return 1; diff --git a/utils.c b/utils.c index 2f1d54f..f324147 100644 --- a/utils.c +++ b/utils.c @@ -961,7 +961,7 @@ int check_mounted_where(int fd, const char *file, char *where, int size, /* scan other devices */ if (is_btrfs && total_devs > 1) { - if((ret = btrfs_scan_for_fsid(0))) + if((ret = btrfs_scan_for_fsid(!BTRFS_UPDATE_KERNEL))) return ret; }