projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[powerpc.git]
/
fs
/
freevxfs
/
vxfs_immed.c
diff --git
a/fs/freevxfs/vxfs_immed.c
b/fs/freevxfs/vxfs_immed.c
index
b20c3ef
..
4e25f3f
100644
(file)
--- a/
fs/freevxfs/vxfs_immed.c
+++ b/
fs/freevxfs/vxfs_immed.c
@@
-56,7
+56,7
@@
struct inode_operations vxfs_immed_symlink_iops = {
/*
* Adress space operations for immed files and directories.
*/
/*
* Adress space operations for immed files and directories.
*/
-struct address_space_operations vxfs_immed_aops = {
+
const
struct address_space_operations vxfs_immed_aops = {
.readpage = vxfs_immed_readpage,
};
.readpage = vxfs_immed_readpage,
};
@@
-72,7
+72,7
@@
struct address_space_operations vxfs_immed_aops = {
* Returns:
* Zero on success, else a negative error code.
*/
* Returns:
* Zero on success, else a negative error code.
*/
-static
int
+static
void *
vxfs_immed_follow_link(struct dentry *dp, struct nameidata *np)
{
struct vxfs_inode_info *vip = VXFS_INO(dp->d_inode);
vxfs_immed_follow_link(struct dentry *dp, struct nameidata *np)
{
struct vxfs_inode_info *vip = VXFS_INO(dp->d_inode);
@@
-99,8
+99,8
@@
static int
vxfs_immed_readpage(struct file *fp, struct page *pp)
{
struct vxfs_inode_info *vip = VXFS_INO(pp->mapping->host);
vxfs_immed_readpage(struct file *fp, struct page *pp)
{
struct vxfs_inode_info *vip = VXFS_INO(pp->mapping->host);
- u_int64_t
offset =
pp->index << PAGE_CACHE_SHIFT;
- caddr_t
kaddr;
+ u_int64_t
offset = (u_int64_t)
pp->index << PAGE_CACHE_SHIFT;
+ caddr_t kaddr;
kaddr = kmap(pp);
memcpy(kaddr, vip->vii_immed.vi_immed + offset, PAGE_CACHE_SIZE);
kaddr = kmap(pp);
memcpy(kaddr, vip->vii_immed.vi_immed + offset, PAGE_CACHE_SIZE);