hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NFS: remove l_pid field from nfs_lockowner 

this field is not used in any important way and probably should
have been removed by

Commit: 8003d3c4aa ("nfs4: treat lock owners as opaque values")

which removed the pid argument from nfs4_get_lock_state.

Except in unusual and uninteresting cases, two threads with the same
->tgid will have the same ->files pointer, so keeping them both
for comparison brings no benefit.

Acked-by: Jeff Layton <jlayton@redhat.com>
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 committed by Trond Myklebust
parent 4d3b55d3c7
commit b184b5c38e
5 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfs/inode.c
View File

@ -703,7 +703,6 @@ static void nfs_init_lock_context(struct nfs_lock_context *l_ctx)
{ {
atomic_set(&l_ctx->count, 1); atomic_set(&l_ctx->count, 1);
l_ctx->lockowner.l_owner = current->files; l_ctx->lockowner.l_owner = current->files;
l_ctx->lockowner.l_pid = current->tgid;
INIT_LIST_HEAD(&l_ctx->list); INIT_LIST_HEAD(&l_ctx->list);
atomic_set(&l_ctx->io_count, 0); atomic_set(&l_ctx->io_count, 0);
} }
@ -716,8 +715,6 @@ static struct nfs_lock_context *__nfs_find_lock_context(struct nfs_open_context
do { do {
if (pos->lockowner.l_owner != current->files) if (pos->lockowner.l_owner != current->files)
continue; continue;
if (pos->lockowner.l_pid != current->tgid)
continue;
atomic_inc(&pos->count); atomic_inc(&pos->count);
return pos; return pos;
} while ((pos = list_entry(pos->list.next, typeof(*pos), list)) != head); } while ((pos = list_entry(pos->list.next, typeof(*pos), list)) != head);

1
fs/nfs/nfs4proc.c
View File

@ -2947,7 +2947,6 @@ static int _nfs4_do_setattr(struct inode *inode,
} else if (truncate && state != NULL) { } else if (truncate && state != NULL) {
struct nfs_lockowner lockowner = { struct nfs_lockowner lockowner = {
.l_owner = current->files, .l_owner = current->files,
.l_pid = current->tgid,
}; };
if (!nfs4_valid_open_stateid(state)) if (!nfs4_valid_open_stateid(state))
return -EBADF; return -EBADF;

3
fs/nfs/pagelist.c
View File

@ -867,8 +867,7 @@ static void nfs_pageio_cleanup_mirroring(struct nfs_pageio_descriptor *pgio)
static bool nfs_match_lock_context(const struct nfs_lock_context *l1, static bool nfs_match_lock_context(const struct nfs_lock_context *l1,
const struct nfs_lock_context *l2) const struct nfs_lock_context *l2)
{ {
return l1->lockowner.l_owner == l2->lockowner.l_owner return l1->lockowner.l_owner == l2->lockowner.l_owner;
&& l1->lockowner.l_pid == l2->lockowner.l_pid;
} }
/** /**

3
fs/nfs/write.c
View File

@ -1151,8 +1151,7 @@ int nfs_flush_incompatible(struct file *file, struct page *page)
if (l_ctx && flctx && if (l_ctx && flctx &&
!(list_empty_careful(&flctx->flc_posix) && !(list_empty_careful(&flctx->flc_posix) &&
list_empty_careful(&flctx->flc_flock))) { list_empty_careful(&flctx->flc_flock))) {
do_flush |= l_ctx->lockowner.l_owner != current->files do_flush |= l_ctx->lockowner.l_owner != current->files;
|| l_ctx->lockowner.l_pid != current->tgid;
} }
nfs_release_request(req); nfs_release_request(req);
if (!do_flush) if (!do_flush)

1
include/linux/nfs_fs.h
View File

@ -57,7 +57,6 @@ struct nfs_access_entry {
struct nfs_lockowner { struct nfs_lockowner {
fl_owner_t l_owner; fl_owner_t l_owner;
pid_t l_pid;
}; };
struct nfs_lock_context { struct nfs_lock_context {