Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d51fdb87 authored by NeilBrown's avatar NeilBrown Committed by Trond Myklebust
Browse files

NFS: discard nfs_lockowner structure. 



It now has only one field and is only used in one structure.
So replaced it in that structure by the field it contains.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 8d424431

fs/nfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ EXPORT_SYMBOL_GPL(nfs_getattr); 
static void nfs_init_lock_context(struct nfs_lock_context *l_ctx)

{

	atomic_set(&l_ctx->count, 1);

	l_ctx->lockowner.l_owner = current->files;

	l_ctx->lockowner = current->files;

	INIT_LIST_HEAD(&l_ctx->list);

	atomic_set(&l_ctx->io_count, 0);

}
@@ -713,7 +713,7 @@ static struct nfs_lock_context *__nfs_find_lock_context(struct nfs_open_context 
	struct nfs_lock_context *pos = head;



	do {

		if (pos->lockowner.l_owner != current->files)

		if (pos->lockowner != current->files)

			continue;

		atomic_inc(&pos->count);

		return pos;

fs/nfs/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ static int nfs4_copy_lock_stateid(nfs4_stateid *dst, 
	if (test_bit(LK_STATE_IN_USE, &state->flags) == 0)

		goto out;



	fl_owner = l_ctx->lockowner.l_owner;

	fl_owner = l_ctx->lockowner;

	fl_flock_owner = l_ctx->open_context->flock_owner;



	spin_lock(&state->state_lock);

fs/nfs/pagelist.c

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +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,

		const struct nfs_lock_context *l2)

{

	return l1->lockowner.l_owner == l2->lockowner.l_owner;

	return l1->lockowner == l2->lockowner;

}



/**

fs/nfs/write.c

+1 −1
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ int nfs_flush_incompatible(struct file *file, struct page *page) 
		if (l_ctx && flctx &&

		    !(list_empty_careful(&flctx->flc_posix) &&

		      list_empty_careful(&flctx->flc_flock))) {

			do_flush |= l_ctx->lockowner.l_owner != current->files;

			do_flush |= l_ctx->lockowner != current->files;

		}

		nfs_release_request(req);

		if (!do_flush)

include/linux/nfs_fs.h

+1 −5
Original line number Diff line number Diff line
@@ -55,15 +55,11 @@ struct nfs_access_entry { 
	struct rcu_head		rcu_head;

};



struct nfs_lockowner {

	fl_owner_t l_owner;

};



struct nfs_lock_context {

	atomic_t count;

	struct list_head list;

	struct nfs_open_context *open_context;

	struct nfs_lockowner lockowner;

	fl_owner_t lockowner;

	atomic_t io_count;

};