From patchwork Mon Oct 25 19:07:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 267862 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9PJ8A1P009288 for ; Mon, 25 Oct 2010 19:08:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932895Ab0JYTID (ORCPT ); Mon, 25 Oct 2010 15:08:03 -0400 Received: from cobra.newdream.net ([66.33.216.30]:47975 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932883Ab0JYTIB (ORCPT ); Mon, 25 Oct 2010 15:08:01 -0400 Received: from localhost.localdomain (ip-66-33-206-8.dreamhost.com [66.33.206.8]) by cobra.newdream.net (Postfix) with ESMTPA id C742DBC822; Mon, 25 Oct 2010 12:11:06 -0700 (PDT) From: Sage Weil To: linux-btrfs@vger.kernel.org Cc: Sage Weil Subject: [PATCH 5/6] Btrfs: make SNAP_DESTROY async Date: Mon, 25 Oct 2010 12:07:41 -0700 Message-Id: <1288033662-21464-6-git-send-email-sage@newdream.net> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1288033662-21464-5-git-send-email-sage@newdream.net> References: <1288033662-21464-1-git-send-email-sage@newdream.net> <1288033662-21464-2-git-send-email-sage@newdream.net> <1288033662-21464-3-git-send-email-sage@newdream.net> <1288033662-21464-4-git-send-email-sage@newdream.net> <1288033662-21464-5-git-send-email-sage@newdream.net> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 25 Oct 2010 19:08:10 +0000 (UTC) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 679b8a8..9cbda86 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1365,7 +1365,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, BUG_ON(ret); } - ret = btrfs_commit_transaction(trans, root); + ret = btrfs_end_transaction(trans, root); BUG_ON(ret); inode->i_flags |= S_DEAD; out_up_write: