xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Forka 0
Codice Problemi Pull Requests Actions Pacchetti Progetti Rilasci Wiki Attività

NFSv4: change nfs4_select_rw_stateid to take a lock_context inplace of lock_owner

Sfoglia il codice sorgente 
The only time that a lock_context is not immediately available is in
setattr, and now that it has an open_context, it can easily find one
with nfs_get_lock_context.
This removes the need for the on-stack nfs_lockowner.

This change is preparation for correctly support flock stateids.

Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
NeilBrown
2016-10-13 15:26:47 +11:00
committato da Trond Myklebust
parent 29b59f9416
commit 1739347549
3 ha cambiato i file con 12 aggiunte e 16 eliminazioni
Scarica il file Patch Scarica il file Diff Expand all files Collapse all files

15
fs/nfs/nfs4proc.c
Vedi File

@@ -2945,12 +2945,13 @@ static int _nfs4_do_setattr(struct inode *inode,
if (nfs4_copy_delegation_stateid(inode, fmode, &arg->stateid, &delegation_cred)) {
/* Use that stateid */
} else if (truncate && ctx != NULL) {
struct nfs_lockowner lockowner = {
.l_owner = current->files,
};
struct nfs_lock_context *l_ctx;
if (!nfs4_valid_open_stateid(ctx->state))
return -EBADF;
if (nfs4_select_rw_stateid(ctx->state, FMODE_WRITE, &lockowner,
l_ctx = nfs_get_lock_context(ctx);
if (IS_ERR(l_ctx))
return PTR_ERR(l_ctx);
if (nfs4_select_rw_stateid(ctx->state, FMODE_WRITE, l_ctx,
&arg->stateid, &delegation_cred) == -EIO)
return -EBADF;
} else
@@ -4576,11 +4577,7 @@ int nfs4_set_rw_stateid(nfs4_stateid *stateid,
const struct nfs_lock_context *l_ctx,
fmode_t fmode)
{
const struct nfs_lockowner *lockowner = NULL;
if (l_ctx != NULL)
lockowner = &l_ctx->lockowner;
return nfs4_select_rw_stateid(ctx->state, fmode, lockowner, stateid, NULL);
return nfs4_select_rw_stateid(ctx->state, fmode, l_ctx, stateid, NULL);
}
EXPORT_SYMBOL_GPL(nfs4_set_rw_stateid);