Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
xenomai
ipipe-x86
Commits
2408f6ef
Commit
2408f6ef
authored
Nov 25, 2011
by
Cong Wang
Committed by
Cong Wang
Mar 20, 2012
Browse files
fuse: remove the second argument of k[un]map_atomic()
Signed-off-by:
Cong Wang
<
amwang@redhat.com
>
parent
d4a23aee
Changes
2
Hide whitespace changes
Inline
Side-by-side
fs/fuse/dev.c
View file @
2408f6ef
...
...
@@ -838,10 +838,10 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep,
}
}
if
(
page
)
{
void
*
mapaddr
=
kmap_atomic
(
page
,
KM_USER0
);
void
*
mapaddr
=
kmap_atomic
(
page
);
void
*
buf
=
mapaddr
+
offset
;
offset
+=
fuse_copy_do
(
cs
,
&
buf
,
&
count
);
kunmap_atomic
(
mapaddr
,
KM_USER0
);
kunmap_atomic
(
mapaddr
);
}
else
offset
+=
fuse_copy_do
(
cs
,
NULL
,
&
count
);
}
...
...
fs/fuse/file.c
View file @
2408f6ef
...
...
@@ -1887,11 +1887,11 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
in_iovs
+
out_iovs
>
FUSE_IOCTL_MAX_IOV
)
goto
out
;
vaddr
=
kmap_atomic
(
pages
[
0
]
,
KM_USER0
);
vaddr
=
kmap_atomic
(
pages
[
0
]);
err
=
fuse_copy_ioctl_iovec
(
fc
,
iov_page
,
vaddr
,
transferred
,
in_iovs
+
out_iovs
,
(
flags
&
FUSE_IOCTL_COMPAT
)
!=
0
);
kunmap_atomic
(
vaddr
,
KM_USER0
);
kunmap_atomic
(
vaddr
);
if
(
err
)
goto
out
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment