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

open: use suppattr_exclcreat to mask exclusive create attributes

Browse source 
Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2012-03-29 14:40:12 -04:00 • committed by unknown
parent 6bb641e547
commit 68d97f5400
5 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
daemon/nfs41.h
View file

@ -34,6 +34,7 @@ struct __nfs41_root;
typedef struct __nfs41_superblock { typedef struct __nfs41_superblock {
nfs41_fsid fsid; nfs41_fsid fsid;
bitmap4 supported_attrs; bitmap4 supported_attrs;
bitmap4 suppattr_exclcreat;
nfstime4 time_delta; nfstime4 time_delta;
uint64_t maxread; uint64_t maxread;
uint64_t maxwrite; uint64_t maxwrite;
@ -423,6 +424,10 @@ void nfs41_superblock_supported_attrs(
IN nfs41_superblock *superblock, IN nfs41_superblock *superblock,
IN OUT bitmap4 *attrs); IN OUT bitmap4 *attrs);
void nfs41_superblock_supported_attrs_exclcreat(
IN nfs41_superblock *superblock,
IN OUT bitmap4 *attrs);
void nfs41_superblock_space_changed( void nfs41_superblock_space_changed(
IN nfs41_superblock *superblock); IN nfs41_superblock *superblock);

9
daemon/nfs41_ops.c
View file

@ -466,7 +466,14 @@ int nfs41_open(
if (how_mode == EXCLUSIVE4_1) { if (how_mode == EXCLUSIVE4_1) {
DWORD tid = GetCurrentThreadId(); DWORD tid = GetCurrentThreadId();
time((time_t*)open_args.openhow.how.createverf); time((time_t*)open_args.openhow.how.createverf);
memcpy(open_args.openhow.how.createverf+4, &tid, sizeof(tid)); memcpy(open_args.openhow.how.createverf+4, &tid, sizeof(tid));
/* mask unsupported attributes */
nfs41_superblock_supported_attrs_exclcreat(
parent->fh.superblock, &createattrs->attrmask);
} else {
/* mask unsupported attributes */
nfs41_superblock_supported_attrs(
parent->fh.superblock, &createattrs->attrmask);
} }
open_args.claim = claim; open_args.claim = claim;
open_res.resok4.stateid = stateid; open_res.resok4.stateid = stateid;

20
daemon/nfs41_superblock.c
View file

@ -86,9 +86,11 @@ static int get_superblock_attrs(
FATTR4_WORD0_MAXREAD | (uint32_t)(FATTR4_WORD0_MAXWRITE); FATTR4_WORD0_MAXREAD | (uint32_t)(FATTR4_WORD0_MAXWRITE);
attr_request.arr[1] = FATTR4_WORD1_FS_LAYOUT_TYPE | attr_request.arr[1] = FATTR4_WORD1_FS_LAYOUT_TYPE |
FATTR4_WORD1_TIME_DELTA; FATTR4_WORD1_TIME_DELTA;
attr_request.count = 2; attr_request.arr[2] = FATTR4_WORD2_SUPPATTR_EXCLCREAT;
attr_request.count = 3;
info.supported_attrs = &superblock->supported_attrs; info.supported_attrs = &superblock->supported_attrs;
info.suppattr_exclcreat = &superblock->suppattr_exclcreat;
info.time_delta = &superblock->time_delta; info.time_delta = &superblock->time_delta;
status = nfs41_getattr(session, file, &attr_request, &info); status = nfs41_getattr(session, file, &attr_request, &info);
@ -259,6 +261,22 @@ void nfs41_superblock_supported_attrs(
ReleaseSRWLockShared(&superblock->lock); ReleaseSRWLockShared(&superblock->lock);
} }
void nfs41_superblock_supported_attrs_exclcreat(
IN nfs41_superblock *superblock,
IN OUT bitmap4 *attrs)
{
uint32_t i, count = 0;
AcquireSRWLockShared(&superblock->lock);
for (i = 0; i < 3; i++) {
attrs->arr[i] &= superblock->suppattr_exclcreat.arr[i];
if (attrs->arr[i])
count = i+1;
}
attrs->count = min(attrs->count, count);
ReleaseSRWLockShared(&superblock->lock);
}
void nfs41_superblock_space_changed( void nfs41_superblock_space_changed(
IN nfs41_superblock *superblock) IN nfs41_superblock *superblock)
{ {

1
daemon/nfs41_types.h
View file

@ -207,6 +207,7 @@ typedef struct __nfs41_file_info {
nfstime4 *time_delta; /* XXX: per-fs */ nfstime4 *time_delta; /* XXX: per-fs */
bitmap4 attrmask; bitmap4 attrmask;
bitmap4 *supported_attrs; /* XXX: per-fs */ bitmap4 *supported_attrs; /* XXX: per-fs */
bitmap4 *suppattr_exclcreat; /* XXX: per-fs */
uint64_t maxread; /* XXX: per-fs */ uint64_t maxread; /* XXX: per-fs */
uint64_t maxwrite; /* XXX: per-fs */ uint64_t maxwrite; /* XXX: per-fs */
uint64_t change; uint64_t change;

4
daemon/nfs41_xdr.c
View file

@ -1851,6 +1851,10 @@ static bool_t decode_file_attrs(
if (!xdr_mdsthreshold(xdr, &info->mdsthreshold)) if (!xdr_mdsthreshold(xdr, &info->mdsthreshold))
return FALSE; return FALSE;
} }
if (attrs->attrmask.arr[2] & FATTR4_WORD2_SUPPATTR_EXCLCREAT) {
if (!xdr_bitmap4(xdr, info->suppattr_exclcreat))
return FALSE;
}
} }
return TRUE; return TRUE;
} }