From patchwork Mon Oct 13 04:42:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 5073601 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 48F42C11AC for ; Mon, 13 Oct 2014 04:43:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78E2C201F5 for ; Mon, 13 Oct 2014 04:43:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98A68201EC for ; Mon, 13 Oct 2014 04:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751237AbaJMEnE (ORCPT ); Mon, 13 Oct 2014 00:43:04 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:42893 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751160AbaJMEm4 (ORCPT ); Mon, 13 Oct 2014 00:42:56 -0400 Received: by mail-pd0-f181.google.com with SMTP id z10so4860764pdj.26 for ; Sun, 12 Oct 2014 21:42:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9okRaal4RXQlw826LMh3qErGvVOVpab+wo3mE4eTxek=; b=kIz9fGCs8EFQn1NW7DDNLZEWGO4H3dtpQnYXUVykbn7ijYXJQp4pCD3OR4ZfCpBYWF VCC5osYt8V0xv0Up8j9RnsRk24kXaU16I4bAhePmokAyGHtrAxOVlCArNKXT0SANvYG6 PNozTuguRNS1FuvFMk54yUEwJKl8ln+62pIFkzlPokq6uiHnZPIua7TG9QXGhP0H2TMj YCeES7NU0U7S8cEUkiQD1SUtbkn2iZDCmjnNMctA0OaqAu6GP8OTH1fICqgjd0TK0ctC rxrnBguBlZfyacvChNVf6TDOnTJsvT7Zh0+UiQI4cGPTaYYDCahOFZDGE95sn14uJfdq T7xg== X-Received: by 10.68.247.137 with SMTP id ye9mr21282199pbc.69.1413175375873; Sun, 12 Oct 2014 21:42:55 -0700 (PDT) Received: from localhost ([203.114.244.88]) by mx.google.com with ESMTPSA id b3sm9827909pdm.65.2014.10.12.21.42.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Oct 2014 21:42:55 -0700 (PDT) From: Eryu Guan To: linux-btrfs@vger.kernel.org Cc: Eryu Guan Subject: [PATCH] btrfs-progs: add new dev replace result Date: Mon, 13 Oct 2014 12:42:13 +0800 Message-Id: <1413175333-26095-2-git-send-email-guaneryu@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1413175333-26095-1-git-send-email-guaneryu@gmail.com> References: <1413175333-26095-1-git-send-email-guaneryu@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 A new dev replace result was introduced by kernel commit Btrfs: return failure if btrfs_dev_replace_finishing() failed Make the userspace know about the new result too. Signed-off-by: Eryu Guan --- cmds-replace.c | 2 ++ ioctl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/cmds-replace.c b/cmds-replace.c index 9fe7ad8..7a45cef 100644 --- a/cmds-replace.c +++ b/cmds-replace.c @@ -53,6 +53,8 @@ static const char *replace_dev_result2string(__u64 result) return "not started"; case BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED: return "already started"; + case BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS: + return "scrub is in progress"; default: return ""; } diff --git a/ioctl.h b/ioctl.h index f0fc060..0e02fae 100644 --- a/ioctl.h +++ b/ioctl.h @@ -144,6 +144,7 @@ struct btrfs_ioctl_dev_replace_status_params { #define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR 0 #define BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED 1 #define BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED 2 +#define BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS 3 struct btrfs_ioctl_dev_replace_args { __u64 cmd; /* in */ __u64 result; /* out */