Commit 2cb6e314 authored by Trond Myklebust's avatar Trond Myklebust

Fix an Oops in the NFSv4 asynchronous unlink code. The v4

getattr "bitmap" was allocated on the stack.

Make it use the bitmaps already allocated for that purpose
in the nfs_fattr struct.
parent 8bd899bc
This diff is collapsed.
...@@ -1333,8 +1333,10 @@ decode_getattr(struct xdr_stream *xdr, struct nfs4_getattr *getattr, ...@@ -1333,8 +1333,10 @@ decode_getattr(struct xdr_stream *xdr, struct nfs4_getattr *getattr,
dprintk("read_attrs: server returned bad attributes!\n"); dprintk("read_attrs: server returned bad attributes!\n");
goto xdr_error; goto xdr_error;
} }
getattr->gt_bmres[0] = bmval0; if (nfp) {
getattr->gt_bmres[1] = bmval1; nfp->bitmap[0] = bmval0;
nfp->bitmap[1] = bmval1;
}
/* /*
* In case the server doesn't return some attributes, * In case the server doesn't return some attributes,
......
...@@ -451,7 +451,6 @@ struct nfs4_getattr { ...@@ -451,7 +451,6 @@ struct nfs4_getattr {
struct nfs_fsstat * gt_fsstat; /* response */ struct nfs_fsstat * gt_fsstat; /* response */
struct nfs_fsinfo * gt_fsinfo; /* response */ struct nfs_fsinfo * gt_fsinfo; /* response */
struct nfs_pathconf * gt_pathconf; /* response */ struct nfs_pathconf * gt_pathconf; /* response */
u32 * gt_bmres; /* response */
}; };
struct nfs4_getfh { struct nfs4_getfh {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment