Home » Mailing list archives » linux-kernel » 2010 » December » 12

[PATCH] [41/223] NFSv4: Don't call nfs4_state_mark_reclaim_reboot() from error handlers

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Andi Kleen
Subject: [PATCH] [41/223] NFSv4: Don't call nfs4_state_mark_reclaim_reboot() from error handlers
Date: Sunday, December 12, 2010 - 4:45 pm

2.6.35-longterm review patch.  If anyone has any objections, please let me know.

------------------
From: Trond Myklebust <Trond.Myklebust@netapp.com>

commit ae1007d37e00144b72906a4bdc47d517ae91bcc1 upstream.

In the case of a server reboot, the state recovery thread starts by calling
nfs4_state_end_reclaim_reboot() in order to avoid edge conditions when
the server reboots while the client is in the middle of recovery.

However, if the client has already marked the nfs4_state as requiring
reboot recovery, then the above behaviour will cause the recovery thread to
treat the open as if it was part of such an edge condition: the open will
be recovered as if it was part of a lease expiration (and all the locks
will be lost).
Fix is to remove the call to nfs4_state_mark_reclaim_reboot from
nfs4_async_handle_error(), and nfs4_handle_exception(). Instead we leave it
to the recovery thread to do this for us.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>

---
 fs/nfs/nfs4proc.c |    6 ------
 1 file changed, 6 deletions(-)

Index: linux/fs/nfs/nfs4proc.c
===================================================================
--- linux.orig/fs/nfs/nfs4proc.c
+++ linux/fs/nfs/nfs4proc.c
@@ -255,9 +255,6 @@ static int nfs4_handle_exception(const s
 			nfs4_state_mark_reclaim_nograce(clp, state);
 			goto do_state_recovery;
 		case -NFS4ERR_STALE_STATEID:
-			if (state == NULL)
-				break;
-			nfs4_state_mark_reclaim_reboot(clp, state);
 		case -NFS4ERR_STALE_CLIENTID:
 		case -NFS4ERR_EXPIRED:
 			goto do_state_recovery;
@@ -3479,9 +3476,6 @@ _nfs4_async_handle_error(struct rpc_task
 			nfs4_state_mark_reclaim_nograce(clp, state);
 			goto do_state_recovery;
 		case -NFS4ERR_STALE_STATEID:
-			if (state == NULL)
-				break;
-			nfs4_state_mark_reclaim_reboot(clp, state);
 		case -NFS4ERR_STALE_CLIENTID:
 		case -NFS4ERR_EXPIRED:
 			goto do_state_recovery;
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] [0/223] 2.6.35.10 longterm review, Andi Kleen, (Sun Dec 12, 4:44 pm)
[PATCH] [3/223] block: limit vec count in bio_kmalloc() an ..., Andi Kleen, (Sun Dec 12, 4:44 pm)
[PATCH] [4/223] block: take care not to overflow when calc ..., Andi Kleen, (Sun Dec 12, 4:44 pm)
[PATCH] [6/223] drm/radeon/kms: don't disable shared encod ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [9/223] irda: Fix heap memory corruption in iriap.c, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [10/223] cfg80211: fix BSS double-unlinking, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [11/223] cfg80211: fix locking, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [12/223] cfg80211: fix regression on processing co ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [13/223] mac80211: fix channel assumption for asso ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [14/223] mac80211: fix offchannel assumption upon ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [15/223] mac80211: Fix signal strength average ini ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [16/223] mac80211: add helper for reseting the con ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [17/223] mac80211: reset connection idle when goin ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [21/223] mac80211: use correct station flags lock, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [22/223] mac80211: clear txflags for ps-filtered f ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [23/223] mac80211: reset probe send counter upon c ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [25/223] mac80211: don't sanitize invalid rates, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [26/223] mac80211: delete AddBA response timer, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [27/223] isdn/gigaset: fix bas_gigaset AT read err ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [28/223] isdn/gigaset: correct bas_gigaset rx buff ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [29/223] isdn/gigaset: bas_gigaset locking fix, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [30/223] i2c-pca-platform: Change device name of r ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [31/223] viafb: fix i2c_transfer error handling, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [32/223] drm/radeon/kms: register an i2c adapter n ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [33/223] ALSA: hda - Fix wrong SPDIF NID assignmen ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [34/223] ALSA: hda - Add some workarounds for Crea ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [35/223] ALSA: OSS mixer emulation - fix locking, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [37/223] powerpc: Fix call to subpage_protection(), Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [38/223] SUNRPC: After calling xprt_release(), we ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [39/223] microblaze: Fix build with make 3.82, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [40/223] NFSv4: Don't call nfs4_reclaim_complete() ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [41/223] NFSv4: Don't call nfs4_state_mark_reclaim ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [42/223] NFSv4: Fix open recovery, Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [43/223] NFS: Don't SIGBUS if nfs_vm_page_mkwrite ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
[PATCH] [46/223] drm/radeon/kms: make sure blit addr masks ..., Andi Kleen, (Sun Dec 12, 4:45 pm)
Re: [PATCH] [38/223] SUNRPC: After calling xprt_release(), ..., Trond Myklebust, (Mon Dec 13, 4:01 pm)
Re: [PATCH] [38/223] SUNRPC: After calling xprt_release(), ..., Andi Kleen, (Tue Dec 14, 3:48 am)
Re: [PATCH] [0/223] 2.6.35.10 longterm review, Randy Dunlap, (Thu Dec 16, 10:42 am)