diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-07-01 12:49:11 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-07-30 14:46:10 -0400 |
| commit | 77041ed9b49a9e10f374bfa6e482d30ee7a3d46e (patch) | |
| tree | 8e5f98880863aaaa761735cb483730f8520d6b26 /fs/nfs/nfs4proc.c | |
| parent | d3c7b7ccc199ee564177ee914c04771d6bc00295 (diff) | |
| download | linux-77041ed9b49a9e10f374bfa6e482d30ee7a3d46e.tar.gz linux-77041ed9b49a9e10f374bfa6e482d30ee7a3d46e.tar.bz2 linux-77041ed9b49a9e10f374bfa6e482d30ee7a3d46e.zip | |
NFSv4: Ensure the lockowners are labelled using the fl_owner and/or fl_pid
flock locks want to be labelled using the process pid, while posix locks
want to be labelled using the fl_owner.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 5d3e8a2db99f..d6413b48b057 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1767,7 +1767,7 @@ static int _nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred, if (nfs4_copy_delegation_stateid(&arg.stateid, inode)) { /* Use that stateid */ } else if (state != NULL) { - nfs4_copy_stateid(&arg.stateid, state, current->files); + nfs4_copy_stateid(&arg.stateid, state, current->files, current->tgid); } else memcpy(&arg.stateid, &zero_stateid, sizeof(arg.stateid)); |