* [PATCH v3 22/25] ocfs2: Change how dentry's d_lock field is accessed
@ 2013-07-03 20:22 Waiman Long
2013-07-03 22:34 ` Joel Becker
0 siblings, 1 reply; 3+ messages in thread
From: Waiman Long @ 2013-07-03 20:22 UTC (permalink / raw)
To: Alexander Viro, Jeff Layton, Miklos Szeredi, Ingo Molnar,
Thomas Gleixner
Cc: Mark Fasheh, Joel Becker, ocfs2-devel, Waiman Long, linux-fsdevel,
linux-kernel, Peter Zijlstra, Steven Rostedt, Linus Torvalds,
Benjamin Herrenschmidt, Andi Kleen, Chandramouleeswaran, Aswin,
Norton, Scott J
Because of the changes made in dcache.h header file, files that
use the d_lock field of the dentry structure need to be changed
accordingly. All the d_lock's spin_lock() and spin_unlock() calls
are replaced by the corresponding d_lock() and d_unlock() calls.
There is no change in logic and everything should just work.
Signed-off-by: Waiman Long <Waiman.Long@hp.com>
---
fs/ocfs2/dcache.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index ef99972..4f72906 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -173,17 +173,17 @@ struct dentry *ocfs2_find_local_alias(struct inode *inode,
spin_lock(&inode->i_lock);
hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
- spin_lock(&dentry->d_lock);
+ d_lock(dentry);
if (ocfs2_match_dentry(dentry, parent_blkno, skip_unhashed)) {
trace_ocfs2_find_local_alias(dentry->d_name.len,
dentry->d_name.name);
dget_dlock(dentry);
- spin_unlock(&dentry->d_lock);
+ d_unlock(dentry);
spin_unlock(&inode->i_lock);
return dentry;
}
- spin_unlock(&dentry->d_lock);
+ d_unlock(dentry);
}
spin_unlock(&inode->i_lock);
return NULL;
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v3 22/25] ocfs2: Change how dentry's d_lock field is accessed
2013-07-03 20:22 [PATCH v3 22/25] ocfs2: Change how dentry's d_lock field is accessed Waiman Long
@ 2013-07-03 22:34 ` Joel Becker
0 siblings, 0 replies; 3+ messages in thread
From: Joel Becker @ 2013-07-03 22:34 UTC (permalink / raw)
To: Waiman Long
Cc: Alexander Viro, Jeff Layton, Miklos Szeredi, Ingo Molnar,
Thomas Gleixner, Mark Fasheh, ocfs2-devel, linux-fsdevel,
linux-kernel, Peter Zijlstra, Steven Rostedt, Linus Torvalds,
Benjamin Herrenschmidt, Andi Kleen, Chandramouleeswaran, Aswin,
Norton, Scott J
On Wed, Jul 03, 2013 at 04:22:02PM -0400, Waiman Long wrote:
> Because of the changes made in dcache.h header file, files that
> use the d_lock field of the dentry structure need to be changed
> accordingly. All the d_lock's spin_lock() and spin_unlock() calls
> are replaced by the corresponding d_lock() and d_unlock() calls.
> There is no change in logic and everything should just work.
>
> Signed-off-by: Waiman Long <Waiman.Long@hp.com>
This looks reasonable, but I'll wait for the followup from Linus' review.
Joel
> ---
> fs/ocfs2/dcache.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
> index ef99972..4f72906 100644
> --- a/fs/ocfs2/dcache.c
> +++ b/fs/ocfs2/dcache.c
> @@ -173,17 +173,17 @@ struct dentry *ocfs2_find_local_alias(struct inode *inode,
>
> spin_lock(&inode->i_lock);
> hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
> - spin_lock(&dentry->d_lock);
> + d_lock(dentry);
> if (ocfs2_match_dentry(dentry, parent_blkno, skip_unhashed)) {
> trace_ocfs2_find_local_alias(dentry->d_name.len,
> dentry->d_name.name);
>
> dget_dlock(dentry);
> - spin_unlock(&dentry->d_lock);
> + d_unlock(dentry);
> spin_unlock(&inode->i_lock);
> return dentry;
> }
> - spin_unlock(&dentry->d_lock);
> + d_unlock(dentry);
> }
> spin_unlock(&inode->i_lock);
> return NULL;
> --
> 1.7.1
>
--
"Where are my angels?
Where's my golden one?
And where is my hope
Now that my heroes are gone?"
http://www.jlbec.org/
jlbec@evilplan.org
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v3 22/25] ocfs2: Change how dentry's d_lock field is accessed
@ 2013-07-03 20:22 Waiman Long
0 siblings, 0 replies; 3+ messages in thread
From: Waiman Long @ 2013-07-03 20:22 UTC (permalink / raw)
To: Alexander Viro, Jeff Layton, Miklos Szeredi, Ingo Molnar,
Thomas Gleixner
Cc: Waiman Long, Peter Zijlstra, Mark Fasheh, linux-kernel,
Steven Rostedt, Chandramouleeswaran, Aswin, Norton, Scott J,
Andi Kleen, Benjamin Herrenschmidt, linux-fsdevel, Linus Torvalds,
ocfs2-devel
Because of the changes made in dcache.h header file, files that
use the d_lock field of the dentry structure need to be changed
accordingly. All the d_lock's spin_lock() and spin_unlock() calls
are replaced by the corresponding d_lock() and d_unlock() calls.
There is no change in logic and everything should just work.
Signed-off-by: Waiman Long <Waiman.Long@hp.com>
---
fs/ocfs2/dcache.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index ef99972..4f72906 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -173,17 +173,17 @@ struct dentry *ocfs2_find_local_alias(struct inode *inode,
spin_lock(&inode->i_lock);
hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
- spin_lock(&dentry->d_lock);
+ d_lock(dentry);
if (ocfs2_match_dentry(dentry, parent_blkno, skip_unhashed)) {
trace_ocfs2_find_local_alias(dentry->d_name.len,
dentry->d_name.name);
dget_dlock(dentry);
- spin_unlock(&dentry->d_lock);
+ d_unlock(dentry);
spin_unlock(&inode->i_lock);
return dentry;
}
- spin_unlock(&dentry->d_lock);
+ d_unlock(dentry);
}
spin_unlock(&inode->i_lock);
return NULL;
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-03 22:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-03 20:22 [PATCH v3 22/25] ocfs2: Change how dentry's d_lock field is accessed Waiman Long
2013-07-03 22:34 ` Joel Becker
-- strict thread matches above, loose matches on Subject: below --
2013-07-03 20:22 Waiman Long
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).