diff options
| author | Anoop C S <anoopcs@redhat.com> | 2015-12-20 21:47:37 +0530 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-03-22 12:38:00 -0700 |
| commit | 86501cd36b9784a6c0247326092a50fb44524656 (patch) | |
| tree | 748f32183e396e3a7b1929b8c24faa2bf2dd1dad | |
| parent | 1081584d4c2d26e56fea623ecfadd305c6e3d3bc (diff) | |
features/locks: Remove unneeded function parameter
We use list_del_init() inside __delete_lock()
to remove a lock from inode's lock list where
pl_inode_t is not required at all. This patch
removes pl_inode_t from list of parameters
required for __delete_lock().
Change-Id: Ic5701bcae231172d4fd7feda1b25752343ee81cf
BUG: 1293227
Signed-off-by: Anoop C S <anoopcs@redhat.com>
Reviewed-on: http://review.gluster.org/13033
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
| -rw-r--r-- | xlators/features/locks/src/common.c | 10 | ||||
| -rw-r--r-- | xlators/features/locks/src/common.h | 2 | ||||
| -rw-r--r-- | xlators/features/locks/src/posix.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c index 0abc9353c9e..1c43ef16179 100644 --- a/xlators/features/locks/src/common.c +++ b/xlators/features/locks/src/common.c @@ -483,7 +483,7 @@ out: /* Delete a lock from the inode's lock list */ void -__delete_lock (pl_inode_t *pl_inode, posix_lock_t *lock) +__delete_lock (posix_lock_t *lock) { list_del_init (&lock->list); } @@ -562,7 +562,7 @@ __delete_unlck_locks (pl_inode_t *pl_inode) list_for_each_entry_safe (l, tmp, &pl_inode->ext_list, list) { if (l->fl_type == F_UNLCK) { - __delete_lock (pl_inode, l); + __delete_lock (l); __destroy_lock (l); } } @@ -800,7 +800,7 @@ __insert_and_merge (pl_inode_t *pl_inode, posix_lock_t *lock) sum->client_pid = lock->client_pid; sum->owner = lock->owner; - __delete_lock (pl_inode, conf); + __delete_lock (conf); __destroy_lock (conf); __destroy_lock (lock); @@ -820,10 +820,10 @@ __insert_and_merge (pl_inode_t *pl_inode, posix_lock_t *lock) v = subtract_locks (sum, lock); - __delete_lock (pl_inode, conf); + __delete_lock (conf); __destroy_lock (conf); - __delete_lock (pl_inode, lock); + __delete_lock (lock); __destroy_lock (lock); __destroy_lock (sum); diff --git a/xlators/features/locks/src/common.h b/xlators/features/locks/src/common.h index 5ec630ee857..b3026cb8c83 100644 --- a/xlators/features/locks/src/common.h +++ b/xlators/features/locks/src/common.h @@ -59,7 +59,7 @@ locks_overlap (posix_lock_t *l1, posix_lock_t *l2); int same_owner (posix_lock_t *l1, posix_lock_t *l2); -void __delete_lock (pl_inode_t *, posix_lock_t *); +void __delete_lock (posix_lock_t *); void __destroy_lock (posix_lock_t *); diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index eedd2746816..b81a0738a60 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -594,7 +594,7 @@ delete_locks_of_fd (xlator_t *this, pl_inode_t *pl_inode, fd_t *fd) list_move_tail (&l->list, &blocked_list); continue; } - __delete_lock (pl_inode, l); + __delete_lock (l); __destroy_lock (l); } } @@ -639,7 +639,7 @@ __delete_locks_of_owner (pl_inode_t *pl_inode, l->user_flock.l_len, l->blocked == 1 ? "Blocked" : "Active"); - __delete_lock (pl_inode, l); + __delete_lock (l); __destroy_lock (l); } } @@ -2022,7 +2022,7 @@ pl_forget (xlator_t *this, list_for_each_entry_safe (ext_l, ext_tmp, &pl_inode->ext_list, list) { - __delete_lock (pl_inode, ext_l); + __delete_lock (ext_l); if (ext_l->blocked) { list_add_tail (&ext_l->list, &posixlks_released); continue; |