From: Andrew Morton <akpm@osdl.org>
To: sluskyb@paranoiacs.org, jariruusu@users.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] remove useless highmem bounce from loop/cryptoloop
Date: Fri, 31 Oct 2003 01:58:18 -0800 [thread overview]
Message-ID: <20031031015818.446e4f5a.akpm@osdl.org> (raw)
In-Reply-To: <20031031015559.6239a4a4.akpm@osdl.org>
Andrew Morton <akpm@osdl.org> wrote:
>
> Andrew Morton <akpm@osdl.org> wrote:
> >
> > Here's the patch;
>
> And here's your cleanup patch on top of that.
And here are some fixes against your patch. kunmap_atomic() takes a kernel
virtual address, not a pageframe pointer. And there were a couple of stray
kunmap()s left over.
--- 25/drivers/block/loop.c~loop-highmem-fixes 2003-10-31 00:55:17.000000000 -0800
+++ 25-akpm/drivers/block/loop.c 2003-10-31 01:01:32.000000000 -0800
@@ -81,18 +81,16 @@ static int transfer_none(struct loop_dev
struct page *loop_page, unsigned loop_off,
int size, sector_t real_block)
{
- char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off;
- char *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off;
+ char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off;
+ char *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off;
- if (raw_buf != loop_buf) {
- if (cmd == READ)
- memcpy(loop_buf, raw_buf, size);
- else
- memcpy(raw_buf, loop_buf, size);
- }
+ if (cmd == READ)
+ memcpy(loop_buf, raw_buf, size);
+ else
+ memcpy(raw_buf, loop_buf, size);
- kunmap_atomic(raw_page, KM_USER0);
- kunmap_atomic(loop_page, KM_USER1);
+ kunmap_atomic(raw_buf, KM_USER0);
+ kunmap_atomic(loop_buf, KM_USER1);
cond_resched();
return 0;
}
@@ -102,10 +100,10 @@ static int transfer_xor(struct loop_devi
struct page *loop_page, unsigned loop_off,
int size, sector_t real_block)
{
- char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off;
- char *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off;
- char *in, *out, *key;
- int i, keysize;
+ char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off;
+ char *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off;
+ char *in, *out, *key;
+ int i, keysize;
if (cmd == READ) {
in = raw_buf;
@@ -120,8 +118,8 @@ static int transfer_xor(struct loop_devi
for (i = 0; i < size; i++)
*out++ = *in++ ^ key[(i & 511) % keysize];
- kunmap_atomic(raw_page, KM_USER0);
- kunmap_atomic(loop_page, KM_USER1);
+ kunmap_atomic(raw_buf, KM_USER0);
+ kunmap_atomic(loop_buf, KM_USER1);
cond_resched();
return 0;
}
@@ -225,17 +223,19 @@ do_lo_send(struct loop_device *lo, struc
bvec->bv_page, bv_offs,
size, IV);
if (transfer_result) {
+ char *kaddr;
+
/*
* The transfer failed, but we still write the data to
* keep prepare/commit calls balanced.
*/
printk(KERN_ERR "loop: transfer error block %llu\n",
(unsigned long long)index);
- memset(kmap_atomic(page, KM_USER0) + offset, 0, size);
- kunmap_atomic(page, KM_USER0);
+ kaddr = kmap_atomic(page, KM_USER0);
+ memset(kaddr + offset, 0, size);
+ kunmap_atomic(kaddr, KM_USER0);
}
flush_dcache_page(page);
- kunmap(page);
if (aops->commit_write(file, page, offset, offset+size))
goto unlock;
if (transfer_result)
@@ -250,7 +250,6 @@ do_lo_send(struct loop_device *lo, struc
}
up(&mapping->host->i_sem);
out:
- kunmap(bvec->bv_page);
return ret;
unlock:
_
next prev parent reply other threads:[~2003-10-31 9:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-10-30 13:41 Ben Slusky
2003-10-30 18:14 ` Jari Ruusu
2003-10-30 21:30 ` Andrew Morton
2003-10-31 0:52 ` Ben Slusky
2003-10-31 9:55 ` Andrew Morton
2003-10-31 9:55 ` Andrew Morton
2003-10-31 9:58 ` Andrew Morton [this message]
2003-11-13 3:06 ` Ben Slusky
2003-11-01 0:26 ` Ben Slusky
2003-11-02 20:46 ` Ben Slusky
2003-12-21 19:55 ` [PATCH] loop.c patches, take two Ben Slusky
2003-12-21 20:07 ` Ben Slusky
2003-12-21 20:49 ` Mika Penttilä
2003-12-21 21:12 ` Ben Slusky
2003-12-21 23:00 ` Mika Penttilä
2003-12-21 23:05 ` Ben Slusky
2003-12-21 23:51 ` Mika Penttilä
2003-12-21 22:01 ` Christophe Saout
2003-12-22 6:33 ` Andrew Morton
2003-12-22 23:32 ` Ben Slusky
2003-10-31 12:15 ` [PATCH] remove useless highmem bounce from loop/cryptoloop Jari Ruusu
2003-10-31 13:02 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20031031015818.446e4f5a.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=jariruusu@users.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=sluskyb@paranoiacs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome