From: Andrew Morton <akpm@linux-foundation.org>
To: Amerigo Wang <amwang@redhat.com>
Cc: linux-kernel@vger.kernel.org, Ben Woodard <bwoodard@llnl.gov>,
David Howells <dhowells@redhat.com>,
Brian Behlendorf <behlendorf1@llnl.gov>
Subject: Re: [Patch v5] rwsem: fix rwsem_is_locked() bugs
Date: Thu, 15 Oct 2009 16:46:02 -0700 [thread overview]
Message-ID: <20091015164602.ac75126f.akpm@linux-foundation.org> (raw)
In-Reply-To: <20091014095503.4235.63028.sendpatchset@localhost.localdomain>
On Wed, 14 Oct 2009 05:52:22 -0400
Amerigo Wang <amwang@redhat.com> wrote:
> --- a/include/linux/rwsem-spinlock.h
> +++ b/include/linux/rwsem-spinlock.h
> @@ -68,11 +68,9 @@ extern int __down_write_trylock(struct rw_semaphore *sem);
> extern void __up_read(struct rw_semaphore *sem);
> extern void __up_write(struct rw_semaphore *sem);
> extern void __downgrade_write(struct rw_semaphore *sem);
> +extern int __rwsem_is_locked(struct rw_semaphore *sem);
>
> -static inline int rwsem_is_locked(struct rw_semaphore *sem)
> -{
> - return (sem->activity != 0);
> -}
> +#define rwsem_is_locked(sem) __rwsem_is_locked(sem)
>
> #endif /* __KERNEL__ */
> #endif /* _LINUX_RWSEM_SPINLOCK_H */
> diff --git a/lib/rwsem-spinlock.c b/lib/rwsem-spinlock.c
> index 9df3ca5..7014306 100644
> --- a/lib/rwsem-spinlock.c
> +++ b/lib/rwsem-spinlock.c
> @@ -17,6 +17,19 @@ struct rwsem_waiter {
> #define RWSEM_WAITING_FOR_WRITE 0x00000002
> };
>
> +int __rwsem_is_locked(struct rw_semaphore *sem)
> +{
> + int ret = 1;
> + unsigned long flags;
> +
> + if (spin_trylock_irqsave(&sem->wait_lock, flags)) {
> + ret = (sem->activity != 0);
> + spin_unlock_irqrestore(&sem->wait_lock, flags);
> + }
> + return ret;
> +}
> +EXPORT_SYMBOL(__rwsem_is_locked);
Why the macro tricks? Can we do
--- a/include/linux/rwsem-spinlock.h~rwsem-fix-rwsem_is_locked-bugs-fix
+++ a/include/linux/rwsem-spinlock.h
@@ -68,9 +68,7 @@ extern int __down_write_trylock(struct r
extern void __up_read(struct rw_semaphore *sem);
extern void __up_write(struct rw_semaphore *sem);
extern void __downgrade_write(struct rw_semaphore *sem);
-extern int __rwsem_is_locked(struct rw_semaphore *sem);
-
-#define rwsem_is_locked(sem) __rwsem_is_locked(sem)
+extern int rwsem_is_locked(struct rw_semaphore *sem);
#endif /* __KERNEL__ */
#endif /* _LINUX_RWSEM_SPINLOCK_H */
--- a/lib/rwsem-spinlock.c~rwsem-fix-rwsem_is_locked-bugs-fix
+++ a/lib/rwsem-spinlock.c
@@ -17,7 +17,7 @@ struct rwsem_waiter {
#define RWSEM_WAITING_FOR_WRITE 0x00000002
};
-int __rwsem_is_locked(struct rw_semaphore *sem)
+int rwsem_is_locked(struct rw_semaphore *sem)
{
int ret = 1;
unsigned long flags;
@@ -28,7 +28,7 @@ int __rwsem_is_locked(struct rw_semaphor
}
return ret;
}
-EXPORT_SYMBOL(__rwsem_is_locked);
+EXPORT_SYMBOL(rwsem_is_locked);
/*
* initialise the semaphore
_
next prev parent reply other threads:[~2009-10-15 23:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-14 9:52 [Patch v5] rwsem: fix rwsem_is_locked() bugs Amerigo Wang
2009-10-15 23:46 ` Andrew Morton [this message]
2009-10-16 1:28 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091015164602.ac75126f.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=amwang@redhat.com \
--cc=behlendorf1@llnl.gov \
--cc=bwoodard@llnl.gov \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox