From 43174715b28d0e920a1f46440a7facc5ba1bd7f5 Mon Sep 17 00:00:00 2001 From: Richard Kennedy Date: Wed, 13 Jul 2011 21:17:23 +0200 Subject: [PATCH] --- yaml --- r: 258614 b: refs/heads/master c: d7b7630130e52361af66ce3b994696e2357ba7de h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/blkdev.h | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1579f6fb30c2..a633eeff852e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7700fc4f675fa38094e78e345b594363a2fd895b +refs/heads/master: d7b7630130e52361af66ce3b994696e2357ba7de diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h index 6dcea6885a5d..c0cd9a2f22ef 100644 --- a/trunk/include/linux/blkdev.h +++ b/trunk/include/linux/blkdev.h @@ -260,8 +260,7 @@ struct queue_limits { unsigned char discard_zeroes_data; }; -struct request_queue -{ +struct request_queue { /* * Together with queue_head for cacheline sharing */ @@ -304,14 +303,14 @@ struct request_queue void *queuedata; /* - * queue needs bounce pages for pages above this limit + * various queue flags, see QUEUE_* below */ - gfp_t bounce_gfp; + unsigned long queue_flags; /* - * various queue flags, see QUEUE_* below + * queue needs bounce pages for pages above this limit */ - unsigned long queue_flags; + gfp_t bounce_gfp; /* * protects queue structures from reentrancy. ->__queue_lock should @@ -334,8 +333,8 @@ struct request_queue unsigned int nr_congestion_off; unsigned int nr_batching; - void *dma_drain_buffer; unsigned int dma_drain_size; + void *dma_drain_buffer; unsigned int dma_pad_mask; unsigned int dma_alignment;