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
[PATCH] Add suspend/resume for HPET
[safe/jmp/linux-2.6]
/
fs
/
nfs
/
symlink.c
diff --git
a/fs/nfs/symlink.c
b/fs/nfs/symlink.c
index
6c68611
..
f4a0548
100644
(file)
--- a/
fs/nfs/symlink.c
+++ b/
fs/nfs/symlink.c
@@
-50,7
+50,9
@@
static void *nfs_follow_link(struct dentry *dentry, struct nameidata *nd)
{
struct inode *inode = dentry->d_inode;
struct page *page;
{
struct inode *inode = dentry->d_inode;
struct page *page;
- void *err = ERR_PTR(nfs_revalidate_mapping(inode, inode->i_mapping));
+ void *err;
+
+ err = ERR_PTR(nfs_revalidate_mapping_nolock(inode, inode->i_mapping));
if (err)
goto read_failed;
page = read_cache_page(&inode->i_data, 0,
if (err)
goto read_failed;
page = read_cache_page(&inode->i_data, 0,
@@
-76,7
+78,7
@@
read_failed:
/*
* symlinks can't do much...
*/
/*
* symlinks can't do much...
*/
-struct inode_operations nfs_symlink_inode_operations = {
+
const
struct inode_operations nfs_symlink_inode_operations = {
.readlink = generic_readlink,
.follow_link = nfs_follow_link,
.put_link = page_put_link,
.readlink = generic_readlink,
.follow_link = nfs_follow_link,
.put_link = page_put_link,