diff --git a/[refs] b/[refs] index 2defbeb8a1ac..76b1436383f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1940805d0636c6cdf37636f55b43b9681d53e73 +refs/heads/master: b8ef70639b609c5d12c618f1d9ffae6ac13aebe3 diff --git a/trunk/include/linux/nfs_xdr.h b/trunk/include/linux/nfs_xdr.h index c1cceb83f709..c74595ba7094 100644 --- a/trunk/include/linux/nfs_xdr.h +++ b/trunk/include/linux/nfs_xdr.h @@ -1155,7 +1155,6 @@ struct nfs_read_data { }; struct nfs_write_data { - int flags; struct rpc_task task; struct inode *inode; struct rpc_cred *cred;