projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
[cascardo/linux.git]
/
fs
/
fuse
/
dev.c
diff --git
a/fs/fuse/dev.c
b/fs/fuse/dev.c
index
0a648bb
..
aac71ce
100644
(file)
--- a/
fs/fuse/dev.c
+++ b/
fs/fuse/dev.c
@@
-667,15
+667,15
@@
static void fuse_copy_finish(struct fuse_copy_state *cs)
struct pipe_buffer *buf = cs->currbuf;
if (!cs->write) {
struct pipe_buffer *buf = cs->currbuf;
if (!cs->write) {
-
buf->ops->unmap(cs->pipe, buf,
cs->mapaddr);
+
kunmap_atomic(
cs->mapaddr);
} else {
} else {
- kunmap
(buf->page
);
+ kunmap
_atomic(cs->mapaddr
);
buf->len = PAGE_SIZE - cs->len;
}
cs->currbuf = NULL;
cs->mapaddr = NULL;
} else if (cs->mapaddr) {
buf->len = PAGE_SIZE - cs->len;
}
cs->currbuf = NULL;
cs->mapaddr = NULL;
} else if (cs->mapaddr) {
- kunmap
(cs->pg
);
+ kunmap
_atomic(cs->mapaddr
);
if (cs->write) {
flush_dcache_page(cs->pg);
set_page_dirty_lock(cs->pg);
if (cs->write) {
flush_dcache_page(cs->pg);
set_page_dirty_lock(cs->pg);
@@
-706,7
+706,7
@@
static int fuse_copy_fill(struct fuse_copy_state *cs)
BUG_ON(!cs->nr_segs);
cs->currbuf = buf;
BUG_ON(!cs->nr_segs);
cs->currbuf = buf;
- cs->mapaddr =
buf->ops->map(cs->pipe, buf, 0
);
+ cs->mapaddr =
kmap_atomic(buf->page
);
cs->len = buf->len;
cs->buf = cs->mapaddr + buf->offset;
cs->pipebufs++;
cs->len = buf->len;
cs->buf = cs->mapaddr + buf->offset;
cs->pipebufs++;
@@
-726,7
+726,7
@@
static int fuse_copy_fill(struct fuse_copy_state *cs)
buf->len = 0;
cs->currbuf = buf;
buf->len = 0;
cs->currbuf = buf;
- cs->mapaddr = kmap(page);
+ cs->mapaddr = kmap
_atomic
(page);
cs->buf = cs->mapaddr;
cs->len = PAGE_SIZE;
cs->pipebufs++;
cs->buf = cs->mapaddr;
cs->len = PAGE_SIZE;
cs->pipebufs++;
@@
-745,7
+745,7
@@
static int fuse_copy_fill(struct fuse_copy_state *cs)
return err;
BUG_ON(err != 1);
offset = cs->addr % PAGE_SIZE;
return err;
BUG_ON(err != 1);
offset = cs->addr % PAGE_SIZE;
- cs->mapaddr = kmap(cs->pg);
+ cs->mapaddr = kmap
_atomic
(cs->pg);
cs->buf = cs->mapaddr + offset;
cs->len = min(PAGE_SIZE - offset, cs->seglen);
cs->seglen -= cs->len;
cs->buf = cs->mapaddr + offset;
cs->len = min(PAGE_SIZE - offset, cs->seglen);
cs->seglen -= cs->len;
@@
-874,7
+874,7
@@
static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)
out_fallback_unlock:
unlock_page(newpage);
out_fallback:
out_fallback_unlock:
unlock_page(newpage);
out_fallback:
- cs->mapaddr =
buf->ops->map(cs->pipe, buf, 1
);
+ cs->mapaddr =
kmap_atomic(buf->page
);
cs->buf = cs->mapaddr + buf->offset;
err = lock_request(cs->fc, cs->req);
cs->buf = cs->mapaddr + buf->offset;
err = lock_request(cs->fc, cs->req);