NFSv4: Fix an Oops in the synchronous write path
- Missing initialisation of attribute bitmask in _nfs4_proc_write() - On success, _nfs4_proc_write() must return number of bytes written. - Missing post_op_update_inode() in _nfs4_proc_write() - Missing initialisation of attribute bitmask in _nfs4_proc_commit() - Missing post_op_update_inode() in _nfs4_proc_commit() Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
5ba7cc4801
commit
3b6efee923
|
@ -1506,10 +1506,15 @@ static int _nfs4_proc_write(struct nfs_write_data *wdata)
|
|||
dprintk("NFS call write %d @ %Ld\n", wdata->args.count,
|
||||
(long long) wdata->args.offset);
|
||||
|
||||
wdata->args.bitmask = server->attr_bitmask;
|
||||
wdata->res.server = server;
|
||||
nfs_fattr_init(fattr);
|
||||
status = rpc_call_sync(server->client, &msg, rpcflags);
|
||||
dprintk("NFS reply write: %d\n", status);
|
||||
return status;
|
||||
if (status < 0)
|
||||
return status;
|
||||
nfs_post_op_update_inode(inode, fattr);
|
||||
return wdata->res.count;
|
||||
}
|
||||
|
||||
static int nfs4_proc_write(struct nfs_write_data *wdata)
|
||||
|
@ -1540,9 +1545,13 @@ static int _nfs4_proc_commit(struct nfs_write_data *cdata)
|
|||
dprintk("NFS call commit %d @ %Ld\n", cdata->args.count,
|
||||
(long long) cdata->args.offset);
|
||||
|
||||
cdata->args.bitmask = server->attr_bitmask;
|
||||
cdata->res.server = server;
|
||||
nfs_fattr_init(fattr);
|
||||
status = rpc_call_sync(server->client, &msg, 0);
|
||||
dprintk("NFS reply commit: %d\n", status);
|
||||
if (status >= 0)
|
||||
nfs_post_op_update_inode(inode, fattr);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue