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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
ocfs2
/
symlink.c
diff --git
a/fs/ocfs2/symlink.c
b/fs/ocfs2/symlink.c
index
f6986bd
..
03b0191
100644
(file)
--- a/
fs/ocfs2/symlink.c
+++ b/
fs/ocfs2/symlink.c
@@
-64,8
+64,7
@@
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_cache_page(mapping, 0,
- (filler_t *)mapping->a_ops->readpage, NULL);
+ page = read_mapping_page(mapping, 0, 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);
@@
-127,6
+126,10
@@
static int ocfs2_readlink(struct dentry *dentry,
goto out;
}
goto out;
}
+ /*
+ * Without vfsmount we can't update atime now,
+ * but we will update atime here ultimately.
+ */
ret = vfs_readlink(dentry, buffer, buflen, link);
brelse(bh);
ret = vfs_readlink(dentry, buffer, buflen, link);
brelse(bh);
@@
-155,8
+158,7
@@
static void *ocfs2_follow_link(struct dentry *dentry,
}
status = vfs_follow_link(nd, link);
}
status = vfs_follow_link(nd, link);
- if (status)
- mlog_errno(status);
+
bail:
if (page) {
kunmap(page);
bail:
if (page) {
kunmap(page);