aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-09-21 16:52:40 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-09-21 16:52:40 -0400
commitd688e11007419fd060ae74d8d952a5c4ece735aa (patch)
tree698c9dddd2bd0afc7fa73ea267a17a0b7a79404a
parentf7732d6573c4f29fc1ca5d384bbf82ddfa115030 (diff)
downloadmrst-s0i3-test-d688e11007419fd060ae74d8d952a5c4ece735aa.tar.gz
mrst-s0i3-test-d688e11007419fd060ae74d8d952a5c4ece735aa.tar.xz
mrst-s0i3-test-d688e11007419fd060ae74d8d952a5c4ece735aa.zip
NFSv4.1: Fix the slotid initialisation in nfs_async_rename()
This fixes an Oopsable condition that was introduced by commit d3d4152a5d59af9e13a73efa9e9c24383fbe307f (nfs: make sillyrename an async operation) Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index c46e45e9b33..72aa7067b85 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2550,6 +2550,7 @@ static void nfs4_proc_unlink_setup(struct rpc_message *msg, struct inode *dir)
args->bitmask = server->cache_consistency_bitmask;
res->server = server;
+ res->seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;
msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_REMOVE];
}
@@ -2575,6 +2576,7 @@ static void nfs4_proc_rename_setup(struct rpc_message *msg, struct inode *dir)
msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENAME];
arg->bitmask = server->attr_bitmask;
res->server = server;
+ res->seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;
}
static int nfs4_proc_rename_done(struct rpc_task *task, struct inode *old_dir,