From b10e5043a41ea18b2b789fc3697756344af2dd7b Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sun, 28 Feb 2010 19:41:12 +0100 Subject: [PATCH] --- yaml --- r: 182931 b: refs/heads/master c: 6fc2de06ef1e691d032aa572478c905b7495a274 h: refs/heads/master i: 182929: 36ec564bd0051eca6b2581672659fac2668a71e8 182927: 6fdf6995e7a657fd206e9d18402f6418f6266da6 v: v3 --- [refs] | 2 +- trunk/include/linux/iocontext.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9bd8b3f928a3..a1d33668c3d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a78362c4eefc1deddbefe2c7f38aabbc2429d6b +refs/heads/master: 6fc2de06ef1e691d032aa572478c905b7495a274 diff --git a/trunk/include/linux/iocontext.h b/trunk/include/linux/iocontext.h index 78ef023227d4..1195a806fe0c 100644 --- a/trunk/include/linux/iocontext.h +++ b/trunk/include/linux/iocontext.h @@ -49,8 +49,8 @@ struct io_context { /* * For request batching */ - unsigned long last_waited; /* Time last woken after wait for request */ int nr_batch_requests; /* Number of requests left in the batch */ + unsigned long last_waited; /* Time last woken after wait for request */ struct radix_tree_root radix_root; struct hlist_head cic_list;