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

only send setattr if attr changed

Browse source 
for hidden, system, and archive, first check with our cached attributes
and if the values are the same, ignore this setattr
This commit is contained in:
Olga Kornievskaia 2012-04-02 18:41:37 -04:00
parent 41389178a3
commit 9135e07221
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/open.c
View file

@ -584,7 +584,7 @@ static int handle_open(nfs41_upcall *upcall)
args->mode = info.mode; args->mode = info.mode;
args->changeattr = info.change; args->changeattr = info.change;
} else { } else {
nfs41_file_info createattrs; nfs41_file_info createattrs = { 0 };
uint32_t create = 0, createhowmode = 0, lookup_status = status; uint32_t create = 0, createhowmode = 0, lookup_status = status;
if (!lookup_status && (args->disposition == FILE_OVERWRITE || if (!lookup_status && (args->disposition == FILE_OVERWRITE ||

23
daemon/setattr.c
View file

@ -61,16 +61,27 @@ static int handle_nfs41_setattr(setattr_upcall_args *args)
nfs41_open_state *state = args->state; nfs41_open_state *state = args->state;
nfs41_superblock *superblock = state->file.fh.superblock; nfs41_superblock *superblock = state->file.fh.superblock;
stateid_arg stateid; stateid_arg stateid;
nfs41_file_info info = { 0 }; nfs41_file_info info = { 0 }, old_info = { 0 };
int status = NO_ERROR; int status = NO_ERROR, getattr_status;
/* hidden */
info.hidden = basic_info->FileAttributes & FILE_ATTRIBUTE_HIDDEN ? 1 : 0; info.hidden = basic_info->FileAttributes & FILE_ATTRIBUTE_HIDDEN ? 1 : 0;
info.system = basic_info->FileAttributes & FILE_ATTRIBUTE_SYSTEM ? 1 : 0; info.system = basic_info->FileAttributes & FILE_ATTRIBUTE_SYSTEM ? 1 : 0;
info.archive = basic_info->FileAttributes & FILE_ATTRIBUTE_ARCHIVE ? 1 : 0; info.archive = basic_info->FileAttributes & FILE_ATTRIBUTE_ARCHIVE ? 1 : 0;
info.attrmask.arr[0] |= FATTR4_WORD0_HIDDEN | FATTR4_WORD0_ARCHIVE; getattr_status = nfs41_attr_cache_lookup(session_name_cache(state->session),
info.attrmask.arr[1] = FATTR4_WORD1_SYSTEM; state->file.fh.fileid, &old_info);
info.attrmask.count = 2;
if (getattr_status || info.hidden != old_info.hidden) {
info.attrmask.arr[0] = FATTR4_WORD0_HIDDEN;
info.attrmask.count = 1;
}
if (getattr_status || info.archive != old_info.archive) {
info.attrmask.arr[0] |= FATTR4_WORD0_ARCHIVE;
info.attrmask.count = 1;
}
if (getattr_status || info.system != old_info.system) {
info.attrmask.arr[1] = FATTR4_WORD1_SYSTEM;
info.attrmask.count = 2;
}
if (superblock->cansettime) { if (superblock->cansettime) {
/* set the time_delta so xdr_settime4() can decide /* set the time_delta so xdr_settime4() can decide