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

simplifying argument management in io path

Browse source
This commit is contained in:
Olga Kornievskaia 2011-08-25 14:08:45 -04:00
parent 6c555e028b
commit e7c540464b
4 changed files with 52 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/pnfs.h
View file

@ -258,8 +258,6 @@ void pnfs_layout_list_free(
IN struct pnfs_layout_list *layouts); IN struct pnfs_layout_list *layouts);
enum pnfs_status pnfs_layout_state_open( enum pnfs_status pnfs_layout_state_open(
IN struct pnfs_layout_list *layouts,
IN struct __nfs41_session *session,
IN struct __nfs41_open_state *state, IN struct __nfs41_open_state *state,
IN enum pnfs_iomode iomode, IN enum pnfs_iomode iomode,
IN uint64_t offset, IN uint64_t offset,
@ -364,8 +362,7 @@ __inline uint32_t data_server_index(
/* pnfs_io.c */ /* pnfs_io.c */
enum pnfs_status pnfs_read( enum pnfs_status pnfs_read(
IN struct __nfs41_root *root, IN struct __nfs41_root *root,
IN struct __nfs41_session *session, IN struct __nfs41_open_state *state,
IN nfs41_path_fh *meta_file,
IN const struct __stateid_arg *stateid, IN const struct __stateid_arg *stateid,
IN pnfs_layout_state *layout, IN pnfs_layout_state *layout,
IN uint64_t offset, IN uint64_t offset,
@ -375,8 +372,7 @@ enum pnfs_status pnfs_read(
enum pnfs_status pnfs_write( enum pnfs_status pnfs_write(
IN struct __nfs41_root *root, IN struct __nfs41_root *root,
IN struct __nfs41_session *session, IN struct __nfs41_open_state *state,
IN nfs41_path_fh *meta_file,
IN const struct __stateid_arg *stateid, IN const struct __stateid_arg *stateid,
IN pnfs_layout_state *layout, IN pnfs_layout_state *layout,
IN uint64_t offset, IN uint64_t offset,

18
daemon/pnfs_io.c
View file

@ -462,8 +462,7 @@ out:
enum pnfs_status pnfs_read( enum pnfs_status pnfs_read(
IN nfs41_root *root, IN nfs41_root *root,
IN nfs41_session *session, IN struct __nfs41_open_state *state,
IN nfs41_path_fh *meta_file,
IN const stateid_arg *stateid, IN const stateid_arg *stateid,
IN pnfs_layout_state *layout, IN pnfs_layout_state *layout,
IN uint64_t offset, IN uint64_t offset,
@ -478,8 +477,8 @@ enum pnfs_status pnfs_read(
*len_out = 0; *len_out = 0;
status = pattern_init(&pattern, root, meta_file, stateid, layout, status = pattern_init(&pattern, root, &state->file, stateid, layout,
buffer_out, offset, length, session->lease_time); buffer_out, offset, length, state->session->lease_time);
if (status) { if (status) {
eprintf("pattern_init() failed with %s\n", eprintf("pattern_init() failed with %s\n",
pnfs_error_string(status)); pnfs_error_string(status));
@ -502,8 +501,7 @@ out:
enum pnfs_status pnfs_write( enum pnfs_status pnfs_write(
IN nfs41_root *root, IN nfs41_root *root,
IN nfs41_session *session, IN nfs41_open_state *state,
IN nfs41_path_fh *meta_file,
IN const stateid_arg *stateid, IN const stateid_arg *stateid,
IN pnfs_layout_state *layout, IN pnfs_layout_state *layout,
IN uint64_t offset, IN uint64_t offset,
@ -520,8 +518,8 @@ enum pnfs_status pnfs_write(
*len_out = 0; *len_out = 0;
status = pattern_init(&pattern, root, meta_file, stateid, layout, status = pattern_init(&pattern, root, &state->file, stateid, layout,
buffer, offset, length, session->lease_time); buffer, offset, length, state->session->lease_time);
if (status) { if (status) {
eprintf("pattern_init() failed with %s\n", eprintf("pattern_init() failed with %s\n",
pnfs_error_string(status)); pnfs_error_string(status));
@ -541,7 +539,7 @@ enum pnfs_status pnfs_write(
/* not all data was committed, so commit to metadata server */ /* not all data was committed, so commit to metadata server */
dprintf(1, "sending COMMIT to meta server for offset=%d and len=%d\n", dprintf(1, "sending COMMIT to meta server for offset=%d and len=%d\n",
offset, *len_out); offset, *len_out);
nfsstat = nfs41_commit(session, meta_file, offset, *len_out, 1); nfsstat = nfs41_commit(state->session, &state->file, offset, *len_out, 1);
if (nfsstat) { if (nfsstat) {
dprintf(IOLVL, "nfs41_commit() failed with %s\n", dprintf(IOLVL, "nfs41_commit() failed with %s\n",
nfs_error_string(nfsstat)); nfs_error_string(nfsstat));
@ -556,7 +554,7 @@ enum pnfs_status pnfs_write(
memcpy(&layout_stateid, &layout->stateid, sizeof(layout_stateid)); memcpy(&layout_stateid, &layout->stateid, sizeof(layout_stateid));
ReleaseSRWLockShared(&layout->lock); ReleaseSRWLockShared(&layout->lock);
nfsstat = pnfs_rpc_layoutcommit(session, meta_file, nfsstat = pnfs_rpc_layoutcommit(state->session, &state->file,
&layout_stateid, offset, *len_out, &new_last_offset, NULL); &layout_stateid, offset, *len_out, &new_last_offset, NULL);
if (nfsstat) { if (nfsstat) {
dprintf(IOLVL, "pnfs_rpc_layoutcommit() failed with %s\n", dprintf(IOLVL, "pnfs_rpc_layoutcommit() failed with %s\n",

4
daemon/pnfs_layout.c
View file

@ -680,14 +680,14 @@ static enum pnfs_status open_state_layout_cached(
} }
enum pnfs_status pnfs_layout_state_open( enum pnfs_status pnfs_layout_state_open(
IN struct pnfs_layout_list *layouts,
IN nfs41_session *session,
IN nfs41_open_state *state, IN nfs41_open_state *state,
IN enum pnfs_iomode iomode, IN enum pnfs_iomode iomode,
IN uint64_t offset, IN uint64_t offset,
IN uint64_t length, IN uint64_t length,
OUT pnfs_layout_state **layout_out) OUT pnfs_layout_state **layout_out)
{ {
struct pnfs_layout_list *layouts = state->session->client->layouts;
nfs41_session *session = state->session;
stateid_arg stateid; stateid_arg stateid;
pnfs_layout_state *layout; pnfs_layout_state *layout;
enum pnfs_status status; enum pnfs_status status;

101
daemon/readwrite.c
View file

@ -57,18 +57,16 @@ out:
/* NFS41_READ */ /* NFS41_READ */
static int read_from_mds( static int read_from_mds(
IN nfs41_session *session, IN nfs41_upcall *upcall,
IN nfs41_path_fh *file, IN stateid_arg *stateid)
IN stateid_arg *stateid,
IN uint64_t offset,
IN uint32_t length,
OUT unsigned char *buffer,
OUT ULONG *len_out)
{ {
nfs41_session *session = upcall->state_ref->session;
nfs41_path_fh *file = &upcall->state_ref->file;
readwrite_upcall_args *args = &upcall->args.rw;
int status = 0; int status = 0;
bool_t eof; bool_t eof;
unsigned char *p = buffer; unsigned char *p = args->buffer;
ULONG to_rcv = length, reloffset = 0, len = 0; ULONG to_rcv = args->len, reloffset = 0, len = 0;
const uint32_t maxreadsize = max_read_size(session, &file->fh); const uint32_t maxreadsize = max_read_size(session, &file->fh);
if (to_rcv > maxreadsize) if (to_rcv > maxreadsize)
@ -78,8 +76,8 @@ static int read_from_mds(
while(to_rcv > 0) { while(to_rcv > 0) {
uint32_t bytes_read = 0, chunk = min(to_rcv, maxreadsize); uint32_t bytes_read = 0, chunk = min(to_rcv, maxreadsize);
status = nfs41_read(session, file, stateid, offset + reloffset, chunk, status = nfs41_read(session, file, stateid, args->offset + reloffset, chunk,
p, &bytes_read, &eof); p, &bytes_read, &eof);
if (status == NFS4ERR_OPENMODE && !len) { if (status == NFS4ERR_OPENMODE && !len) {
stateid->type = STATEID_SPECIAL; stateid->type = STATEID_SPECIAL;
memcpy(&stateid->stateid, &special_read_stateid, sizeof(stateid4)); memcpy(&stateid->stateid, &special_read_stateid, sizeof(stateid4));
@ -92,7 +90,7 @@ static int read_from_mds(
p += bytes_read; p += bytes_read;
to_rcv -= bytes_read; to_rcv -= bytes_read;
len += bytes_read; len += bytes_read;
offset += bytes_read; args->offset += bytes_read;
if (status) { if (status) {
status = NO_ERROR; status = NO_ERROR;
break; break;
@ -104,32 +102,27 @@ static int read_from_mds(
} }
} }
out: out:
*len_out = len; args->out_len = len;
return status; return status;
} }
static int read_from_pnfs( static int read_from_pnfs(
IN nfs41_root *root, IN nfs41_upcall *upcall,
IN nfs41_open_state *state, IN stateid_arg *stateid)
IN const stateid_arg *stateid,
IN uint64_t offset,
IN uint32_t length,
OUT unsigned char *buffer,
OUT ULONG *len_out)
{ {
readwrite_upcall_args *args = &upcall->args.rw;
pnfs_layout_state *layout; pnfs_layout_state *layout;
enum pnfs_status pnfsstat; enum pnfs_status pnfsstat;
int status = NO_ERROR; int status = NO_ERROR;
pnfsstat = pnfs_layout_state_open(state->session->client->layouts, if (pnfs_layout_state_open(upcall->state_ref, PNFS_IOMODE_READ,
state->session, state, PNFS_IOMODE_READ, offset, length, &layout); args->offset, args->len, &layout)) {
if (pnfsstat) {
status = ERROR_NOT_SUPPORTED; status = ERROR_NOT_SUPPORTED;
goto out; goto out;
} }
pnfsstat = pnfs_read(root, state->session, &state->file, pnfsstat = pnfs_read(upcall->root_ref, upcall->state_ref, stateid, layout,
stateid, layout, offset, length, buffer, len_out); args->offset, args->len, args->buffer, &args->out_len);
switch (pnfsstat) { switch (pnfsstat) {
case PNFS_SUCCESS: case PNFS_SUCCESS:
break; break;
@ -154,8 +147,7 @@ static int handle_read(nfs41_upcall *upcall)
nfs41_open_stateid_arg(upcall->state_ref, &stateid); nfs41_open_stateid_arg(upcall->state_ref, &stateid);
#ifdef PNFS_ENABLE_READ #ifdef PNFS_ENABLE_READ
status = read_from_pnfs(upcall->root_ref, upcall->state_ref, &stateid, status = read_from_pnfs(upcall, &stateid);
args->offset, args->len, args->buffer, &args->out_len);
if (status == NO_ERROR || status == ERROR_HANDLE_EOF) if (status == NO_ERROR || status == ERROR_HANDLE_EOF)
goto out; goto out;
@ -170,8 +162,7 @@ static int handle_read(nfs41_upcall *upcall)
} }
#endif #endif
status = read_from_mds(upcall->state_ref->session, &upcall->state_ref->file, status = read_from_mds(upcall, &stateid);
&stateid, args->offset, args->len, args->buffer, &args->out_len);
args->out_len += pnfs_bytes_read; args->out_len += pnfs_bytes_read;
out: out:
@ -181,14 +172,12 @@ out:
/* NFS41_WRITE */ /* NFS41_WRITE */
static int write_to_mds( static int write_to_mds(
IN nfs41_session *session, IN nfs41_upcall *upcall,
IN nfs41_path_fh *file, IN stateid_arg *stateid)
IN stateid_arg *stateid,
IN uint64_t offset,
IN uint32_t length,
IN unsigned char *buffer,
OUT ULONG *len_out)
{ {
nfs41_session *session = upcall->state_ref->session;
nfs41_path_fh *file = &upcall->state_ref->file;
readwrite_upcall_args *args = &upcall->args.rw;
nfs41_write_verf verf; nfs41_write_verf verf;
enum stable_how4 stable, committed; enum stable_how4 stable, committed;
unsigned char *p; unsigned char *p;
@ -197,8 +186,8 @@ static int write_to_mds(
int status = 0; int status = 0;
retry_write: retry_write:
p = buffer; p = args->buffer;
to_send = length; to_send = args->len;
reloffset = 0; reloffset = 0;
len = 0; len = 0;
stable = to_send <= maxwritesize ? DATA_SYNC4 : UNSTABLE4; stable = to_send <= maxwritesize ? DATA_SYNC4 : UNSTABLE4;
@ -212,7 +201,7 @@ retry_write:
uint32_t bytes_written = 0, chunk = min(to_send, maxwritesize); uint32_t bytes_written = 0, chunk = min(to_send, maxwritesize);
status = nfs41_write(session, file, stateid, p, chunk, status = nfs41_write(session, file, stateid, p, chunk,
offset + reloffset, stable, &bytes_written, &verf); args->offset + reloffset, stable, &bytes_written, &verf);
if (status && !len) if (status && !len)
goto out; goto out;
p += bytes_written; p += bytes_written;
@ -227,37 +216,30 @@ retry_write:
goto retry_write; goto retry_write;
} }
if (committed == UNSTABLE4) { if (committed == UNSTABLE4) {
dprintf(1, "sending COMMIT for offset=%d and len=%d\n", offset, len); dprintf(1, "sending COMMIT for offset=%d and len=%d\n", args->offset, len);
status = nfs41_commit(session, file, offset, len, 1); status = nfs41_commit(session, file, args->offset, len, 1);
} }
out: out:
*len_out = len; args->out_len = len;
return nfs_to_windows_error(status, ERROR_NET_WRITE_FAULT); return nfs_to_windows_error(status, ERROR_NET_WRITE_FAULT);
} }
static int write_to_pnfs( static int write_to_pnfs(
IN nfs41_root *root, IN nfs41_upcall *upcall,
IN nfs41_open_state *state, IN const stateid_arg *stateid)
IN const stateid_arg *stateid,
IN uint64_t offset,
IN uint32_t length,
IN unsigned char *buffer,
OUT ULONG *len_out)
{ {
readwrite_upcall_args *args = &upcall->args.rw;
pnfs_layout_state *layout; pnfs_layout_state *layout;
enum pnfs_status pnfsstat;
int status = NO_ERROR; int status = NO_ERROR;
pnfsstat = pnfs_layout_state_open(state->session->client->layouts, if (pnfs_layout_state_open(upcall->state_ref, PNFS_IOMODE_RW, args->offset,
state->session, state, PNFS_IOMODE_RW, offset, length, &layout); args->len, &layout)) {
if (pnfsstat) {
status = ERROR_NOT_SUPPORTED; status = ERROR_NOT_SUPPORTED;
goto out; goto out;
} }
pnfsstat = pnfs_write(root, state->session, &state->file, stateid, layout, if (pnfs_write(upcall->root_ref, upcall->state_ref, stateid, layout,
offset, length, buffer, len_out); args->offset, args->len, args->buffer, &args->out_len)) {
if (pnfsstat) {
status = ERROR_WRITE_FAULT; status = ERROR_WRITE_FAULT;
goto out; goto out;
} }
@ -275,9 +257,7 @@ static int handle_write(nfs41_upcall *upcall)
nfs41_open_stateid_arg(upcall->state_ref, &stateid); nfs41_open_stateid_arg(upcall->state_ref, &stateid);
#ifdef PNFS_ENABLE_WRITE #ifdef PNFS_ENABLE_WRITE
status = write_to_pnfs(upcall->root_ref, upcall->state_ref, &stateid, status = write_to_pnfs(upcall, &stateid);
args->offset, args->len, args->buffer, &args->out_len);
if (status == NO_ERROR) if (status == NO_ERROR)
goto out; goto out;
@ -291,8 +271,7 @@ static int handle_write(nfs41_upcall *upcall)
} }
#endif #endif
status = write_to_mds(upcall->state_ref->session, &upcall->state_ref->file, status = write_to_mds(upcall, &stateid);
&stateid, args->offset, args->len, args->buffer, &args->out_len);
args->out_len += pnfs_bytes_written; args->out_len += pnfs_bytes_written;
out: out: