diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 11:02:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 11:02:16 +1000 |
| commit | d08468df3ab82b5e2f129c9dc2d7db9bbf5565cd (patch) | |
| tree | 9f1e466c7f740bca4dc9c7d724048dd62aa0f713 /include | |
| parent | 540259102783b4bc916a27576b89e59e89582e17 (diff) | |
| parent | a75b9df9d3bfc3cd1083974c045ae31ce5f3434f (diff) | |
Merge remote-tracking branch 'nfs/linux-next'
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 { |