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
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
nfs
/
mount_clnt.c
diff --git
a/fs/nfs/mount_clnt.c
b/fs/nfs/mount_clnt.c
index
8afd9f7
..
779d2eb
100644
(file)
--- a/
fs/nfs/mount_clnt.c
+++ b/
fs/nfs/mount_clnt.c
@@
-56,7
+56,7
@@
int nfs_mount(struct sockaddr *addr, size_t len, char *hostname, char *path,
.program = &mnt_program,
.version = version,
.authflavor = RPC_AUTH_UNIX,
.program = &mnt_program,
.version = version,
.authflavor = RPC_AUTH_UNIX,
- .flags =
RPC_CLNT_CREATE_INTR
,
+ .flags =
0
,
};
struct rpc_clnt *mnt_clnt;
int status;
};
struct rpc_clnt *mnt_clnt;
int status;
@@
-130,10
+130,11
@@
static int xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p,
struct mnt_fhstatus *res)
{
struct nfs_fh *fh = res->fh;
struct mnt_fhstatus *res)
{
struct nfs_fh *fh = res->fh;
+ unsigned size;
if ((res->status = ntohl(*p++)) == 0) {
if ((res->status = ntohl(*p++)) == 0) {
-
int
size = ntohl(*p++);
- if (size <= NFS3_FHSIZE) {
+ size = ntohl(*p++);
+ if (size <= NFS3_FHSIZE
&& size != 0
) {
fh->size = size;
memcpy(fh->data, p, size);
} else
fh->size = size;
memcpy(fh->data, p, size);
} else