From patchwork Mon Feb 5 08:52:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 10200017 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 ABB0C602CA for ; Mon, 5 Feb 2018 08:53:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CDC328688 for ; Mon, 5 Feb 2018 08:53:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9148A2869D; Mon, 5 Feb 2018 08:53:05 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 D196228688 for ; Mon, 5 Feb 2018 08:53:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574AbeBEIxD (ORCPT ); Mon, 5 Feb 2018 03:53:03 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:45984 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752317AbeBEIxB (ORCPT ); Mon, 5 Feb 2018 03:53:01 -0500 Received: by mail-pg0-f65.google.com with SMTP id m136so17917231pga.12 for ; Mon, 05 Feb 2018 00:53:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=mN93Xe/Cc8ZZJjCyJAYYpmqOqED8BdxCDhsGBlAtNZc=; b=ms5ynPZ50rVusXxc1gN55SGNiRR23eSpfnIf8Gfk+9yUp7JfEq4lYMtdUK7lxBDsY+ xM6HcA+yhlB2uTQRbt2/MgRfvGDTWjLDmQIS4VNacJH3ke07Oxw2kctKj6sqo/0DX+mM iGmjE4IprJ5sY/Om6TX+l2317RkAjb2Z9MRMig1jVVCXwM86SrHdJA/telfQU+7Uoy+d dwk0HWlLXYT8ZybbL9ZSVVJi6MLpqSBzJF6iT+tAUILSHWNIKt6bkvItBFZBSQ0vjyAp apUQUyIJNvbLsyZTRx8Pzw8tmHDYEqspVZdULSO92UlWeZIKfbTafnF80mhyf1LqgSEa xqwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=mN93Xe/Cc8ZZJjCyJAYYpmqOqED8BdxCDhsGBlAtNZc=; b=StNZZp9e1wpT762EhtcMfiPhSnRQA4tN4yUDXYDisSKjuCIP++rfyJZfIb7siVTnMb WQPiiUeaButm0TFPk+Nc7CvTGWE+eJyWAh3ip+GKD5MCjQPxCjpF5BRPmZOmOYfcF9gx 4ihs9/JxB8Ya6kV4QxqVjii/09tXKaME1/k5r/6wC3xa73dK6OKM0H7dLEVWNCgTfRca jVQI87vTxPmo31GSSgbwwp+WAhsYeofosA45bbsbhwe1hiR8j8acXVs0IJ/l9AQetWpw 6/UZZ2nccpiHKUT5XTs3WAwdJp7857U7cBFCZFM0S+flFxxfI40s5SO1eosKmRXZgkE9 Ca/w== X-Gm-Message-State: AKwxytcbAHlVQlSJUeEJL/43BeyNZUTIP8x8KEuEfIkOoK8curfercBU MbcK4LASve7JRyn8mDOBot6T7VW6 X-Google-Smtp-Source: AH8x225eMUhcen8GoYuqNZcIHao7HYPaYwdYJIEmzRiUIItlgh15MjYKJAtY+T2EjBI0xvzXoMDBrw== X-Received: by 10.101.85.203 with SMTP id k11mr9802047pgs.234.1517820780902; Mon, 05 Feb 2018 00:53:00 -0800 (PST) Received: from [10.128.2.36] (fs276ec80e.tkyc203.ap.nuro.jp. [39.110.200.14]) by smtp.gmail.com with ESMTPSA id 188sm2744209pgb.64.2018.02.05.00.52.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 00:52:59 -0800 (PST) Mime-Version: 1.0 (Mac OS X Mail 11.1 \(3445.4.7\)) Subject: Re: [PATCH v2 1/4] btrfs: Remove userspace transaction ioctls From: Wang Shilong In-Reply-To: <1517820076-13613-1-git-send-email-nborisov@suse.com> Date: Mon, 5 Feb 2018 17:52:52 +0900 Cc: Wang Shilong , David Sterba , linux-btrfs , sage@redhat.com Message-Id: References: <1515590477-22878-1-git-send-email-nborisov@suse.com> <1517820076-13613-1-git-send-email-nborisov@suse.com> To: Nikolay Borisov X-Mailer: Apple Mail (2.3445.4.7) 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 These ioctl are originally introduced by Sage Weil for Ceph use? Not sure whether it still useful, Cc Sage just in case. 在 2018年2月5日，下午5:41，Nikolay Borisov 写道： Commit 3558d4f88ec8 ("btrfs: Deprecate userspace transaction ioctls") marked the beginning of the end of userspace transaction. This commit finishes the job! Signed-off-by: Nikolay Borisov Acked-by: Sage Weil --- V2: * Also remove the usage of btrfs_ioctl_trans_end from btrfs_release_file so that the patch compiles on its own as well. fs/btrfs/ctree.h | 1 - fs/btrfs/file.c | 8 ----- fs/btrfs/ioctl.c | 95 -------------------------------------------------------- 3 files changed, 104 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 1a462ab85c49..6a4752177ad8 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3193,7 +3193,6 @@ void btrfs_destroy_inode(struct inode *inode); int btrfs_drop_inode(struct inode *inode); int __init btrfs_init_cachep(void); void btrfs_destroy_cachep(void); -long btrfs_ioctl_trans_end(struct file *file); struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location, struct btrfs_root *root, int *was_new); struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index cba2ac371ce0..101e0c7fea92 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1996,8 +1996,6 @@ int btrfs_release_file(struct inode *inode, struct file *filp) { struct btrfs_file_private *private = filp->private_data; - if (private && private->trans) - btrfs_ioctl_trans_end(filp); if (private && private->filldir_buf) kfree(private->filldir_buf); kfree(private); @@ -2189,12 +2187,6 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) } /* - * ok we haven't committed the transaction yet, lets do a commit - */ - if (file->private_data) - btrfs_ioctl_trans_end(file); - - /* * We use start here because we will need to wait on the IO to complete * in btrfs_sync_log, which could require joining a transaction (for * example checking cross references in the nocow path). If we use join diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index f573cad72b7e..3094e079fc4f 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3935,73 +3935,6 @@ int btrfs_clone_file_range(struct file *src_file, loff_t off, return btrfs_clone_files(dst_file, src_file, off, len, destoff); } -/* - * there are many ways the trans_start and trans_end ioctls can lead - * to deadlocks. They should only be used by applications that - * basically own the machine, and have a very in depth understanding - * of all the possible deadlocks and enospc problems. - */ -static long btrfs_ioctl_trans_start(struct file *file) -{ - struct inode *inode = file_inode(file); - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); - struct btrfs_root *root = BTRFS_I(inode)->root; - struct btrfs_trans_handle *trans; - struct btrfs_file_private *private; - int ret; - static bool warned = false; - - ret = -EPERM; - if (!capable(CAP_SYS_ADMIN)) - goto out; - - if (!warned) { - btrfs_warn(fs_info, - "Userspace transaction mechanism is considered " - "deprecated and slated to be removed in 4.17. " - "If you have a valid use case please " - "speak up on the mailing list"); - WARN_ON(1); - warned = true; - } - - ret = -EINPROGRESS; - private = file->private_data; - if (private && private->trans) - goto out; - if (!private) { - private = kzalloc(sizeof(struct btrfs_file_private), - GFP_KERNEL); - if (!private) - return -ENOMEM; - file->private_data = private; - } - - ret = -EROFS; - if (btrfs_root_readonly(root)) - goto out; - - ret = mnt_want_write_file(file); - if (ret) - goto out; - - atomic_inc(&fs_info->open_ioctl_trans); - - ret = -ENOMEM; - trans = btrfs_start_ioctl_transaction(root); - if (IS_ERR(trans)) - goto out_drop; - - private->trans = trans; - return 0; - -out_drop: - atomic_dec(&fs_info->open_ioctl_trans); - mnt_drop_write_file(file); -out: - return ret; -} - static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp) { struct inode *inode = file_inode(file); @@ -4243,30 +4176,6 @@ static long btrfs_ioctl_space_info(struct btrfs_fs_info *fs_info, return ret; } -/* - * there are many ways the trans_start and trans_end ioctls can lead - * to deadlocks. They should only be used by applications that - * basically own the machine, and have a very in depth understanding - * of all the possible deadlocks and enospc problems. - */ -long btrfs_ioctl_trans_end(struct file *file) -{ - struct inode *inode = file_inode(file); - struct btrfs_root *root = BTRFS_I(inode)->root; - struct btrfs_file_private *private = file->private_data; - - if (!private || !private->trans) - return -EINVAL; - - btrfs_end_transaction(private->trans); - private->trans = NULL; - - atomic_dec(&root->fs_info->open_ioctl_trans); - - mnt_drop_write_file(file); - return 0; -} - static noinline long btrfs_ioctl_start_sync(struct btrfs_root *root, void __user *argp) { @@ -5573,10 +5482,6 @@ long btrfs_ioctl(struct file *file, unsigned int return btrfs_ioctl_dev_info(fs_info, argp); case BTRFS_IOC_BALANCE: return btrfs_ioctl_balance(file, NULL); - case BTRFS_IOC_TRANS_START: - return btrfs_ioctl_trans_start(file); - case BTRFS_IOC_TRANS_END: - return btrfs_ioctl_trans_end(file); case BTRFS_IOC_TREE_SEARCH: return btrfs_ioctl_tree_search(file, argp); case BTRFS_IOC_TREE_SEARCH_V2: