diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-08 05:03:11 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-08 05:03:11 +0100 |
| commit | d5112a4f31a361409d3c57dc9d58dd69f8014bef (patch) | |
| tree | 64771300b2191cb94d9aaf60355661a01c2ccd1a /fs/nfs/symlink.c | |
| parent | [POWERPC] Only use H_BULK_REMOVE if the firmware supports it (diff) | |
| parent | [POWERPC] Fixup error handling when emulating a floating point instruction (diff) | |
| download | linux-d5112a4f31a361409d3c57dc9d58dd69f8014bef.tar.xz linux-d5112a4f31a361409d3c57dc9d58dd69f8014bef.zip | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.21
Diffstat (limited to 'fs/nfs/symlink.c')
| -rw-r--r-- | fs/nfs/symlink.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c index 6c686112cc03..525c136c7d8c 100644 --- 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; - 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, |