diff options
Diffstat (limited to 'xlators/features/locks')
-rw-r--r-- | xlators/features/locks/src/entrylk.c | 4 | ||||
-rw-r--r-- | xlators/features/locks/src/inodelk.c | 12 | ||||
-rw-r--r-- | xlators/features/locks/src/reservelk.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index 04ffd6d387b..a4b5969a189 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -98,7 +98,7 @@ names_conflict (const char *n1, const char *n2) } -static inline int +static int __same_entrylk_owner (pl_entry_lock_t *l1, pl_entry_lock_t *l2) { return (is_same_lkowner (&l1->owner, &l2->owner) && @@ -106,7 +106,7 @@ __same_entrylk_owner (pl_entry_lock_t *l1, pl_entry_lock_t *l2) } /* Just as in inodelk, allow conflicting name locks from same (lk_owner, conn)*/ -static inline int +static int __conflicting_entrylks (pl_entry_lock_t *l1, pl_entry_lock_t *l2) { if (names_conflict (l1->basename, l2->basename) diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index 9860e9f9079..cfff4fa23b2 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -23,19 +23,19 @@ #include "locks.h" #include "common.h" -inline void +void __delete_inode_lock (pl_inode_lock_t *lock) { list_del_init (&lock->list); } -static inline void +static void __pl_inodelk_ref (pl_inode_lock_t *lock) { lock->ref++; } -inline void +void __pl_inodelk_unref (pl_inode_lock_t *lock) { lock->ref--; @@ -46,7 +46,7 @@ __pl_inodelk_unref (pl_inode_lock_t *lock) } /* Check if 2 inodelks are conflicting on type. Only 2 shared locks don't conflict */ -static inline int +static int inodelk_type_conflict (pl_inode_lock_t *l1, pl_inode_lock_t *l2) { if (l2->fl_type == F_WRLCK || l1->fl_type == F_WRLCK) @@ -120,7 +120,7 @@ inodelk_overlap (pl_inode_lock_t *l1, pl_inode_lock_t *l2) } /* Returns true if the 2 inodelks have the same owner */ -static inline int +static int same_inodelk_owner (pl_inode_lock_t *l1, pl_inode_lock_t *l2) { return (is_same_lkowner (&l1->owner, &l2->owner) && @@ -831,7 +831,7 @@ pl_finodelk (call_frame_t *frame, xlator_t *this, } -static inline int32_t +static int32_t __get_inodelk_dom_count (pl_dom_list_t *dom) { pl_inode_lock_t *lock = NULL; diff --git a/xlators/features/locks/src/reservelk.c b/xlators/features/locks/src/reservelk.c index 11abd26d85f..df3562f90ba 100644 --- a/xlators/features/locks/src/reservelk.c +++ b/xlators/features/locks/src/reservelk.c @@ -71,7 +71,7 @@ out: return ret_lock; } -static inline int +static int __same_owner_reservelk (posix_lock_t *l1, posix_lock_t *l2) { return (is_same_lkowner (&l1->owner, &l2->owner)); |