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

deleg: return delegation on attr cache failure

Browse source 
on opens that grant a delegation, return the delegation immediately if attribute cache insertion fails

nfs41_name_cache_insert() now returns success in the 'out_err_deleg' case, where name cache insertion failed but attr cache insertion was successful

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2011-08-17 12:11:02 -04:00 • committed by unknown
parent edd8f67873
commit a0d4403a99
2 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
daemon/name_cache.c
View file

@ -909,8 +909,9 @@ out_err_deleg:
if (delegation == OPEN_DELEGATE_READ || delegation == OPEN_DELEGATE_WRITE) { if (delegation == OPEN_DELEGATE_READ || delegation == OPEN_DELEGATE_WRITE) {
/* we still need a reference to the attributes for the delegation */ /* we still need a reference to the attributes for the delegation */
struct attr_cache_entry *attributes; struct attr_cache_entry *attributes;
if (attr_cache_find_or_create(&cache->attributes, status = attr_cache_find_or_create(&cache->attributes,
info->fileid, &attributes) == NO_ERROR) info->fileid, &attributes);
if (status == NO_ERROR)
attr_cache_update(attributes, info, delegation); attr_cache_update(attributes, info, delegation);
} }
goto out_unlock; goto out_unlock;

33
daemon/nfs41_ops.c
View file

@ -305,6 +305,30 @@ out:
return status; return status;
} }
static void open_delegation_return(
IN nfs41_session *session,
IN nfs41_path_fh *file,
IN open_delegation4 *delegation)
{
stateid_arg stateid;
int status;
if (delegation->type == OPEN_DELEGATE_NONE ||
delegation->type == OPEN_DELEGATE_NONE_EXT)
return;
/* return the delegation */
stateid.open = NULL;
stateid.delegation = NULL;
stateid.type = STATEID_DELEG_FILE;
memcpy(&stateid.stateid, &delegation->stateid, sizeof(stateid4));
status = nfs41_delegreturn(session, file, &stateid, TRUE);
/* clear the delegation type returned by nfs41_open() */
delegation->type = OPEN_DELEGATE_NONE;
}
int nfs41_open( int nfs41_open(
IN nfs41_session *session, IN nfs41_session *session,
IN nfs41_path_fh *parent, IN nfs41_path_fh *parent,
@ -321,7 +345,7 @@ int nfs41_open(
OUT open_delegation4 *delegation, OUT open_delegation4 *delegation,
OUT OPTIONAL nfs41_file_info *info) OUT OPTIONAL nfs41_file_info *info)
{ {
int status; int status, attr_status;
nfs41_compound compound; nfs41_compound compound;
nfs_argop4 argops[8]; nfs_argop4 argops[8];
nfs_resop4 resops[8]; nfs_resop4 resops[8];
@ -459,11 +483,16 @@ int nfs41_open(
memcpy(&info->attrmask, &getattr_res.obj_attributes.attrmask, memcpy(&info->attrmask, &getattr_res.obj_attributes.attrmask,
sizeof(bitmap4)); sizeof(bitmap4));
AcquireSRWLockShared(&file->path->lock); AcquireSRWLockShared(&file->path->lock);
nfs41_name_cache_insert(session_name_cache(session), attr_status = nfs41_name_cache_insert(session_name_cache(session),
file->path->path, &file->name, &file->fh, file->path->path, &file->name, &file->fh,
info, &open_res.resok4.cinfo, delegation->type); info, &open_res.resok4.cinfo, delegation->type);
ReleaseSRWLockShared(&file->path->lock); ReleaseSRWLockShared(&file->path->lock);
/* if we fail to cache the attributes, return the delegation
* immediately to free resources on the server */
if (attr_status)
open_delegation_return(session, file, delegation);
if (create == OPEN4_CREATE) if (create == OPEN4_CREATE)
nfs41_superblock_space_changed(file->fh.superblock); nfs41_superblock_space_changed(file->fh.superblock);
out: out: