git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
congestion_wait(): don't use WRITE
[safe/jmp/linux-2.6]
/
mm
/
filemap_xip.c
diff --git
a/mm/filemap_xip.c
b/mm/filemap_xip.c
index
bf54f8a
..
1888b2d
100644
(file)
--- a/
mm/filemap_xip.c
+++ b/
mm/filemap_xip.c
@@
-89,8
+89,8
@@
do_xip_mapping_read(struct address_space *mapping,
}
}
nr = nr - offset;
}
}
nr = nr - offset;
- if (nr > len)
- nr = len;
+ if (nr > len
- copied
)
+ nr = len
- copied
;
error = mapping->a_ops->get_xip_mem(mapping, index, 0,
&xip_mem, &xip_pfn);
error = mapping->a_ops->get_xip_mem(mapping, index, 0,
&xip_mem, &xip_pfn);
@@
-296,7
+296,7
@@
out:
}
}
}
}
-static struct vm_operations_struct xip_file_vm_ops = {
+static
const
struct vm_operations_struct xip_file_vm_ops = {
.fault = xip_file_fault,
};
.fault = xip_file_fault,
};
@@
-354,7
+354,7
@@
__xip_file_write(struct file *filp, const char __user *buf,
break;
copied = bytes -
break;
copied = bytes -
- __copy_from_user_nocache(xip_mem + offset, buf, bytes
, bytes
);
+ __copy_from_user_nocache(xip_mem + offset, buf, bytes);
if (likely(copied > 0)) {
status = copied;
if (likely(copied > 0)) {
status = copied;