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

timestamps: superblock stores attributes cansettime,time_delta

Browse source 
Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2010-10-12 09:42:36 -04:00
parent cc298599d8
commit e67560fd4a
4 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/nfs41.h
View file

@ -35,9 +35,11 @@ struct __rpc_client;
typedef struct __nfs41_superblock { typedef struct __nfs41_superblock {
nfs41_fsid fsid; nfs41_fsid fsid;
bitmap4 supported_attrs; bitmap4 supported_attrs;
nfstime4 time_delta;
uint64_t maxread; uint64_t maxread;
uint64_t maxwrite; uint64_t maxwrite;
uint32_t layout_types; uint32_t layout_types;
bool_t cansettime;
struct list_entry entry; /* position in nfs41_server.superblocks */ struct list_entry entry; /* position in nfs41_server.superblocks */
SRWLOCK lock; SRWLOCK lock;

24
daemon/nfs41_superblock.c
View file

@ -87,13 +87,16 @@ static int get_superblock_attrs(
bitmap4 attr_request; bitmap4 attr_request;
nfs41_file_info info; nfs41_file_info info;
attr_request.arr[0] = (uint32_t)(FATTR4_WORD0_SUPPORTED_ATTRS | attr_request.arr[0] = FATTR4_WORD0_SUPPORTED_ATTRS |
FATTR4_WORD0_MAXREAD | FATTR4_WORD0_MAXWRITE); FATTR4_WORD0_CANSETTIME | FATTR4_WORD0_MAXREAD |
attr_request.arr[1] = FATTR4_WORD1_FS_LAYOUT_TYPE; (uint32_t)(FATTR4_WORD0_MAXWRITE);
attr_request.arr[1] = FATTR4_WORD1_FS_LAYOUT_TYPE |
FATTR4_WORD1_TIME_DELTA;
attr_request.count = 2; attr_request.count = 2;
ZeroMemory(&info, sizeof(info)); ZeroMemory(&info, sizeof(info));
info.supported_attrs = &superblock->supported_attrs; info.supported_attrs = &superblock->supported_attrs;
info.time_delta = &superblock->time_delta;
status = nfs41_getattr(session, file, &attr_request, &info); status = nfs41_getattr(session, file, &attr_request, &info);
if (status) { if (status) {
@ -116,11 +119,22 @@ static int get_superblock_attrs(
superblock->layout_types = info.fs_layout_types; superblock->layout_types = info.fs_layout_types;
if (bitmap_isset(&info.attrmask, 0, FATTR4_WORD0_CANSETTIME))
superblock->cansettime = info.cansettime;
else /* cansettime is not supported, try setting them anyway */
superblock->cansettime = 1;
/* if time_delta is not supported, default to 1s */
if (!bitmap_isset(&info.attrmask, 1, FATTR4_WORD1_TIME_DELTA))
superblock->time_delta.seconds = 1;
dprintf(SBLVL, "attributes for fsid(%llu,%llu): " dprintf(SBLVL, "attributes for fsid(%llu,%llu): "
"maxread=%llu, maxwrite=%llu, layout_types: 0x%X\n", "maxread=%llu, maxwrite=%llu, layout_types: 0x%X, "
"cansettime=%u, time_delta={%ll,%u}\n",
superblock->fsid.major, superblock->fsid.minor, superblock->fsid.major, superblock->fsid.minor,
superblock->maxread, superblock->maxwrite, superblock->maxread, superblock->maxwrite,
superblock->layout_types); superblock->layout_types, superblock->cansettime,
superblock->time_delta.seconds, superblock->time_delta.nseconds);
out: out:
return status; return status;
} }

2
daemon/nfs41_types.h
View file

@ -161,6 +161,7 @@ typedef struct __nfs41_file_info {
nfstime4 time_access; nfstime4 time_access;
nfstime4 time_create; nfstime4 time_create;
nfstime4 time_modify; nfstime4 time_modify;
nfstime4 *time_delta; /* XXX: per-fs */
bitmap4 attrmask; bitmap4 attrmask;
bitmap4 *supported_attrs; /* XXX: per-fs */ bitmap4 *supported_attrs; /* XXX: per-fs */
uint64_t maxread; /* XXX: per-fs */ uint64_t maxread; /* XXX: per-fs */
@ -180,6 +181,7 @@ typedef struct __nfs41_file_info {
uint32_t lease_time; /* XXX: per-server */ uint32_t lease_time; /* XXX: per-server */
uint32_t fs_layout_types; /* pnfs, XXX: per-fs */ uint32_t fs_layout_types; /* pnfs, XXX: per-fs */
bool_t hidden; bool_t hidden;
bool_t cansettime; /* XXX: per-fs */
bool_t case_insensitive; bool_t case_insensitive;
bool_t case_preserving; bool_t case_preserving;
} nfs41_file_info; } nfs41_file_info;

8
daemon/nfs41_xdr.c
View file

@ -1546,6 +1546,10 @@ static bool_t decode_file_attrs(
if (!xdr_u_int32_t(xdr, &info->rdattr_error)) if (!xdr_u_int32_t(xdr, &info->rdattr_error))
return FALSE; return FALSE;
} }
if (attrs->attrmask.arr[0] & FATTR4_WORD0_CANSETTIME) {
if (!xdr_bool(xdr, &info->cansettime))
return FALSE;
}
if (attrs->attrmask.arr[0] & FATTR4_WORD0_CASE_INSENSITIVE) { if (attrs->attrmask.arr[0] & FATTR4_WORD0_CASE_INSENSITIVE) {
if (!xdr_bool(xdr, &info->case_insensitive)) if (!xdr_bool(xdr, &info->case_insensitive))
return FALSE; return FALSE;
@ -1600,6 +1604,10 @@ static bool_t decode_file_attrs(
if (!xdr_nfstime4(xdr, &info->time_create)) if (!xdr_nfstime4(xdr, &info->time_create))
return FALSE; return FALSE;
} }
if (attrs->attrmask.arr[1] & FATTR4_WORD1_TIME_DELTA) {
if (!xdr_nfstime4(xdr, info->time_delta))
return FALSE;
}
if (attrs->attrmask.arr[1] & FATTR4_WORD1_TIME_MODIFY) { if (attrs->attrmask.arr[1] & FATTR4_WORD1_TIME_MODIFY) {
if (!xdr_nfstime4(xdr, &info->time_modify)) if (!xdr_nfstime4(xdr, &info->time_modify))
return FALSE; return FALSE;