git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
fs
/
xfs
/
support
/
move.c
diff --git
a/fs/xfs/support/move.c
b/fs/xfs/support/move.c
index
caefa17
..
ac8617c
100644
(file)
--- a/
fs/xfs/support/move.c
+++ b/
fs/xfs/support/move.c
@@
-22,7
+22,7
@@
* as we go.
*/
int
* as we go.
*/
int
-uio_read(caddr_t src, size_t len, struct uio *uio)
+
xfs_
uio_read(caddr_t src, size_t len, struct uio *uio)
{
size_t count;
{
size_t count;