[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200612081152.kB8BqTf4019768@shell0.pdx.osdl.net>
Date: Fri, 08 Dec 2006 03:52:29 -0800
From: akpm@...l.org
To: linux-kernel@...r.kernel.org
Cc: akpm@...l.org, balbir@...ibm.com, csturtiv@....com, daw@....com,
guillaume.thouvenin@...l.net, jlan@....com, nagar@...son.ibm.com,
sfrench@...ibm.com, tee@....com
Subject: [patch 07/13] io-accounting-read-accounting cifs fix
From: Andrew Morton <akpm@...l.org>
CIFS implements ->readpages and doesn't use read_cache_pages(). So wire the
read IO accounting up within CIFS.
Cc: Jay Lan <jlan@....com>
Cc: Shailabh Nagar <nagar@...son.ibm.com>
Cc: Balbir Singh <balbir@...ibm.com>
Cc: Chris Sturtivant <csturtiv@....com>
Cc: Tony Ernst <tee@....com>
Cc: Guillaume Thouvenin <guillaume.thouvenin@...l.net>
Cc: Steven French <sfrench@...ibm.com>
Cc: David Wright <daw@....com>
Signed-off-by: Andrew Morton <akpm@...l.org>
---
fs/cifs/file.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN fs/cifs/file.c~io-accounting-read-accounting-cifs-fix fs/cifs/file.c
--- a/fs/cifs/file.c~io-accounting-read-accounting-cifs-fix
+++ a/fs/cifs/file.c
@@ -29,6 +29,7 @@
#include <linux/pagevec.h>
#include <linux/smp_lock.h>
#include <linux/writeback.h>
+#include <linux/task_io_accounting_ops.h>
#include <linux/delay.h>
#include <asm/div64.h>
#include "cifsfs.h"
@@ -1813,6 +1814,7 @@ static int cifs_readpages(struct file *f
cFYI(1, ("Read error in readpages: %d", rc));
break;
} else if (bytes_read > 0) {
+ task_io_account_read(bytes_read);
pSMBr = (struct smb_com_read_rsp *)smb_read_data;
cifs_copy_cache_pages(mapping, page_list, bytes_read,
smb_read_data + 4 /* RFC1001 hdr */ +
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists