From 3ef0de89bec1ed77fb6d3266b6745b509e33cc79 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 21 Feb 2006 16:37:20 +0100 Subject: [PATCH] [PATCH] kernel: last minute typo in kernel commit... --- ...race-2.6.16-rc4-git-B0 => blk-trace-2.6.16-rc4-git-B1} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename kernel/{blk-trace-2.6.16-rc4-git-B0 => blk-trace-2.6.16-rc4-git-B1} (99%) diff --git a/kernel/blk-trace-2.6.16-rc4-git-B0 b/kernel/blk-trace-2.6.16-rc4-git-B1 similarity index 99% rename from kernel/blk-trace-2.6.16-rc4-git-B0 rename to kernel/blk-trace-2.6.16-rc4-git-B1 index 758bc70..5c44d10 100644 --- a/kernel/blk-trace-2.6.16-rc4-git-B0 +++ b/kernel/blk-trace-2.6.16-rc4-git-B1 @@ -936,10 +936,10 @@ index 057e602..893d600 100644 #include /* siocdevprivate_ioctl */ #include diff --git a/fs/relayfs/buffers.c b/fs/relayfs/buffers.c -index 1018781..62d869c 100644 +index 1018781..81b2ca9 100644 --- a/fs/relayfs/buffers.c +++ b/fs/relayfs/buffers.c -@@ -92,12 +92,12 @@ int relay_mmap_buf(struct rchan_buf *buf +@@ -92,13 +92,13 @@ int relay_mmap_buf(struct rchan_buf *buf * * Returns a pointer to the resulting buffer, NULL if unsuccessful */ @@ -950,10 +950,12 @@ index 1018781..62d869c 100644 unsigned int i, j, n_pages; - size = PAGE_ALIGN(size); +- n_pages = size >> PAGE_SHIFT; + *size = PAGE_ALIGN(*size); - n_pages = size >> PAGE_SHIFT; ++ n_pages = *size >> PAGE_SHIFT; buf->page_array = kcalloc(n_pages, sizeof(struct page *), GFP_KERNEL); + if (!buf->page_array) @@ -113,7 +113,7 @@ static void *relay_alloc_buf(struct rcha if (!mem) goto depopulate; -- 2.25.1