git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
fs
/
hostfs
/
hostfs_kern.c
diff --git
a/fs/hostfs/hostfs_kern.c
b/fs/hostfs/hostfs_kern.c
index
7f34f43
..
3a31451
100644
(file)
--- a/
fs/hostfs/hostfs_kern.c
+++ b/
fs/hostfs/hostfs_kern.c
@@
-168,7
+168,7
@@
static char *follow_link(char *link)
if (name == NULL)
goto out;
if (name == NULL)
goto out;
- n = do_readlink(link, name, len);
+ n =
hostfs_
do_readlink(link, name, len);
if (n < len)
break;
len *= 2;
if (n < len)
break;
len *= 2;
@@
-943,7
+943,7
@@
int hostfs_link_readpage(struct file *file, struct page *page)
name = inode_name(page->mapping->host, 0);
if (name == NULL)
return -ENOMEM;
name = inode_name(page->mapping->host, 0);
if (name == NULL)
return -ENOMEM;
- err = do_readlink(name, buffer, PAGE_CACHE_SIZE);
+ err =
hostfs_
do_readlink(name, buffer, PAGE_CACHE_SIZE);
kfree(name);
if (err == PAGE_CACHE_SIZE)
err = -E2BIG;
kfree(name);
if (err == PAGE_CACHE_SIZE)
err = -E2BIG;