evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

setattr: add GETATTR to capture side effects

Browse source 
instead of updating the attribute cache with the values given to SETATTR, add a GETATTR to the compound; this will capture changes to time_modify and change that the client could otherwise miss, and get the server's value of timestamps sent with SET_TO_SERVER_TIME4

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2011-07-05 12:09:30 -04:00 • committed by unknown
parent 2f0393e7d3
commit 144642e2cd
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
daemon/nfs41_ops.c
View file

@ -1299,14 +1299,17 @@ int nfs41_setattr(
{ {
int status; int status;
nfs41_compound compound; nfs41_compound compound;
nfs_argop4 argops[3]; nfs_argop4 argops[4];
nfs_resop4 resops[3]; nfs_resop4 resops[4];
nfs41_sequence_args sequence_args; nfs41_sequence_args sequence_args;
nfs41_sequence_res sequence_res; nfs41_sequence_res sequence_res;
nfs41_putfh_args putfh_args; nfs41_putfh_args putfh_args;
nfs41_putfh_res putfh_res; nfs41_putfh_res putfh_res;
nfs41_setattr_args setattr_args; nfs41_setattr_args setattr_args;
nfs41_setattr_res setattr_res; nfs41_setattr_res setattr_res;
nfs41_getattr_args getattr_args;
nfs41_getattr_res getattr_res;
bitmap4 attr_request;
compound_init(&compound, argops, resops, "setattr"); compound_init(&compound, argops, resops, "setattr");
@ -1323,6 +1326,12 @@ int nfs41_setattr(
setattr_args.stateid = stateid; setattr_args.stateid = stateid;
setattr_args.info = info; setattr_args.info = info;
init_getattr_request(&attr_request);
compound_add_op(&compound, OP_GETATTR, &getattr_args, &getattr_res);
getattr_args.attr_request = &attr_request;
getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
getattr_res.info = info;
status = compound_encode_send_decode(session, &compound, TRUE); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1330,7 +1339,7 @@ int nfs41_setattr(
if (compound_error(status = compound.res.status)) if (compound_error(status = compound.res.status))
goto out; goto out;
memcpy(&info->attrmask, &setattr_res.attrsset, sizeof(bitmap4)); memcpy(&info->attrmask, &attr_request, sizeof(bitmap4));
nfs41_attr_cache_update(session_name_cache(session), nfs41_attr_cache_update(session_name_cache(session),
file->fh.fileid, info); file->fh.fileid, info);