From patchwork Fri Jan 26 18:41:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10186781 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 ACF9F601D5 for ; Fri, 26 Jan 2018 18:42:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F1E029EC8 for ; Fri, 26 Jan 2018 18:42:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93E1129ED0; Fri, 26 Jan 2018 18:42:47 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 3310B29EC8 for ; Fri, 26 Jan 2018 18:42:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752373AbeAZSmo (ORCPT ); Fri, 26 Jan 2018 13:42:44 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:40277 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751678AbeAZSli (ORCPT ); Fri, 26 Jan 2018 13:41:38 -0500 Received: by mail-pg0-f68.google.com with SMTP id g16so785367pgn.7 for ; Fri, 26 Jan 2018 10:41:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=AMc/s2BtNNe6C0qLIY46VUbHXzCRyyOfFs/sxRxOUq4=; b=OphJyc+QXt+U+H3B7CBKRi0II4T5tFfBBWmctaM6CAKlhSPJ5dEStrkhZh/Nv0Hyyk xkdTDAp4hHsGzf301hf9pbOc4YN0+g4FLiFBE0iX1OdiSdcZo1B7pyzM45pknlsmwW5k Q2gQbUEA0/vbXxlR4J0RNmI3jBLdhB4oyyMBkhMMDMdt1GX+9UTLsWb+6zAeQlXPLbrb qmqoepq3NM5PWb48bcOa8RP9M1f/8Xxq4+z2peAxaXY0IqHcQtrxXtDgt4lW+poC8Mmv JYQQ4zGMxchWLD5cDq6oqtz+aoVAiSWPrl4LFP/0ZG0FCTPuVmwYsPlWbktfdqLLdfOa GItg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=AMc/s2BtNNe6C0qLIY46VUbHXzCRyyOfFs/sxRxOUq4=; b=MH9+ysWxX81AQDnsDN45MsoTDkIf2Q9EzY0niEgk5CIqAps3VO/sLeSZvmprCwyGn3 7T56uHeLwIUHOATkDONVqej9n93rnyOE8uPNhTBCtszXVLal1d/qijJ+/ZQ+klI3t3g5 XCrmRWNVqw95fMqMt/D7evNOW8Cw4L4yNzN0p/FKRE6ntfbjTbv+LT/SnwjiTLQ3XpwY 1xzJ3JptK0u60fg+gJiM1WSApWQzdPexvkosmxuIGgo1ntDiPXqSDTYS2y1X77MQa0Zq CGN8SVuqjd3bs3uRWZef3T0AfC1X2EgAGVazBd1i86J7YUaK2SoWBrxaUtcsZCHUWSl3 ouBg== X-Gm-Message-State: AKwxytehG+7EWRFPLwHaFPp6gzwOyq0arR/KQ/q50Si6BK4KHfEY8Bpc PWls3FUOOCprXf/+lYO6dVXZRcayRfo= X-Google-Smtp-Source: AH8x225VReZJ1BAwPpmSV3nAXqoG9Bq6s0HBGLrkYX+IBFTj+1t4lt+YQ6GNSA2YIc211jl4koEVkw== X-Received: by 2002:a17:902:b492:: with SMTP id y18-v6mr5434456plr.437.1516992097740; Fri, 26 Jan 2018 10:41:37 -0800 (PST) Received: from vader.thefacebook.com ([2620:10d:c090:200::6:7f96]) by smtp.gmail.com with ESMTPSA id y29sm19627400pff.24.2018.01.26.10.41.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jan 2018 10:41:37 -0800 (PST) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com Subject: [PATCH 16/26] btrfs-progs: use libbtrfsutil for sync ioctls Date: Fri, 26 Jan 2018 10:41:04 -0800 Message-Id: <90551f6ebfff5d6601d91ee618a0504c9f6aeb23.1516991902.git.osandov@fb.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: References: In-Reply-To: References: 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 From: Omar Sandoval Signed-off-by: Omar Sandoval --- cmds-filesystem.c | 20 ++++++-------------- cmds-qgroup.c | 7 ++++--- cmds-subvolume.c | 23 ++++++++++++++--------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 17d399d5..2353fdb0 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -28,6 +28,8 @@ #include #include +#include + #include "kerncompat.h" #include "ctree.h" #include "utils.h" @@ -815,26 +817,16 @@ static const char * const cmd_filesystem_sync_usage[] = { static int cmd_filesystem_sync(int argc, char **argv) { - int fd, res, e; - char *path; - DIR *dirstream = NULL; + enum btrfs_util_error err; clean_args_no_options(argc, argv, cmd_filesystem_sync_usage); if (check_argc_exact(argc - optind, 1)) usage(cmd_filesystem_sync_usage); - path = argv[optind]; - - fd = btrfs_open_dir(path, &dirstream, 1); - if (fd < 0) - return 1; - - res = ioctl(fd, BTRFS_IOC_SYNC); - e = errno; - close_file_or_dir(fd, dirstream); - if( res < 0 ){ - error("sync ioctl failed on '%s': %s", path, strerror(e)); + err = btrfs_util_sync(argv[optind]); + if (err) { + error_btrfs_util(err); return 1; } diff --git a/cmds-qgroup.c b/cmds-qgroup.c index 38382ea9..fac692d4 100644 --- a/cmds-qgroup.c +++ b/cmds-qgroup.c @@ -302,6 +302,7 @@ static int cmd_qgroup_show(int argc, char **argv) int filter_flag = 0; unsigned unit_mode; int sync = 0; + enum btrfs_util_error err; struct btrfs_qgroup_comparer_set *comparer_set; struct btrfs_qgroup_filter_set *filter_set; @@ -375,10 +376,10 @@ static int cmd_qgroup_show(int argc, char **argv) } if (sync) { - ret = ioctl(fd, BTRFS_IOC_SYNC); - if (ret < 0) + err = btrfs_util_f_sync(fd); + if (err) warning("sync ioctl failed on '%s': %s", path, - strerror(errno)); + strerror(errno)); } if (filter_flag) { diff --git a/cmds-subvolume.c b/cmds-subvolume.c index f8e34bc8..89a4ebb0 100644 --- a/cmds-subvolume.c +++ b/cmds-subvolume.c @@ -219,12 +219,18 @@ out: static int wait_for_commit(int fd) { - int ret; + enum btrfs_util_error err; + uint64_t transid; - ret = ioctl(fd, BTRFS_IOC_START_SYNC, NULL); - if (ret < 0) - return ret; - return ioctl(fd, BTRFS_IOC_WAIT_SYNC, NULL); + err = btrfs_util_f_start_sync(fd, &transid); + if (err) + return -1; + + err = btrfs_util_f_wait_sync(fd, transid); + if (err) + return -1; + + return 0; } static const char * const cmd_subvol_delete_usage[] = { @@ -940,10 +946,9 @@ static int cmd_subvol_find_new(int argc, char **argv) if (fd < 0) return 1; - ret = ioctl(fd, BTRFS_IOC_SYNC); - if (ret < 0) { - error("sync ioctl failed on '%s': %s", - subvol, strerror(errno)); + err = btrfs_util_f_sync(fd); + if (err) { + error_btrfs_util(err); close_file_or_dir(fd, dirstream); return 1; }