diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h index 1ec4231..2ae463a 100644 --- a/drivers/staging/lustre/lustre/include/lustre_dlm.h +++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h @@ -1293,6 +1293,7 @@ enum lock_res_type { /** Lock resource. */ static inline void lock_res(struct ldlm_resource *res) + __acquires(&res->lr_lock) { spin_lock(&res->lr_lock); } @@ -1306,6 +1307,7 @@ static inline void lock_res_nested(struct ldlm_resource *res, /** Unlock resource. */ static inline void unlock_res(struct ldlm_resource *res) + __releases(&res->lr_lock) { spin_unlock(&res->lr_lock); } diff --git a/drivers/staging/lustre/lustre/ldlm/l_lock.c b/drivers/staging/lustre/lustre/ldlm/l_lock.c index ea8840c..a887d9f 100644 --- a/drivers/staging/lustre/lustre/ldlm/l_lock.c +++ b/drivers/staging/lustre/lustre/ldlm/l_lock.c @@ -45,6 +45,7 @@ * being an atomic operation. */ struct ldlm_resource *lock_res_and_lock(struct ldlm_lock *lock) + __acquires(&lock->l_lock) { spin_lock(&lock->l_lock); @@ -59,6 +60,7 @@ EXPORT_SYMBOL(lock_res_and_lock); * Unlock a lock and its resource previously locked with lock_res_and_lock */ void unlock_res_and_lock(struct ldlm_lock *lock) + __releases(&lock->l_lock) { /* on server-side resource of lock doesn't change */ ldlm_clear_res_locked(lock);