From patchwork Mon Mar 14 12:58:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 633061 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2ECvR3C019764 for ; Mon, 14 Mar 2011 12:58:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753229Ab1CNM6L (ORCPT ); Mon, 14 Mar 2011 08:58:11 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:42961 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752966Ab1CNM6K (ORCPT ); Mon, 14 Mar 2011 08:58:10 -0400 Received: by iwn34 with SMTP id 34so4887758iwn.19 for ; Mon, 14 Mar 2011 05:58:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:subject:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version:content-type :content-transfer-encoding; bh=0Po6XbAW6RzGOJsMsYerzc3LlQjxROOTd61vSI1j8A0=; b=EfgGW0D360hsCAfSlJ4JwppQOhmlOyFhVmKiUmiSOVwcJYoYn02goyeeBOwSwPn8ID XGNQyfY/2X/fZU+eQUOqMTa2MibQutwRjd4Hi+1Pgf56/VdUeSdwhaPXVbL2AH3Ypo/7 9Xw+OY3fODBdP9PvUN9hRhDttgGiJAQPLLzaE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=vdX58IPbFafagoy79Iu3Y+qFOvQ3KYXgSpsAOvotcbR2JqQdMneJie5iakc5lLjuh8 u2gGyJ2lLoGBCr+0VIf+Ydp0LOBE2aJAk9KRZHMJ3pVzwAnqQarSaeihMhcDtsfyJz6b bQCOcY/SLqEKSF3y3ZPn1qjsyGOyMuSzHVyqU= Received: by 10.231.177.193 with SMTP id bj1mr5795489ibb.145.1300107490064; Mon, 14 Mar 2011 05:58:10 -0700 (PDT) Received: from matisse.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net [99.26.161.222]) by mx.google.com with ESMTPS id u9sm6676874ibe.20.2011.03.14.05.58.08 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Mar 2011 05:58:09 -0700 (PDT) From: Chuck Lever Subject: [PATCH 11/12] NFS: Add migration recovery callouts in nfs4proc.c To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org Date: Mon, 14 Mar 2011 08:58:07 -0400 Message-ID: <20110314125807.2413.79300.stgit@matisse.1015granger.net> In-Reply-To: <20110314125204.2413.8870.stgit@matisse.1015granger.net> References: <20110314125204.2413.8870.stgit@matisse.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 14 Mar 2011 12:58:18 +0000 (UTC) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index bdd8aac..2537a18 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -71,7 +71,8 @@ struct nfs4_opendata; static int _nfs4_proc_open(struct nfs4_opendata *data); static int _nfs4_recover_proc_open(struct nfs4_opendata *data); static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *); -static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *, struct nfs4_state *); +static int nfs4_async_handle_error(struct rpc_task *, struct nfs_server *, + struct nfs4_state *); static int _nfs4_proc_lookup(struct inode *dir, const struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr); static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr); static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred, @@ -239,10 +240,17 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout) return res; } -/* This is the error handling routine for processes that are allowed - * to sleep. +/** + * nfs4_handle_exception - Common error handling for callers allowed to sleep + * + * @server: local state context for the server + * @errorcode: NFS4ERR value returned from the server + * @exception: exception handling state + * + * Returns zero on success, or a negative errno value. */ -static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct nfs4_exception *exception) +static int nfs4_handle_exception(struct nfs_server *server, int errorcode, + struct nfs4_exception *exception) { struct nfs_client *clp = server->nfs_client; struct nfs4_state *state = exception->state; @@ -277,6 +285,9 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, exception->retry = 1; break; #endif /* defined(CONFIG_NFS_V4_1) */ + case -NFS4ERR_MOVED: + nfs4_schedule_migration_recovery(server); + goto recovery_wait; case -NFS4ERR_FILE_OPEN: if (exception->timeout > HZ) { /* We have retried a decent amount, time to @@ -298,6 +309,7 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, return nfs4_map_errors(ret); do_state_recovery: nfs4_schedule_state_recovery(clp); +recovery_wait: ret = nfs4_wait_clnt_recover(clp); if (ret == 0) exception->retry = 1; @@ -2194,10 +2206,14 @@ static int nfs4_get_referral(struct inode *dir, const struct qstr *name, struct status = nfs4_proc_fs_locations(dir, name, locations, page); if (status != 0) goto out; - /* Make sure server returned a different fsid for the referral */ + + /* + * If the fsid didn't change, this is a migration event, not a + * referral. Cause us to drop into the exception handler, which + * will kick off migration recovery. + */ if (nfs_fsid_equal(&NFS_SERVER(dir)->fsid, &locations->fattr.fsid)) { - dprintk("%s: server did not return a different fsid for a referral at %s\n", __func__, name->name); - status = -EIO; + status = -NFS4ERR_MOVED; goto out; } @@ -3492,8 +3508,18 @@ static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen return err; } -static int -nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, struct nfs4_state *state) +/** + * nfs4_async_handle_error - Common error handling for callers who cannot sleep + * + * @task: active RPC task + * @server: local state for the server + * @state: NFSv4 state for active operation + * + * Returns zero on success, or a negative errno value. + */ +static int nfs4_async_handle_error(struct rpc_task *task, + struct nfs_server *server, + struct nfs4_state *state) { struct nfs_client *clp = server->nfs_client; @@ -3522,19 +3548,23 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, dprintk("%s ERROR %d, Reset session\n", __func__, task->tk_status); nfs4_schedule_state_recovery(clp); - task->tk_status = 0; - return -EAGAIN; + goto restart_call; #endif /* CONFIG_NFS_V4_1 */ + case -NFS4ERR_MOVED: + rpc_sleep_on(&clp->cl_rpcwaitq, task, NULL); + nfs4_schedule_migration_recovery(server); + if (test_bit(NFS4CLNT_MANAGER_RUNNING, + &clp->cl_state) == 0) + rpc_wake_up_queued_task(&clp->cl_rpcwaitq, task); + goto restart_call; case -NFS4ERR_DELAY: nfs_inc_server_stats(server, NFSIOS_DELAY); case -NFS4ERR_GRACE: case -EKEYEXPIRED: rpc_delay(task, NFS4_POLL_RETRY_MAX); - task->tk_status = 0; - return -EAGAIN; + goto restart_call; case -NFS4ERR_OLD_STATEID: - task->tk_status = 0; - return -EAGAIN; + goto restart_call; } task->tk_status = nfs4_map_errors(task->tk_status); return 0; @@ -3543,6 +3573,7 @@ do_state_recovery: nfs4_schedule_state_recovery(clp); if (test_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) == 0) rpc_wake_up_queued_task(&clp->cl_rpcwaitq, task); +restart_call: task->tk_status = 0; return -EAGAIN; }