From patchwork Tue Nov 28 09:14:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10079021 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 5D3D860353 for ; Tue, 28 Nov 2017 09:11:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EAFC291E6 for ; Tue, 28 Nov 2017 09:11:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43CB5291EA; Tue, 28 Nov 2017 09:11:19 +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=ham 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 BE52B291E6 for ; Tue, 28 Nov 2017 09:11:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751439AbdK1JLM (ORCPT ); Tue, 28 Nov 2017 04:11:12 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:57728 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751389AbdK1JLK (ORCPT ); Tue, 28 Nov 2017 04:11:10 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="30511807" Received: from localhost (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Nov 2017 17:11:08 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id F40D5487F179; Tue, 28 Nov 2017 17:11:08 +0800 (CST) Received: from archlinux.g08.fujitsu.local (10.167.226.129) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Tue, 28 Nov 2017 17:11:08 +0800 From: Su Yue To: CC: Subject: [PATCH v2 2/3] btrfs-progs: fi defrag: do not exit if defrag range ioctl is unsupported Date: Tue, 28 Nov 2017 17:14:49 +0800 Message-ID: <20171128091450.21789-2-suy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171128091450.21789-1-suy.fnst@cn.fujitsu.com> References: <20171128091450.21789-1-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.129] X-yoursite-MailScanner-ID: F40D5487F179.AAD5A X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: suy.fnst@cn.fujitsu.com 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 If ioctl of defrag range is unsupported, defrag will exit immediately. Since caller can handle the error, let cmd_filesystem_defrag() break the loop and return error instead of calling exit(1). Suggested-by: David Sterba Signed-off-by: Su Yue --- Changelog: v2: Separate the patch from commit 6e991b9161fa ("btrfs-progs: fi defrag: clean up duplicate code if find errors"). --- cmds-filesystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 17d399d58adf..3931333f76c6 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -1050,7 +1050,7 @@ static int cmd_filesystem_defrag(int argc, char **argv) ret = nftw(argv[i], defrag_callback, 10, FTW_MOUNT | FTW_PHYS); if (ret == ENOTTY) - exit(1); + break; /* errors are handled in the callback */ ret = 0; } else {