Skip to content

Commit

Permalink
NFSv41: Further cleanup for nfs4_sequence_done
Browse files Browse the repository at this point in the history
Instead of testing if the nfs_client has a session, we should be testing if
the struct nfs4_sequence_res was set up with one.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Jun 22, 2010
1 parent 035168a commit df89645
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions fs/nfs/nfs4proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,13 @@ static void nfs41_sequence_done(struct nfs4_sequence_res *res)
nfs41_sequence_free_slot(res);
}

static void nfs4_sequence_done(const struct nfs_server *server,
struct nfs4_sequence_res *res, int rpc_status)
{
if (res->sr_session != NULL)
nfs41_sequence_done(res);
}

/*
* nfs4_find_slot - efficiently look for a free slot
*
Expand Down Expand Up @@ -642,6 +649,11 @@ int _nfs4_call_sync_session(struct nfs_server *server,
return nfs4_call_sync_sequence(server, msg, args, res, cache_reply, 0);
}

#else
static void nfs4_sequence_done(const struct nfs_server *server,
struct nfs4_sequence_res *res, int rpc_status)
{
}
#endif /* CONFIG_NFS_V4_1 */

int _nfs4_call_sync(struct nfs_server *server,
Expand All @@ -658,15 +670,6 @@ int _nfs4_call_sync(struct nfs_server *server,
(server)->nfs_client->cl_call_sync((server), (msg), &(args)->seq_args, \
&(res)->seq_res, (cache_reply))

static void nfs4_sequence_done(const struct nfs_server *server,
struct nfs4_sequence_res *res, int rpc_status)
{
#ifdef CONFIG_NFS_V4_1
if (nfs4_has_session(server->nfs_client))
nfs41_sequence_done(res);
#endif /* CONFIG_NFS_V4_1 */
}

static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo)
{
struct nfs_inode *nfsi = NFS_I(dir);
Expand Down

0 comments on commit df89645

Please sign in to comment.