aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-07-08 16:49:11 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-07-10 23:40:42 -0400
commit6f43ddccb31b5bd2297878f6f3735d45fd4dfce3 (patch)
tree2b21ec002ca6868df0d7d39a1044fff5ff97df87
parent003707c7225dbd4bf879b6c204743554de0a08d6 (diff)
NFSv4: Improve the debugging of bad sequence id errors...
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c4
-rw-r--r--fs/nfs/nfs4state.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 128fe23d3f1e..3b59c5ded3fb 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1079,7 +1079,9 @@ static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, int
1079 * the user though... 1079 * the user though...
1080 */ 1080 */
1081 if (status == -NFS4ERR_BAD_SEQID) { 1081 if (status == -NFS4ERR_BAD_SEQID) {
1082 printk(KERN_WARNING "NFS: v4 server returned a bad sequence-id error!\n"); 1082 printk(KERN_WARNING "NFS: v4 server %s "
1083 " returned a bad sequence-id error!\n",
1084 NFS_SERVER(dir)->nfs_client->cl_hostname);
1083 exception.retry = 1; 1085 exception.retry = 1;
1084 continue; 1086 continue;
1085 } 1087 }
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 4f78c0d1eab5..4fa4054cdf34 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -38,6 +38,7 @@
38 * subsequent patch. 38 * subsequent patch.
39 */ 39 */
40 40
41#include <linux/kernel.h>
41#include <linux/slab.h> 42#include <linux/slab.h>
42#include <linux/smp_lock.h> 43#include <linux/smp_lock.h>
43#include <linux/nfs_fs.h> 44#include <linux/nfs_fs.h>
@@ -648,6 +649,12 @@ static void nfs_increment_seqid(int status, struct nfs_seqid *seqid)
648 case 0: 649 case 0:
649 break; 650 break;
650 case -NFS4ERR_BAD_SEQID: 651 case -NFS4ERR_BAD_SEQID:
652 if (seqid->sequence->flags & NFS_SEQID_CONFIRMED)
653 return;
654 printk(KERN_WARNING "NFS: v4 server returned a bad"
655 "sequence-id error on an"
656 "unconfirmed sequence %p!\n",
657 seqid->sequence);
651 case -NFS4ERR_STALE_CLIENTID: 658 case -NFS4ERR_STALE_CLIENTID:
652 case -NFS4ERR_STALE_STATEID: 659 case -NFS4ERR_STALE_STATEID:
653 case -NFS4ERR_BAD_STATEID: 660 case -NFS4ERR_BAD_STATEID: