diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-09-21 16:52:40 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-09-21 16:52:40 -0400 |
commit | d688e11007419fd060ae74d8d952a5c4ece735aa (patch) | |
tree | 698c9dddd2bd0afc7fa73ea267a17a0b7a79404a /fs | |
parent | f7732d6573c4f29fc1ca5d384bbf82ddfa115030 (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index c46e45e9b33f..72aa7067b85d 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) | |||
2550 | 2550 | ||
2551 | args->bitmask = server->cache_consistency_bitmask; | 2551 | args->bitmask = server->cache_consistency_bitmask; |
2552 | res->server = server; | 2552 | res->server = server; |
2553 | res->seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE; | ||
2553 | msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_REMOVE]; | 2554 | msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_REMOVE]; |
2554 | } | 2555 | } |
2555 | 2556 | ||
@@ -2575,6 +2576,7 @@ static void nfs4_proc_rename_setup(struct rpc_message *msg, struct inode *dir) | |||
2575 | msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENAME]; | 2576 | msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENAME]; |
2576 | arg->bitmask = server->attr_bitmask; | 2577 | arg->bitmask = server->attr_bitmask; |
2577 | res->server = server; | 2578 | res->server = server; |
2579 | res->seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE; | ||
2578 | } | 2580 | } |
2579 | 2581 | ||
2580 | static int nfs4_proc_rename_done(struct rpc_task *task, struct inode *old_dir, | 2582 | static int nfs4_proc_rename_done(struct rpc_task *task, struct inode *old_dir, |