mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
fuse/dev: use atomic maps
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
8ffcb32e05
commit
58bda1da4b
1 changed files with 5 additions and 5 deletions
|
@ -669,13 +669,13 @@ static void fuse_copy_finish(struct fuse_copy_state *cs)
|
|||
if (!cs->write) {
|
||||
buf->ops->unmap(cs->pipe, buf, cs->mapaddr);
|
||||
} else {
|
||||
kunmap(buf->page);
|
||||
kunmap_atomic(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);
|
||||
|
@ -706,7 +706,7 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
|
|||
|
||||
BUG_ON(!cs->nr_segs);
|
||||
cs->currbuf = buf;
|
||||
cs->mapaddr = buf->ops->map(cs->pipe, buf, 0);
|
||||
cs->mapaddr = buf->ops->map(cs->pipe, buf, 1);
|
||||
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;
|
||||
cs->mapaddr = kmap(page);
|
||||
cs->mapaddr = kmap_atomic(page);
|
||||
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;
|
||||
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;
|
||||
|
|
Loading…
Reference in a new issue