From patchwork Tue Mar  1 05:09:21 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Mitch Harder <mitch.harder@sabayonlinux.org>
X-Patchwork-Id: 598191
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 p2159StU030451
	for <patchwork-linux-btrfs@patchwork.kernel.org>;
	Tue, 1 Mar 2011 05:09:29 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752251Ab1CAFJZ (ORCPT
	<rfc822;patchwork-linux-btrfs@patchwork.kernel.org>);
	Tue, 1 Mar 2011 00:09:25 -0500
Received: from mail-vw0-f46.google.com ([209.85.212.46]:52086 "EHLO
	mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751100Ab1CAFJY convert rfc822-to-8bit (ORCPT
	<rfc822; linux-btrfs@vger.kernel.org>); Tue, 1 Mar 2011 00:09:24 -0500
Received: by vws12 with SMTP id 12so3842718vws.19
	for <linux-btrfs@vger.kernel.org>;
	Mon, 28 Feb 2011 21:09:23 -0800 (PST)
MIME-Version: 1.0
Received: by 10.220.176.12 with SMTP id bc12mr1608353vcb.55.1298956161526;
	Mon, 28 Feb 2011 21:09:21 -0800 (PST)
Received: by 10.220.81.70 with HTTP; Mon, 28 Feb 2011 21:09:21 -0800 (PST)
In-Reply-To: <AANLkTikex7g4+dc9qiPdL_xRk5SoFxE3TCfN7dg3kaR2@mail.gmail.com>
References: <1298857223-sup-5612@think>
	<201102281114.00018.johannes.hirte@fem.tu-ilmenau.de>
	<20110228161056.GA2769@localhost.localdomain>
	<1298911556.11118.8.camel@mainframe>
	<AANLkTin_Hjr3StjWUGrwCHBzhk_kwj-G2WqxZM6=CqN2@mail.gmail.com>
	<AANLkTikex7g4+dc9qiPdL_xRk5SoFxE3TCfN7dg3kaR2@mail.gmail.com>
Date: Mon, 28 Feb 2011 23:09:21 -0600
Message-ID: <AANLkTi=4HW0vFa4D_WAo=Xi0XC51na_EmhqAF9YEenb0@mail.gmail.com>
Subject: Re: [PATCH] btrfs file write debugging patch
From: Mitch Harder <mitch.harder@sabayonlinux.org>
To: =?ISO-8859-1?Q?Maria_Wikstr=F6m?= <maria@ponstudios.se>
Cc: Josef Bacik <josef@redhat.com>,
	Johannes Hirte <johannes.hirte@fem.tu-ilmenau.de>,
	Chris Mason <chris.mason@oracle.com>, "Zhong, Xin" <xin.zhong@intel.com>,
	"linux-btrfs@vger.kernel.org" <linux-btrfs@vger.kernel.org>
Sender: linux-btrfs-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-btrfs.vger.kernel.org>
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, 01 Mar 2011 05:09:29 +0000 (UTC)


--- file.c.file-write-patch-v1	2011-02-28 13:06:37.000000000 -0600
+++ file.c	2011-02-28 19:23:21.000000000 -0600
@@ -908,6 +908,7 @@
 	ssize_t err = 0;
 	size_t count;
 	size_t ocount;
+	size_t write_bytes = 0;
 	int ret = 0;
 	int nrptrs;
 	unsigned long first_index;
@@ -963,7 +964,7 @@
 	BTRFS_I(inode)->sequence++;

 	if (unlikely(file->f_flags & O_DIRECT)) {
-		trace_printk("TPK: transferred to unlikely(file->f_flags \& O_DIRECT)\n");
+		trace_printk("TPK: transferred to unlikely(file->f_flags & O_DIRECT)\n");
 		num_written = generic_file_direct_write(iocb, iov, &nr_segs,
 							pos, ppos, count,
 							ocount);
@@ -995,7 +996,7 @@
 		 */
 		buffered = 1;
 		pos += num_written;
-		trace_printk("TPK: end unlikely(file->f_flags \& O_DIRECT) with
num_written=%i\n",
+		trace_printk("TPK: end unlikely(file->f_flags & O_DIRECT) with
num_written=%i\n",
 			     num_written);