From patchwork Tue Jun 21 08:49:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liubo X-Patchwork-Id: 900542 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5L8oXlY018295 for ; Tue, 21 Jun 2011 08:50:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753190Ab1FUIue (ORCPT ); Tue, 21 Jun 2011 04:50:34 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:54132 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752727Ab1FUIuS (ORCPT ); Tue, 21 Jun 2011 04:50:18 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 7AF0B17014A; Tue, 21 Jun 2011 16:50:06 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p5L8o4NX019625; Tue, 21 Jun 2011 16:50:05 +0800 Received: from localhost.localdomain ([10.167.225.27]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011062116494144-627586 ; Tue, 21 Jun 2011 16:49:41 +0800 From: Liu Bo To: Cc: , , Subject: [PATCH 09/12 v3] Btrfs: kick off useless code Date: Tue, 21 Jun 2011 16:49:50 +0800 Message-Id: <1308646193-7086-10-git-send-email-liubo2009@cn.fujitsu.com> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1308646193-7086-1-git-send-email-liubo2009@cn.fujitsu.com> References: <1308646193-7086-1-git-send-email-liubo2009@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-06-21 16:49:41, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-06-21 16:49:43, Serialize complete at 2011-06-21 16:49:43 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 21 Jun 2011 08:50:36 +0000 (UTC) fsync will wait for writeback till it finishes, and last_trans will get the real transid recorded in writeback, so it does not need an extra +1 to ensure fsync's process on the file. Signed-off-by: Liu Bo --- fs/btrfs/file.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 3c434bb..8f27007 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1404,19 +1404,6 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb, mutex_unlock(&inode->i_mutex); - /* - * we want to make sure fsync finds this change - * but we haven't joined a transaction running right now. - * - * Later on, someone is sure to update the inode and get the - * real transid recorded. - * - * We set last_trans now to the fs_info generation + 1, - * this will either be one more than the running transaction - * or the generation used for the next transaction if there isn't - * one running right now. - */ - BTRFS_I(inode)->last_trans = root->fs_info->generation + 1; if (num_written > 0 || num_written == -EIOCBQUEUED) { err = generic_write_sync(file, pos, num_written); if (err < 0 && num_written > 0)