RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

if: remove non-working kmap()

This commit is contained in:
Thomas Schoebel-Theuer 2013-10-14 22:26:24 +02:00
parent 9134be1a3e
commit 232349e544
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/mars_if.c
View File

@ -145,17 +145,6 @@ void if_endio(struct generic_callback *cb)
bio = biow->bio;
CHECK_PTR_NULL(bio, err);
#if 1
if (mref_a->is_kmapped) {
struct bio_vec *bvec;
int i;
bio_for_each_segment(bvec, bio, i) {
MARS_IO("kunmap %p\n", bvec->bv_page);
kunmap(bvec->bv_page);
}
}
#endif
_if_end_io_acct(input, biow);
error = CALLBACK_ERROR(mref_a->object);
@ -437,7 +426,10 @@ if_make_request(struct request_queue *q, struct bio *bio)
int offset = bvec->bv_offset;
void *data;
data = kmap(page);
#ifdef ARCH_HAS_KMAP
#error FIXME: the current infrastructure cannot deal with HIGHMEM / kmap()
#endif
data = page_address(page);
MARS_IO("page = %p data = %p\n", page, data);
error = -EINVAL;
if (unlikely(!data))
@ -550,7 +542,6 @@ if_make_request(struct request_queue *q, struct bio *bio)
mref->ref_data = data; // direct IO
mref->ref_prio = ref_prio;
mref_a->orig_page = page;
mref_a->is_kmapped = true;
error = GENERIC_INPUT_CALL(input, mref_get, mref);
if (unlikely(error < 0)) {

1
kernel/mars_if.h
View File

@ -36,7 +36,6 @@ struct if_mref_aspect {
int bio_count;
int current_len;
int max_len;
bool is_kmapped;
struct page *orig_page;
struct bio_wrapper *orig_biow[MAX_BIO];
struct if_input *input;