diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/nfs/symlink.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/nfs/symlink.c')
| -rw-r--r-- | fs/nfs/symlink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c index 412738dbfbc7..05c9e02f4153 100644 --- a/fs/nfs/symlink.c +++ b/fs/nfs/symlink.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/pagemap.h> | 19 | #include <linux/pagemap.h> |
| 20 | #include <linux/stat.h> | 20 | #include <linux/stat.h> |
| 21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/string.h> | 22 | #include <linux/string.h> |
| 24 | #include <linux/namei.h> | 23 | #include <linux/namei.h> |
| 25 | 24 | ||
| @@ -50,7 +49,7 @@ static void *nfs_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
| 50 | struct page *page; | 49 | struct page *page; |
| 51 | void *err; | 50 | void *err; |
| 52 | 51 | ||
| 53 | err = ERR_PTR(nfs_revalidate_mapping_nolock(inode, inode->i_mapping)); | 52 | err = ERR_PTR(nfs_revalidate_mapping(inode, inode->i_mapping)); |
| 54 | if (err) | 53 | if (err) |
| 55 | goto read_failed; | 54 | goto read_failed; |
| 56 | page = read_cache_page(&inode->i_data, 0, | 55 | page = read_cache_page(&inode->i_data, 0, |