diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-13 15:19:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-13 15:19:39 -0700 |
| commit | cf70cc5b9d6a07d21ffd521aee690d26315d1bdf (patch) | |
| tree | 4804c11071e693eb5d66799bb8e05431f7905c84 /include | |
| parent | 087fbc9962e10a65fb0b542ecfc116ebf6cf1735 (diff) | |
| parent | a75b9df9d3bfc3cd1083974c045ae31ce5f3434f (diff) | |
| download | linux-cf70cc5b9d6a07d21ffd521aee690d26315d1bdf.tar.gz linux-cf70cc5b9d6a07d21ffd521aee690d26315d1bdf.tar.bz2 linux-cf70cc5b9d6a07d21ffd521aee690d26315d1bdf.zip | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFSv4.1: Ensure that layoutget uses the correct gfp modes
NFSv4.1: remove pnfs_layout_hdr from pnfs_destroy_all_layouts tmp_list
NFSv41: Resend on NFS4ERR_RETRY_UNCACHED_REP
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfs_xdr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 890dce242639..7e371f7df9c4 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -233,6 +233,7 @@ struct nfs4_layoutget { struct nfs4_layoutget_args args; struct nfs4_layoutget_res res; struct pnfs_layout_segment **lsegpp; + gfp_t gfp_flags; }; struct nfs4_getdeviceinfo_args { |