git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NFS: Allow the "nfs" file system type to support NFSv4
[pandora-kernel.git]
/
fs
/
nfs
/
symlink.c
diff --git
a/fs/nfs/symlink.c
b/fs/nfs/symlink.c
index
f4a0548
..
412738d
100644
(file)
--- a/
fs/nfs/symlink.c
+++ b/
fs/nfs/symlink.c
@@
-10,7
+10,6
@@
* nfs symlink handling code
*/
* nfs symlink handling code
*/
-#define NFS_NEED_XDR_TYPES
#include <linux/time.h>
#include <linux/errno.h>
#include <linux/sunrpc/clnt.h>
#include <linux/time.h>
#include <linux/errno.h>
#include <linux/sunrpc/clnt.h>
@@
-22,7
+21,6
@@
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/string.h>
-#include <linux/smp_lock.h>
#include <linux/namei.h>
/* Symlink caching in the page cache is even more simplistic
#include <linux/namei.h>
/* Symlink caching in the page cache is even more simplistic
@@
-61,15
+59,9
@@
static void *nfs_follow_link(struct dentry *dentry, struct nameidata *nd)
err = page;
goto read_failed;
}
err = page;
goto read_failed;
}
- if (!PageUptodate(page)) {
- err = ERR_PTR(-EIO);
- goto getlink_read_error;
- }
nd_set_link(nd, kmap(page));
return page;
nd_set_link(nd, kmap(page));
return page;
-getlink_read_error:
- page_cache_release(page);
read_failed:
nd_set_link(nd, err);
return NULL;
read_failed:
nd_set_link(nd, err);
return NULL;