From patchwork Mon Nov 25 10:39:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 11260149 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A2D0413A4 for ; Mon, 25 Nov 2019 10:39:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82FDA2075C for ; Mon, 25 Nov 2019 10:39:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="PE3Mvtt4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727517AbfKYKjl (ORCPT ); Mon, 25 Nov 2019 05:39:41 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:48118 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727495AbfKYKjl (ORCPT ); Mon, 25 Nov 2019 05:39:41 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xAPAYhgF007493 for ; Mon, 25 Nov 2019 10:39:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2019-08-05; bh=bc9YECdOavijLkiyOVpkhQFUHwU3QhCAfLx1aUZWRFc=; b=PE3Mvtt4jAm/eRlYMtQth6s5znG0/ovdtb549VbLdtb+sCJSVgbIdNLHRa27PTD9uEmC /cbaWUXbIQO4Wu4k0+Q8ACrz9TMwam3XUhDlir51/+q8rAFX/dccFU47B9k2HcO0X9wY uz78rMCInDhp7UsJBPC9TLmFApF2uuXsUQMpwVKl7AwSMPzeiEA5ebolR5KXqA7yZ5AI 4ZxhZWY5gRc9ykp1GOL9E37jzkVswtVuRW2SYKvmsDpOvrjEGY3qEPTeOVjZyoEcSOSU Dq8pr7oipgOypi0Nmpbr8x/33SEzjuJKR+3/Ugfk7+/lvvabZeMS9KWrToKSIgSM7F4s xw== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2120.oracle.com with ESMTP id 2wewdqxnnk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 25 Nov 2019 10:39:39 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xAPAX3MZ169637 for ; Mon, 25 Nov 2019 10:39:39 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 2wfewa7a7q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 25 Nov 2019 10:39:39 +0000 Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id xAPAdcHc016879 for ; Mon, 25 Nov 2019 10:39:38 GMT Received: from tp.wifi.oracle.com (/192.188.170.104) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 25 Nov 2019 02:39:38 -0800 From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH v2 06/16] btrfs-progs: filesystem defragment: use global verbose option Date: Mon, 25 Nov 2019 18:39:07 +0800 Message-Id: <1574678357-22222-7-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1574678357-22222-1-git-send-email-anand.jain@oracle.com> References: <1574678357-22222-1-git-send-email-anand.jain@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9451 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-1911250098 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9451 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-1911250098 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Transpire global --verbose option down to the btrfs receive sub-command. Suggested-by: David Sterba Signed-off-by: Anand Jain --- v2: Use new helper functions and defines HELPINFO_INSERT_GLOBALS, BTRFS_BCONF_UNSET, BTRFS_BCONF_QUIET bconf_be_verbose() No need to init bconf.verbose in the sub command. Move the HELPINFO_INSERT_GLOBALS, and HELPINFO_INSERT_VERBOSE, right after the command options. cmds/filesystem.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cmds/filesystem.c b/cmds/filesystem.c index 4f22089abeaa..fc1736d9fe66 100644 --- a/cmds/filesystem.c +++ b/cmds/filesystem.c @@ -840,6 +840,8 @@ static const char * const cmd_filesystem_defrag_usage[] = { "-l len defragment only up to len bytes", "-t size target extent size hint (default: 32M)", "", + HELPINFO_INSERT_GLOBALS, + HELPINFO_INSERT_VERBOSE, "Warning: most Linux kernels will break up the ref-links of COW data", "(e.g., files copied with 'cp --reflink', snapshots) which may cause", "considerable increase of space usage. See btrfs-filesystem(8) for", @@ -848,7 +850,6 @@ static const char * const cmd_filesystem_defrag_usage[] = { }; static struct btrfs_ioctl_defrag_range_args defrag_global_range; -static int defrag_global_verbose; static int defrag_global_errors; static int defrag_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf) @@ -857,8 +858,7 @@ static int defrag_callback(const char *fpath, const struct stat *sb, int fd = 0; if ((typeflag == FTW_F) && S_ISREG(sb->st_mode)) { - if (defrag_global_verbose) - printf("%s\n", fpath); + pr_verbose(1, "%s\n", fpath); fd = open(fpath, defrag_open_mode); if (fd < 0) { goto error; @@ -913,7 +913,6 @@ static int cmd_filesystem_defrag(const struct cmd_struct *cmd, thresh = SZ_32M; defrag_global_errors = 0; - defrag_global_verbose = 0; defrag_global_errors = 0; optind = 0; while(1) { @@ -931,7 +930,7 @@ static int cmd_filesystem_defrag(const struct cmd_struct *cmd, flush = 1; break; case 'v': - defrag_global_verbose = 1; + bconf_be_verbose(); break; case 's': start = parse_size(optarg); @@ -1031,8 +1030,7 @@ static int cmd_filesystem_defrag(const struct cmd_struct *cmd, /* errors are handled in the callback */ ret = 0; } else { - if (defrag_global_verbose) - printf("%s\n", argv[i]); + pr_verbose(1, "%s\n", argv[i]); ret = ioctl(fd, BTRFS_IOC_DEFRAG_RANGE, &defrag_global_range); defrag_err = errno;