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

pnfs: remove code for unused PNFS_THREAD_BY_SERVER

Browse source 
Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2011-12-21 15:11:01 -05:00 • committed by unknown
parent c61849fd14
commit ab8a958e35
1 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
daemon/pnfs_io.c
View file

@ -55,11 +55,7 @@ static enum pnfs_status pattern_init(
if (status) if (status)
goto out; goto out;
#ifdef PNFS_THREAD_BY_SERVER
pattern->count = state->layout->device->servers.count;
#else
pattern->count = state->layout->device->stripes.count; pattern->count = state->layout->device->stripes.count;
#endif
pattern->threads = calloc(pattern->count, sizeof(pnfs_io_thread)); pattern->threads = calloc(pattern->count, sizeof(pnfs_io_thread));
if (pattern->threads == NULL) { if (pattern->threads == NULL) {
status = PNFSERR_RESOURCES; status = PNFSERR_RESOURCES;
@ -122,11 +118,7 @@ static enum pnfs_status thread_next_unit(
if (status) if (status)
break; break;
#ifdef PNFS_THREAD_BY_SERVER
if (io->serverid == thread->id) {
#else
if (io->stripeid == thread->id) { if (io->stripeid == thread->id) {
#endif
status = PNFS_PENDING; status = PNFS_PENDING;
break; break;
} }
@ -143,11 +135,7 @@ static enum pnfs_status thread_data_server(
OUT pnfs_data_server **server_out) OUT pnfs_data_server **server_out)
{ {
pnfs_file_device *device = thread->pattern->layout->device; pnfs_file_device *device = thread->pattern->layout->device;
#ifdef PNFS_THREAD_BY_SERVER
const uint32_t serverid = thread->id;
#else
const uint32_t serverid = data_server_index(device, thread->id); const uint32_t serverid = data_server_index(device, thread->id);
#endif
if (serverid >= device->servers.count) if (serverid >= device->servers.count)
return PNFSERR_INVALID_DS_INDEX; return PNFSERR_INVALID_DS_INDEX;