From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 Jul 2011 17:59:46 +0000 (-0400)
Subject: Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
X-Git-Tag: v3.1-rc1~103^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f00bcb38ef9a980a33c6dbdc0044964b05f22dd;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

vfs/nfs: fixup for nfs_open_context change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

5f00bcb38ef9a980a33c6dbdc0044964b05f22dd
diff --cc fs/nfs/read.c
index 7cba228,a68679f..2171c04
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@@ -217,10 -202,12 +217,10 @@@ EXPORT_SYMBOL_GPL(nfs_initiate_read)
  /*
   * Set up the NFS read request struct
   */
 -static int nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
 -		const struct rpc_call_ops *call_ops,
 -		unsigned int count, unsigned int offset,
 -		struct pnfs_layout_segment *lseg)
 +static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
 +		unsigned int count, unsigned int offset)
  {
- 	struct inode *inode = req->wb_context->path.dentry->d_inode;
+ 	struct inode *inode = req->wb_context->dentry->d_inode;
  
  	data->req	  = req;
  	data->inode	  = inode;
@@@ -238,12 -226,10 +238,12 @@@
  	data->res.count   = count;
  	data->res.eof     = 0;
  	nfs_fattr_init(&data->fattr);
 +}
  
 -	if (data->lseg &&
 -	    (pnfs_try_to_read_data(data, call_ops) == PNFS_ATTEMPTED))
 -		return 0;
 +static int nfs_do_read(struct nfs_read_data *data,
 +		const struct rpc_call_ops *call_ops)
 +{
- 	struct inode *inode = data->args.context->path.dentry->d_inode;
++	struct inode *inode = data->args.context->dentry->d_inode;
  
  	return nfs_initiate_read(data, NFS_CLIENT(inode), call_ops);
  }
diff --cc fs/nfs/write.c
index 9fba527,0857931..ebed518
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@@ -845,19 -845,22 +845,19 @@@ EXPORT_SYMBOL_GPL(nfs_initiate_write)
  /*
   * Set up the argument/result storage required for the RPC call.
   */
 -static int nfs_write_rpcsetup(struct nfs_page *req,
 +static void nfs_write_rpcsetup(struct nfs_page *req,
  		struct nfs_write_data *data,
 -		const struct rpc_call_ops *call_ops,
  		unsigned int count, unsigned int offset,
 -		struct pnfs_layout_segment *lseg,
  		int how)
  {
- 	struct inode *inode = req->wb_context->path.dentry->d_inode;
+ 	struct inode *inode = req->wb_context->dentry->d_inode;
  
  	/* Set up the RPC argument and reply structs
  	 * NB: take care not to mess about with data->commit et al. */
  
  	data->req = req;
- 	data->inode = inode = req->wb_context->path.dentry->d_inode;
+ 	data->inode = inode = req->wb_context->dentry->d_inode;
  	data->cred = req->wb_context->cred;
 -	data->lseg = get_lseg(lseg);
  
  	data->args.fh     = NFS_FH(inode);
  	data->args.offset = req_offset(req) + offset;
@@@ -883,13 -882,10 +883,13 @@@
  	data->res.count   = count;
  	data->res.verf    = &data->verf;
  	nfs_fattr_init(&data->fattr);
 +}
  
 -	if (data->lseg &&
 -	    (pnfs_try_to_write_data(data, call_ops, how) == PNFS_ATTEMPTED))
 -		return 0;
 +static int nfs_do_write(struct nfs_write_data *data,
 +		const struct rpc_call_ops *call_ops,
 +		int how)
 +{
- 	struct inode *inode = data->args.context->path.dentry->d_inode;
++	struct inode *inode = data->args.context->dentry->d_inode;
  
  	return nfs_initiate_write(data, NFS_CLIENT(inode), call_ops, how);
  }