From 58ce5f46af7e08db3d786c597ec5144294fbd099 Mon Sep 17 00:00:00 2001 From: Shehjar Tikoo Date: Thu, 7 Oct 2010 05:23:59 +0000 Subject: nfs: Revert downed-subvolume changes For the record these are the patches committed as: 1. "nfs, nfs3: Base volume access on CHILD-UP-DOWN event" http://git.gluster.com/?p=glusterfs.git;a=commit;h=f47b0c55de9941823fbefe4b3a7e37179d6d4329 2. "nfs: Fix multiple subvolume CHILD-UP support" http://git.gluster.com/?p=glusterfs.git;a=commit;h=336e2df7b74be7ad4c9ed403ca10b9f7f7ef9a58 3. "nfs,nfs3: Disable subvolume on ENOTCONN" http://git.gluster.com/?p=glusterfs.git;a=commit;h=8c6e27cdaf895e3031c3256efb9472a6c0bf61f3 Signed-off-by: Shehjar Tikoo Signed-off-by: Vijay Bellur BUG: 1724 (kernel untar fails during add-brick) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1724 --- xlators/nfs/server/src/mount3.c | 8 - xlators/nfs/server/src/nfs-common.c | 42 ---- xlators/nfs/server/src/nfs-common.h | 7 - xlators/nfs/server/src/nfs-mem-types.h | 1 - xlators/nfs/server/src/nfs.c | 380 +++++++-------------------------- xlators/nfs/server/src/nfs.h | 21 +- xlators/nfs/server/src/nfs3.c | 242 +++++---------------- 7 files changed, 136 insertions(+), 565 deletions(-) (limited to 'xlators') diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index df75b02a9..fdd05a269 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -766,14 +766,6 @@ mnt3svc_mnt (rpcsvc_request_t *req) goto mnterr; } - if ((is_nfs_subvolume_disabled (nfs_state (ms->nfsx), exp->vol))) { - gf_log (GF_MNT, GF_LOG_ERROR, "Volume is disabled: %s", - exp->vol->name); - ret = RPCSVC_ACTOR_ERROR; - mntstat = MNT3ERR_INVAL; - goto mnterr; - } - ret = mnt3_check_client_net (ms, req, exp->vol); if (ret == -1) { mntstat = MNT3ERR_ACCES; diff --git a/xlators/nfs/server/src/nfs-common.c b/xlators/nfs/server/src/nfs-common.c index c5044313e..6628c297f 100644 --- a/xlators/nfs/server/src/nfs-common.c +++ b/xlators/nfs/server/src/nfs-common.c @@ -33,7 +33,6 @@ #include "nfs-mem-types.h" #include "rpcsvc.h" #include "iatt.h" -#include "nfs.h" #include @@ -394,44 +393,3 @@ err: return ret; } - - -int -__is_nfs_subvolume_disabled (struct nfs_state *nfs, xlator_t *xl) -{ - int x = 0; - int notstarted = 0; - - if ((!nfs) || (!xl)) - return 1; - - for (;x < nfs->allsubvols; ++x) { - if (!((&nfs->subvols[x])->subvol == xl)) - continue; - - if (gf_nfs_subvolume_notstarted (&nfs->subvols[x])) { - notstarted = 1; - goto out; - } - } -out: - return notstarted; -} - - -int -is_nfs_subvolume_disabled (struct nfs_state *nfs, xlator_t *xl) -{ - int notstarted = 0; - - if ((!nfs) || (!xl)) - return 1; - - LOCK (&nfs->svinitlock); - { - notstarted = __is_nfs_subvolume_disabled (nfs, xl); - } - UNLOCK (&nfs->svinitlock); - - return notstarted; -} diff --git a/xlators/nfs/server/src/nfs-common.h b/xlators/nfs/server/src/nfs-common.h index b506e88b5..2c851b2d2 100644 --- a/xlators/nfs/server/src/nfs-common.h +++ b/xlators/nfs/server/src/nfs-common.h @@ -31,7 +31,6 @@ #include "rpcsvc.h" #include "iatt.h" #include "uuid.h" -#include "nfs.h" #define NFS_PATH_MAX PATH_MAX #define NFS_NAME_MAX NAME_MAX @@ -77,10 +76,4 @@ nfs_entry_loc_fill (inode_table_t *itable, uuid_t pargfid, char *entry, extern int nfs_root_loc_fill (inode_table_t *itable, loc_t *loc); - -extern int -is_nfs_subvolume_disabled (struct nfs_state *nfs, xlator_t *xl); - -extern int -nfs_subvolume_lookup_again_later (struct nfs_state *nfs, xlator_t *xl); #endif diff --git a/xlators/nfs/server/src/nfs-mem-types.h b/xlators/nfs/server/src/nfs-mem-types.h index 4d7b10650..a6f91ccc3 100644 --- a/xlators/nfs/server/src/nfs-mem-types.h +++ b/xlators/nfs/server/src/nfs-mem-types.h @@ -43,7 +43,6 @@ enum gf_nfs_mem_types_ { gf_nfs_mt_mnt3_resolve, gf_nfs_mt_mnt3_export, gf_nfs_mt_inode_q, - gf_nfs_mt_subvolumes, gf_nfs_mt_end }; #endif diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c index c31ef0819..26256131f 100644 --- a/xlators/nfs/server/src/nfs.c +++ b/xlators/nfs/server/src/nfs.c @@ -169,40 +169,24 @@ ret: int -__is_nfs_subvolume_lookup_sent (struct nfs_state *nfs, xlator_t *xl) +nfs_subvolume_started (struct nfs_state *nfs, xlator_t *xl) { int x = 0; int started = 0; - if ((!nfs) || (!xl)) - return 1; - - for (;x < nfs->allsubvols; ++x) { - if (!((&nfs->subvols[x])->subvol == xl)) - continue; - - if (gf_nfs_subvolume_lookupsent (&nfs->subvols[x])) { - started = 1; - goto out; - } - } -out: - return started; -} - - -int -is_nfs_subvolume_lookup_sent (struct nfs_state *nfs, xlator_t *xl) -{ - int started = 0; - if ((!nfs) || (!xl)) return 1; LOCK (&nfs->svinitlock); { - started = __is_nfs_subvolume_lookup_sent (nfs, xl); + for (;x < nfs->allsubvols; ++x) { + if (nfs->initedxl[x] == xl) { + started = 1; + goto unlock; + } + } } +unlock: UNLOCK (&nfs->svinitlock); return started; @@ -210,187 +194,27 @@ is_nfs_subvolume_lookup_sent (struct nfs_state *nfs, xlator_t *xl) int -__is_nfs_subvolume_started (struct nfs_state *nfs, xlator_t *xl) +nfs_subvolume_set_started (struct nfs_state *nfs, xlator_t *xl) { int x = 0; - int started = 0; - - if ((!nfs) || (!xl)) - return 1; - - for (;x < nfs->allsubvols; ++x) { - if (!((&nfs->subvols[x])->subvol == xl)) - continue; - - if (gf_nfs_subvolume_started (&nfs->subvols[x])) { - started = 1; - goto out; - } - } -out: - return started; -} - - -int -is_nfs_subvolume_started (struct nfs_state *nfs, xlator_t *xl) -{ - int started = 0; - - if ((!nfs) || (!xl)) - return 1; - - LOCK (&nfs->svinitlock); - { - started = __is_nfs_subvolume_started (nfs, xl); - } - UNLOCK (&nfs->svinitlock); - - return started; -} - - -int -__nfs_subvolume_lookup_again_later (struct nfs_state *nfs, xlator_t *xl) -{ - int x = 0; - struct nfs_subvolume *sv = NULL; - - if ((!nfs) || (!xl)) - return -1; - - for (;x < nfs->allsubvols; ++x) { - if (((&nfs->subvols[x])->subvol == xl)) { - sv = &nfs->subvols[x]; - break; - } - } - - if (!sv) - goto err; - gf_log (GF_NFS, GF_LOG_TRACE, "Will lookup subvol later: %s", - xl->name); - sv->status = GF_NFS_SUBVOLUME_NOTSTARTED; -err: - return 0; -} - - -int -__nfs_subvolume_start (struct nfs_state *nfs, xlator_t *xl) -{ - int x = 0; - int ret = 0; - struct nfs_subvolume *sv = NULL; - - if ((!nfs) || (!xl)) - return -1; - - for (;x < nfs->allsubvols; ++x) { - if (((&nfs->subvols[x])->subvol == xl)) { - sv = &nfs->subvols[x]; - break; - } - } - - if (!sv) { - gf_log (GF_NFS, GF_LOG_ERROR, "Could not find subvol slot"); - goto err; - } - - /* If the subvolume got disconnected or sent a CHILD-DOWN between the - * lookup fop and the lookup callback. - */ - if (gf_nfs_subvolume_notstarted (sv)) { - goto err; - } - - sv->status = GF_NFS_SUBVOLUME_STARTED; - ++nfs->upsubvols; - gf_log (GF_NFS, GF_LOG_DEBUG, "Starting up: %s, vols started till now: " - "%d", xl->name, nfs->upsubvols); - - if (gf_nfs_all_subvolumes_started (nfs)) { - nfs->subvols_started = 1; - gf_log (GF_NFS, GF_LOG_INFO, "All exports up"); - ret = nfs_init_versions (nfs, nfs->nfsx); - if (ret == -1) - gf_log (GF_NFS, GF_LOG_CRITICAL, "Failed to initialize " - "protocols"); - } -err: - return 0; -} - - -int -nfs_subvolume_start (struct nfs_state *nfs, xlator_t *xl) -{ - if ((!nfs) || (!xl)) - return 1; - - LOCK (&nfs->svinitlock); - { - __nfs_subvolume_start (nfs, xl); - } - UNLOCK (&nfs->svinitlock); - - return 0; -} - - -int -__nfs_subvolume_lookup_sent (struct nfs_state *nfs, xlator_t *xl) -{ - struct nfs_subvolume *sv = NULL; - int x = 0; - - if ((!nfs) || (!xl)) - return -1; - - for (;x < nfs->allsubvols; ++x) { - if (((&nfs->subvols[x])->subvol == xl)) { - sv = &nfs->subvols[x]; - break; - } - } - if (sv) { - sv->status = GF_NFS_SUBVOLUME_LOOKUPSENT; - } else - gf_log (GF_NFS, GF_LOG_ERROR, "Could not find subvol slot: %s", - xl->name); - - return 0; -} - - -int -nfs_subvolume_lookup_sent (struct nfs_state *nfs, xlator_t *xl) -{ if ((!nfs) || (!xl)) return 1; LOCK (&nfs->svinitlock); { - __nfs_subvolume_lookup_sent (nfs, xl); - } - UNLOCK (&nfs->svinitlock); - - return 0; -} - - -int -nfs_subvolume_lookup_again_later (struct nfs_state *nfs, xlator_t *xl) -{ - if ((!nfs) || (!xl)) - return 1; - - LOCK (&nfs->svinitlock); - { - __nfs_subvolume_lookup_again_later (nfs, xl); + for (;x < nfs->allsubvols; ++x) { + if (nfs->initedxl[x] == NULL) { + nfs->initedxl[x] = xl; + ++nfs->upsubvols; + gf_log (GF_NFS, GF_LOG_DEBUG, "Starting up: %s " + ", vols started till now: %d", xl->name, + nfs->upsubvols); + goto unlock; + } + } } +unlock: UNLOCK (&nfs->svinitlock); return 0; @@ -403,71 +227,36 @@ nfs_start_subvol_lookup_cbk (call_frame_t *frame, void *cookie, inode_t *inode, struct iatt *buf, dict_t *xattr, struct iatt *postparent) { - struct nfs_state *nfs = frame->local; - if (op_ret == -1) { gf_log (GF_NFS, GF_LOG_CRITICAL, "Failed to lookup root: %s", strerror (op_errno)); - nfs_subvolume_lookup_again_later (nfs, (xlator_t *)cookie); goto err; } - nfs_subvolume_start (nfs, (xlator_t *)cookie); + gf_log (GF_NFS, GF_LOG_TRACE, "Started %s", ((xlator_t *)cookie)->name); err: return 0; } -int -__nfs_startup_subvolume_check (struct nfs_state *nfs, xlator_t *xl) -{ - int ret = 0; - - if (__is_nfs_subvolume_started (nfs, xl)) { - gf_log (GF_NFS,GF_LOG_TRACE, "Subvolume already started: %s", - xl->name); - ret = 1; - goto out; - } - - if (__is_nfs_subvolume_lookup_sent (nfs, xl)) { - gf_log (GF_NFS,GF_LOG_TRACE,"Subvolume lookup already sent: %s", - xl->name); - ret = 1; - goto out; - } - -out: - return ret; -} - - int nfs_startup_subvolume (xlator_t *nfsx, xlator_t *xl) { - int ret = -1; - loc_t rootloc = {0, }; - nfs_user_t nfu = {0, }; - struct nfs_state *nfs = NULL; + int ret = -1; + loc_t rootloc = {0, }; + nfs_user_t nfu = {0, }; if ((!nfsx) || (!xl)) return -1; - nfs = nfsx->private; - LOCK (&nfs->svinitlock); - { - ret = __nfs_startup_subvolume_check (nfsx->private, xl); - if (ret) - goto unlock; - - __nfs_subvolume_lookup_sent (nfs, xl); - } -unlock: - UNLOCK (&nfs->svinitlock); - - if (ret) + if (nfs_subvolume_started (nfsx->private, xl)) { + gf_log (GF_NFS,GF_LOG_TRACE, "Subvolume already started: %s", + xl->name); + ret = 0; goto err; + } + nfs_subvolume_set_started (nfsx->private, xl); ret = nfs_inode_loc_fill (xl->itable->root, &rootloc); if (ret == -1) { gf_log (GF_NFS, GF_LOG_CRITICAL, "Failed to init root loc"); @@ -490,6 +279,35 @@ err: return ret; } +int +nfs_startup_subvolumes (xlator_t *nfsx) +{ + int ret = -1; + xlator_list_t *cl = NULL; + struct nfs_state *nfs = NULL; + + if (!nfsx) + return -1; + + nfs = nfsx->private; + cl = nfs->subvols; + while (cl) { + gf_log (GF_NFS, GF_LOG_DEBUG, "Starting subvolume: %s", + cl->xlator->name); + ret = nfs_startup_subvolume (nfsx, cl->xlator); + if (ret == -1) { + gf_log (GF_NFS, GF_LOG_CRITICAL, "Failed to start-up " + "xlator: %s", cl->xlator->name); + goto err; + } + cl = cl->next; + } + + ret = 0; +err: + return ret; +} + int nfs_init_subvolume (struct nfs_state *nfs, xlator_t *xl) @@ -515,19 +333,17 @@ err: int nfs_init_subvolumes (struct nfs_state *nfs, xlator_list_t *cl) { - int ret = -1; - unsigned int lrusize = 0; - int svcount = 0; - int x = 0; - xlator_list_t *tmpcl = NULL; - struct nfs_subvolume *sv = NULL; + int ret = -1; + unsigned int lrusize = 0; + int svcount = 0; if ((!nfs) || (!cl)) return -1; lrusize = nfs->memfactor * GF_NFS_INODE_LRU_MULT; + nfs->subvols = cl; gf_log (GF_NFS, GF_LOG_TRACE, "inode table lru: %d", lrusize); - tmpcl = cl; + while (cl) { gf_log (GF_NFS, GF_LOG_DEBUG, "Initing subvolume: %s", cl->xlator->name); @@ -542,24 +358,16 @@ nfs_init_subvolumes (struct nfs_state *nfs, xlator_list_t *cl) } LOCK_INIT (&nfs->svinitlock); - nfs->subvols = GF_CALLOC (svcount, sizeof (struct nfs_subvolume), - gf_nfs_mt_subvolumes); - if (!nfs->subvols) { - gf_log (GF_NFS, GF_LOG_ERROR, "Failed to allocate subvol list"); + nfs->initedxl = GF_CALLOC (svcount, sizeof (xlator_t *), + gf_nfs_mt_xlator_t ); + if (!nfs->initedxl) { + gf_log (GF_NFS, GF_LOG_ERROR, "Failed to allocated inited xls"); ret = -1; goto err; } - cl = tmpcl; + gf_log (GF_NFS, GF_LOG_TRACE, "Inited volumes: %d", svcount); nfs->allsubvols = svcount; - for (;x < nfs->allsubvols; x++) { - sv = &nfs->subvols[x]; - sv->subvol = cl->xlator; - sv->status = GF_NFS_SUBVOLUME_NOTSTARTED; - cl = cl->next; - } - - gf_log (GF_NFS, GF_LOG_TRACE, "inited volumes: %d", svcount); ret = 0; err: return ret; @@ -674,7 +482,6 @@ nfs_init_state (xlator_t *this) return NULL; } - nfs->nfsx = this; /* RPC service needs to be started before NFS versions can be * inited. */ nfs->rpcsvc = nfs_rpcsvc_init (this->ctx, this->options); @@ -772,49 +579,34 @@ err: } -int -nfs_disable_subvolume (xlator_t *nfsx, xlator_t *xl) -{ - struct nfs_state *nfs = NULL; - - if ((!nfsx) || (!xl)) - return -1; - - nfs = nfsx->private; - gf_log (GF_NFS, GF_LOG_TRACE, "Disabling subvolume: %s", xl->name); - LOCK (&nfs->svinitlock); - { - if (!__is_nfs_subvolume_started (nfsx->private, xl)) { - gf_log (GF_NFS,GF_LOG_TRACE, "Subvolume not started, " - "no point disabling: %s", xl->name); - goto unlock; - } - --nfs->upsubvols; - __nfs_subvolume_lookup_again_later (nfs, xl); - } -unlock: - UNLOCK (&nfs->svinitlock); - - return 0; -} - - int notify (xlator_t *this, int32_t event, void *data, ...) { struct nfs_state *nfs = NULL; xlator_t *subvol = NULL; + int ret = -1; nfs = (struct nfs_state *)this->private; subvol = (xlator_t *)data; - gf_log (GF_NFS, GF_LOG_TRACE, "Notification received: %s", - glusterfs_strevent (event)); + gf_log (GF_NFS, GF_LOG_TRACE, "Notification received: %d", + event); switch (event) { case GF_EVENT_CHILD_UP: { nfs_startup_subvolume (this, subvol); + if ((nfs->upsubvols == nfs->allsubvols) && + (!nfs->subvols_started)) { + nfs->subvols_started = 1; + gf_log (GF_NFS, GF_LOG_TRACE, "All children up," + " starting RPC"); + ret = nfs_init_versions (nfs, this); + if (ret == -1) + gf_log (GF_NFS, GF_LOG_CRITICAL, + "Failed to initialize " + "protocols"); + } break; } @@ -823,12 +615,6 @@ notify (xlator_t *this, int32_t event, void *data, ...) default_notify (this, GF_EVENT_PARENT_UP, data); break; } - - case GF_EVENT_CHILD_DOWN: - { - nfs_disable_subvolume (this, subvol); - break; - } } return 0; diff --git a/xlators/nfs/server/src/nfs.h b/xlators/nfs/server/src/nfs.h index c817b5f9e..2464eb2b2 100644 --- a/xlators/nfs/server/src/nfs.h +++ b/xlators/nfs/server/src/nfs.h @@ -58,37 +58,20 @@ struct nfs_initer_list { rpcsvc_program_t *program; }; -typedef enum { - GF_NFS_SUBVOLUME_NOTSTARTED = 1, - GF_NFS_SUBVOLUME_LOOKUPSENT, - GF_NFS_SUBVOLUME_STARTED, -} nfs_subvolume_status_t; - -struct nfs_subvolume { - xlator_t *subvol; - nfs_subvolume_status_t status; -}; - -#define gf_nfs_subvolume_started(svl) ((svl)->status == GF_NFS_SUBVOLUME_STARTED) -#define gf_nfs_subvolume_lookupsent(svl) ((svl)->status == GF_NFS_SUBVOLUME_LOOKUPSENT) -#define gf_nfs_subvolume_notstarted(svl) ((svl)->status == GF_NFS_SUBVOLUME_NOTSTARTED) - -#define gf_nfs_subvolume_unused_slot(svl) ((svl)->subvol == NULL) -#define gf_nfs_all_subvolumes_started(nf) ((nf->upsubvols == nf->allsubvols) && (!nf->subvols_started)) struct nfs_state { rpcsvc_t *rpcsvc; struct list_head versions; struct mem_pool *foppool; unsigned int memfactor; + xlator_list_t *subvols; gf_lock_t svinitlock; int allsubvols; int upsubvols; - struct nfs_subvolume *subvols; + xlator_t **initedxl; int subvols_started; int dynamicvolumes; - xlator_t *nfsx; }; #define gf_nfs_dvm_on(nfsstt) (((struct nfs_state *)nfsstt)->dynamicvolumes == GF_NFS_DVM_ON) diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c index 36dadfe5a..1891500c5 100644 --- a/xlators/nfs/server/src/nfs3.c +++ b/xlators/nfs/server/src/nfs3.c @@ -37,7 +37,6 @@ #include "nfs-generics.h" #include "nfs3-helpers.h" #include "nfs-mem-types.h" -#include "nfs-common.h" #include @@ -68,27 +67,6 @@ } \ } while (0); \ -#define nfs3_volume_disabled_check(nf3stt, vlm, rtval, erlbl) \ - do { \ - if ((is_nfs_subvolume_disabled (nfs_state (nf3stt->nfsx), vlm))){\ - gf_log (GF_NFS3, GF_LOG_ERROR, "Volume is disabled: %s",\ - vlm->name); \ - rtval = RPCSVC_ACTOR_SUCCESS; \ - goto erlbl; \ - } \ - } while (0) \ - - -#define nfs3_disable_subvolume_on_disconnect(ts, sv, rval, errlbl) \ - do { \ - if (rval == ENOTCONN) { \ - gf_log (GF_NFS3, GF_LOG_ERROR, "Connection to" \ - " subvol was lost: %s", \ - ((xlator_t *)sv)->name); \ - nfs_subvolume_lookup_again_later (ts->private, sv);\ - goto errlbl; \ - } \ - } while (0) \ struct nfs3_export * __nfs3_get_export_by_index (struct nfs3_state *nfs3, uuid_t exportid) @@ -596,18 +574,15 @@ nfs3svc_getattr_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; - if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); + if (op_ret == -1) status = nfs3_errno_to_nfsstat3 (op_errno); - } nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "GETATTR", status, op_errno); nfs3_getattr_reply (cs->req, status, buf); -out: nfs3_call_state_wipe (cs); + return 0; } @@ -621,18 +596,15 @@ nfs3svc_getattr_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; - if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); + if (op_ret == -1) status = nfs3_errno_to_nfsstat3 (op_errno); - } nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "GETATTR", status, op_errno); nfs3_getattr_reply (cs->req, status, buf); -out: nfs3_call_state_wipe (cs); + return 0; } @@ -699,7 +671,6 @@ nfs3_getattr (rpcsvc_request_t *req, struct nfs3_fh *fh) nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_handle_call_state_init (nfs3, cstate, req, vol, stat, nfs3err); ret = nfs3_fh_resolve_and_resume (cstate, fh, NULL,nfs3_getattr_resume); @@ -714,7 +685,7 @@ nfs3err: ret = 0; nfs3_call_state_wipe (cstate); } -out: + return ret; } @@ -774,8 +745,6 @@ nfs3svc_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -794,8 +763,8 @@ nfs3err: nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "SETATTR", stat, op_errno); nfs3_setattr_reply (cs->req, stat, prestat, postbuf); -out: nfs3_call_state_wipe (cs); + return 0; } @@ -813,8 +782,6 @@ nfs3svc_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -853,10 +820,8 @@ nfs3err: nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "SETATTR", stat, op_errno); nfs3_setattr_reply (cs->req, stat, prebuf, postop); - } -out: - if (ret < 0) nfs3_call_state_wipe (cs); + } return 0; } @@ -875,8 +840,6 @@ nfs3svc_setattr_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -900,10 +863,8 @@ nfs3err: nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "SETATTR", stat, op_errno); nfs3_setattr_reply (cs->req, stat, NULL, NULL); - } -out: - if (ret < 0) nfs3_call_state_wipe (cs); + } return 0; } @@ -966,7 +927,6 @@ nfs3_setattr (rpcsvc_request_t *req, struct nfs3_fh *fh, sattr3 *sattr, nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, fh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); @@ -1002,7 +962,7 @@ nfs3err: */ ret = 0; } -out: + return ret; } @@ -1098,8 +1058,6 @@ nfs3svc_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - wipeout); status = nfs3_errno_to_nfsstat3 (op_errno); goto xmit_res; } @@ -1117,7 +1075,6 @@ xmit_res: nfs3_log_newfh_res (nfs_rpcsvc_request_xid (cs->req), "LOOKUP", status, op_errno, &newfh); nfs3_lookup_reply (cs->req, status, &newfh, buf, postparent); -wipeout: nfs3_call_state_wipe (cs); out: return 0; @@ -1138,8 +1095,6 @@ nfs3svc_lookup_parentdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); status = nfs3_errno_to_nfsstat3 (op_errno); goto xmit_res; } @@ -1166,7 +1121,6 @@ xmit_res: nfs3_log_newfh_res (nfs_rpcsvc_request_xid (cs->req), "LOOKUP", status, op_errno, &newfh); nfs3_lookup_reply (cs->req, status, &newfh, buf, postparent); -out: nfs3_call_state_wipe (cs); return 0; @@ -1297,7 +1251,6 @@ nfs3_lookup (rpcsvc_request_t *req, struct nfs3_fh *fh, int fhlen, char *name) nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_strlen_or_goto (name, NFS_NAME_MAX, nfs3err, stat, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); cs->revalidate = GF_NFS3_NONREVALIDATE; @@ -1323,7 +1276,7 @@ nfs3err: */ ret = 0; } -out: + return ret; } @@ -1384,16 +1337,12 @@ nfs3svc_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; - if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); + if (op_ret == -1) status = nfs3_errno_to_nfsstat3 (op_errno); - } nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "ACCESS", status, op_errno); nfs3_access_reply (cs->req, status, buf, cs->accessbits); -out: nfs3_call_state_wipe (cs); return 0; @@ -1448,7 +1397,6 @@ nfs3_access (rpcsvc_request_t *req, struct nfs3_fh *fh, uint32_t accbits) nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); cs->accessbits = accbits; @@ -1464,7 +1412,7 @@ nfs3err: nfs3_call_state_wipe (cs); ret = 0; } -out: + return ret; } @@ -1524,8 +1472,6 @@ nfs3svc_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -1536,7 +1482,6 @@ nfs3err: nfs3_log_readlink_res (nfs_rpcsvc_request_xid (cs->req), stat, op_errno, (char *)path); nfs3_readlink_reply (cs->req, stat, (char *)path, buf); -out: nfs3_call_state_wipe (cs); return 0; @@ -1592,7 +1537,6 @@ nfs3_readlink (rpcsvc_request_t *req, struct nfs3_fh *fh) nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); ret = nfs3_fh_resolve_and_resume (cs, fh, NULL, nfs3_readlink_resume); @@ -1610,7 +1554,7 @@ nfs3err: */ ret = 0; } -out: + return ret; } @@ -1688,8 +1632,6 @@ nfs3svc_read_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto err; } else @@ -1703,7 +1645,6 @@ err: op_ret, is_eof, vector, count); nfs3_read_reply (cs->req, stat, op_ret, vector, count, iobref, stbuf, is_eof); -out: nfs3_call_state_wipe (cs); return 0; @@ -1787,7 +1728,6 @@ nfs3_read (rpcsvc_request_t *req, struct nfs3_fh *fh, offset3 offset, nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); cs->datacount = count; @@ -1804,7 +1744,7 @@ nfs3err: nfs3_call_state_wipe (cs); ret = 0; } -out: + return ret; } @@ -1867,18 +1807,15 @@ nfs3svc_write_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; nfs3 = nfs_rpcsvc_request_program_private (cs->req); - if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); + if (op_ret == -1) stat = nfs3_errno_to_nfsstat3 (op_errno); - } else + else stat = NFS3_OK; nfs3_log_write_res (nfs_rpcsvc_request_xid (cs->req), stat, op_errno, cs->maxcount, cs->writetype, nfs3->serverstart); nfs3_write_reply (cs->req, stat, cs->maxcount, cs->writetype, nfs3->serverstart, &cs->stbuf, postbuf); -out: nfs3_call_state_wipe (cs); return 0; } @@ -1967,8 +1904,6 @@ nfs3svc_write_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; nfs3 = nfs_rpcsvc_request_program_private (cs->req); if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto err; } @@ -2003,10 +1938,8 @@ err: nfs3_write_reply (cs->req, stat, cs->maxcount, cs->writetype, nfs3->serverstart, prebuf, postbuf); - } -out: - if (ret < 0) nfs3_call_state_wipe (cs); + } return 0; } @@ -2118,7 +2051,6 @@ nfs3_write (rpcsvc_request_t *req, struct nfs3_fh *fh, offset3 offset, nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, fh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); cs->datacount = count; @@ -2140,7 +2072,7 @@ nfs3err: nfs3_call_state_wipe (cs); ret = 0; } -out: + return ret; } @@ -2292,8 +2224,6 @@ nfs3svc_create_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -2304,7 +2234,6 @@ nfs3err: op_errno, &cs->fh); nfs3_create_reply (cs->req, stat, &cs->fh, postop, &cs->preparent, &cs->postparent); -out: nfs3_call_state_wipe (cs); return 0; @@ -2324,8 +2253,6 @@ nfs3svc_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -2353,10 +2280,8 @@ nfs3err: stat, op_errno, &cs->fh); nfs3_create_reply (cs->req, stat, &cs->fh, buf, preparent, postparent); - } -out: - if (ret < 0) nfs3_call_state_wipe (cs); + } return 0; } @@ -2407,8 +2332,6 @@ nfs3svc_create_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs_request_user_init (&nfu, cs->req); if (op_ret == -1) { ret = -op_errno; - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -2423,10 +2346,9 @@ nfs3err: nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "CREATE", stat, op_errno); nfs3_create_reply (cs->req, stat, NULL, NULL, NULL, NULL); - } -out: - if (ret < 0) nfs3_call_state_wipe (cs); + } + return 0; } @@ -2520,7 +2442,6 @@ nfs3_create (rpcsvc_request_t *req, struct nfs3_fh *dirfh, char *name, nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_validate_strlen_or_goto (name, NFS_NAME_MAX, nfs3err, stat, ret); nfs3_map_fh_to_volume (nfs3, dirfh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, dirfh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); @@ -2542,7 +2463,7 @@ nfs3err: nfs3_call_state_wipe (cs); ret = 0; } -out: + return ret; } @@ -2606,8 +2527,6 @@ nfs3svc_mkdir_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -2618,7 +2537,6 @@ nfs3err: op_errno, &cs->fh); nfs3_mkdir_reply (cs->req, stat, &cs->fh, postop, &cs->preparent, &cs->postparent); -out: nfs3_call_state_wipe (cs); return 0; @@ -2638,8 +2556,6 @@ nfs3svc_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -2666,10 +2582,9 @@ nfs3err: stat, op_errno, &cs->fh); nfs3_mkdir_reply (cs->req, stat, &cs->fh, buf, preparent, postparent); - } -out: - if (ret < 0) nfs3_call_state_wipe (cs); + } + return 0; } @@ -2734,7 +2649,6 @@ nfs3_mkdir (rpcsvc_request_t *req, struct nfs3_fh *dirfh, char *name, nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_validate_strlen_or_goto (name, NFS_NAME_MAX, nfs3err, stat, ret); nfs3_map_fh_to_volume (nfs3, dirfh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, dirfh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); @@ -2753,7 +2667,7 @@ nfs3err: nfs3_call_state_wipe (cs); ret = 0; } -out: + return ret; } @@ -2816,8 +2730,6 @@ nfs3svc_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -2830,7 +2742,6 @@ nfs3err: op_errno, &cs->fh); nfs3_symlink_reply (cs->req, stat, &cs->fh, buf, preparent, postparent); -out: nfs3_call_state_wipe (cs); return 0; } @@ -2888,7 +2799,6 @@ nfs3_symlink (rpcsvc_request_t *req, struct nfs3_fh *dirfh, char *name, nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_validate_strlen_or_goto (name, NFS_NAME_MAX, nfs3err, stat, ret); nfs3_map_fh_to_volume (nfs3, dirfh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, dirfh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); @@ -2915,7 +2825,7 @@ nfs3err: */ ret = 0; } -out: + return ret; } @@ -2978,8 +2888,6 @@ nfs3svc_mknod_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -2990,7 +2898,6 @@ nfs3err: op_errno, &cs->fh); nfs3_mknod_reply (cs->req, stat, &cs->fh, postop, &cs->preparent, &cs->postparent); -out: nfs3_call_state_wipe (cs); return 0; } @@ -3010,8 +2917,6 @@ nfs3svc_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -3039,10 +2944,8 @@ nfs3err: op_errno, &cs->fh); nfs3_mknod_reply (cs->req, stat, &cs->fh, buf, preparent, postparent); - } -out: - if (ret < 0) nfs3_call_state_wipe (cs); + } return 0; } @@ -3168,7 +3071,6 @@ nfs3_mknod (rpcsvc_request_t *req, struct nfs3_fh *fh, char *name, nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_validate_strlen_or_goto (name, NFS_NAME_MAX, nfs3err, stat, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, fh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); @@ -3208,7 +3110,7 @@ nfs3err: nfs3_call_state_wipe (cs); ret = 0; } -out: + return ret; } @@ -3269,8 +3171,6 @@ nfs3svc_remove_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto do_not_unref_cached_fd; } @@ -3294,7 +3194,6 @@ do_not_unref_cached_fd: nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "REMOVE", stat, op_errno); nfs3_remove_reply (cs->req, stat, preparent, postparent); -out: nfs3_call_state_wipe (cs); return 0; @@ -3371,7 +3270,6 @@ nfs3_remove (rpcsvc_request_t *req, struct nfs3_fh *fh, char *name) nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_validate_strlen_or_goto (name, NFS_NAME_MAX, nfs3err, stat, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, fh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); @@ -3390,7 +3288,7 @@ nfs3err: */ ret = 0; } -out: + return ret; } @@ -3448,11 +3346,9 @@ nfs3svc_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3_call_state_t *cs = NULL; cs = frame->local; - if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); + if (op_ret == -1) stat = nfs3_errno_to_nfsstat3 (op_errno); - } else { + else { inode_unref (cs->resolvedloc.inode); stat = NFS3_OK; } @@ -3460,7 +3356,6 @@ nfs3svc_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "RMDIR", stat, op_errno); nfs3_rmdir_reply (cs->req, stat, preparent, postparent); -out: nfs3_call_state_wipe (cs); return 0; @@ -3518,7 +3413,6 @@ nfs3_rmdir (rpcsvc_request_t *req, struct nfs3_fh *fh, char *name) nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_validate_strlen_or_goto (name, NFS_NAME_MAX, nfs3err, stat, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, fh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); @@ -3537,7 +3431,7 @@ nfs3err: */ ret = 0; } -out: + return ret; } @@ -3604,8 +3498,6 @@ nfs3svc_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -3628,7 +3520,6 @@ nfs3err: -ret); nfs3_rename_reply (cs->req, stat, buf, preoldparent, postoldparent, prenewparent, postnewparent); -out: nfs3_call_state_wipe (cs); return 0; } @@ -3725,7 +3616,6 @@ nfs3_rename (rpcsvc_request_t *req, struct nfs3_fh *olddirfh, char *oldname, nfs3_validate_strlen_or_goto(oldname, NFS_NAME_MAX, nfs3err, stat, ret); nfs3_validate_strlen_or_goto(newname, NFS_NAME_MAX, nfs3err, stat, ret); nfs3_map_fh_to_volume (nfs3, olddirfh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, olddirfh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); @@ -3756,7 +3646,7 @@ nfs3err: */ ret = 0; } -out: + return ret; } @@ -3818,17 +3708,14 @@ nfs3svc_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3_call_state_t *cs = NULL; cs = frame->local; - if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); + if (op_ret == -1) stat = nfs3_errno_to_nfsstat3 (op_errno); - } else + else stat = NFS3_OK; nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "LINK", stat, op_errno); nfs3_link_reply (cs->req, stat, buf, preparent, postparent); -out: nfs3_call_state_wipe (cs); return 0; @@ -3918,7 +3805,6 @@ nfs3_link (rpcsvc_request_t *req, struct nfs3_fh *targetfh, nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_validate_strlen_or_goto(newname, NFS_NAME_MAX, nfs3err, stat, ret); nfs3_map_fh_to_volume (nfs3, dirfh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, dirfh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); @@ -3946,7 +3832,7 @@ nfs3err: */ ret = 0; } -out: + return ret; } @@ -4028,8 +3914,6 @@ nfs3svc_readdir_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto nfs3err; } @@ -4073,7 +3957,6 @@ nfs3err: } gf_log (GF_NFS3, GF_LOG_TRACE, "CS WIPE REF: %d", cs->fd->refcount); -out: nfs3_call_state_wipe (cs); return 0; } @@ -4090,8 +3973,6 @@ nfs3svc_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto err; } @@ -4122,7 +4003,6 @@ err: 0, 0, 0); } -out: /* For directories, we force a purge from the fd cache on close * so that next time the dir is read, we'll get any changed directory * entries. @@ -4248,7 +4128,6 @@ nfs3_readdir (rpcsvc_request_t *req, struct nfs3_fh *fh, cookie3 cookie, nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); cs->cookieverf = cverf; @@ -4280,7 +4159,7 @@ nfs3err: ret = 0; nfs3_call_state_wipe (cs); } -out: + return ret; } @@ -4369,17 +4248,14 @@ nfs3_fsstat_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3_call_state_t *cs = NULL; cs = frame->local; - if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); + if (op_ret == -1) stat = nfs3_errno_to_nfsstat3 (op_errno); - } else + else stat = NFS3_OK; nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "FSTAT", stat, op_errno); nfs3_fsstat_reply (cs->req, stat, &cs->fsstat, buf); -out: nfs3_call_state_wipe (cs); return 0; } @@ -4397,8 +4273,6 @@ nfs3_fsstat_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; if (op_ret == -1) { ret = -op_errno; - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); stat = nfs3_errno_to_nfsstat3 (op_errno); goto err; } @@ -4418,10 +4292,9 @@ err: nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "FSTAT", stat, -ret); nfs3_fsstat_reply (cs->req, stat, NULL, NULL); - } -out: - if (ret < 0) nfs3_call_state_wipe (cs); + } + return 0; } @@ -4477,7 +4350,6 @@ nfs3_fsstat (rpcsvc_request_t *req, struct nfs3_fh *fh) nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); ret = nfs3_fh_resolve_and_resume (cs, fh, NULL, nfs3_fsstat_resume); @@ -4495,7 +4367,7 @@ nfs3err: */ ret = 0; } -out: + return ret; } @@ -4554,18 +4426,15 @@ nfs3svc_fsinfo_cbk (call_frame_t *frame, void *cookie, xlator_t *this, cs = frame->local; - if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); + if (op_ret == -1) status = nfs3_errno_to_nfsstat3 (op_errno); - } else + else status = NFS3_OK; nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "FSINFO", status, op_errno); nfs3_fsinfo_reply (cs->req, status, buf); -out: nfs3_call_state_wipe (cs); return 0; @@ -4623,7 +4492,6 @@ nfs3_fsinfo (rpcsvc_request_t *req, struct nfs3_fh *fh) nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); ret = nfs3_fh_resolve_and_resume (cs, fh, NULL, nfs3_fsinfo_resume); @@ -4638,7 +4506,7 @@ nfs3err: nfs3_call_state_wipe (cs); ret = 0; } -out: + return ret; } @@ -4695,11 +4563,9 @@ nfs3svc_pathconf_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfsstat3 stat = NFS3ERR_SERVERFAULT; cs = frame->local; - if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); + if (op_ret == -1) stat = nfs3_errno_to_nfsstat3 (op_errno); - } else { + else { /* If stat fop failed, we can still send the other components * in a pathconf reply. */ @@ -4710,7 +4576,6 @@ nfs3svc_pathconf_cbk (call_frame_t *frame, void *cookie, xlator_t *this, nfs3_log_common_res (nfs_rpcsvc_request_xid (cs->req), "PATHCONF", stat, op_errno); nfs3_pathconf_reply (cs->req, stat, sbuf); -out: nfs3_call_state_wipe (cs); return 0; @@ -4764,7 +4629,6 @@ nfs3_pathconf (rpcsvc_request_t *req, struct nfs3_fh *fh) nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); ret = nfs3_fh_resolve_and_resume (cs, fh, NULL, nfs3_pathconf_resume); @@ -4782,7 +4646,7 @@ nfs3err: */ ret = 0; } -out: + return ret; } @@ -4840,18 +4704,15 @@ nfs3svc_commit_cbk (call_frame_t *frame, void *cookie, xlator_t *this, struct nfs3_state *nfs3 = NULL; cs = frame->local; - if (op_ret == -1) { - nfs3_disable_subvolume_on_disconnect (this, cookie, op_errno, - out); + if (op_ret == -1) stat = nfs3_errno_to_nfsstat3 (op_errno); - } else + else stat = NFS3_OK; nfs3 = nfs_rpcsvc_request_program_private (cs->req); nfs3_log_commit_res (nfs_rpcsvc_request_xid (cs->req), stat, op_errno, nfs3->serverstart); nfs3_commit_reply (cs->req, stat, nfs3->serverstart, prebuf, postbuf); -out: nfs3_call_state_wipe (cs); return 0; @@ -4946,7 +4807,6 @@ nfs3_commit (rpcsvc_request_t *req, struct nfs3_fh *fh, offset3 offset, nfs3_validate_gluster_fh (fh, stat, nfs3err); nfs3_validate_nfs3_state (req, nfs3, stat, nfs3err, ret); nfs3_map_fh_to_volume (nfs3, fh, req, vol, stat, nfs3err); - nfs3_volume_disabled_check (nfs3, vol, ret, out); nfs3_check_rw_volaccess (nfs3, fh->exportid, stat, nfs3err); nfs3_handle_call_state_init (nfs3, cs, req, vol, stat, nfs3err); @@ -4965,7 +4825,7 @@ nfs3err: nfs3_call_state_wipe (cs); ret = 0; } -out: + return ret; } -- cgit