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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
ocfs2
/
symlink.c
diff --git
a/fs/ocfs2/symlink.c
b/fs/ocfs2/symlink.c
index
c0f68aa
..
f6986bd
100644
(file)
--- a/
fs/ocfs2/symlink.c
+++ b/
fs/ocfs2/symlink.c
@@
-64,7
+64,8
@@
static char *ocfs2_page_getlink(struct dentry * dentry,
{
struct page * page;
struct address_space *mapping = dentry->d_inode->i_mapping;
{
struct page * page;
struct address_space *mapping = dentry->d_inode->i_mapping;
- page = read_mapping_page(mapping, 0, NULL);
+ page = read_cache_page(mapping, 0,
+ (filler_t *)mapping->a_ops->readpage, NULL);
if (IS_ERR(page))
goto sync_fail;
wait_on_page_locked(page);
if (IS_ERR(page))
goto sync_fail;
wait_on_page_locked(page);
@@
-154,7
+155,7
@@
static void *ocfs2_follow_link(struct dentry *dentry,
}
status = vfs_follow_link(nd, link);
}
status = vfs_follow_link(nd, link);
- if (status
&& status != -ENOENT
)
+ if (status)
mlog_errno(status);
bail:
if (page) {
mlog_errno(status);
bail:
if (page) {