2013-07-03 20:23:04

by Waiman Long

Subject: [PATCH v3 22/25] ocfs2: Change how dentry's d_lock field is accessed

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 <[email protected]>
---
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

2013-07-03 22:34:37

by Joel Becker

Subject: Re: [PATCH v3 22/25] ocfs2: Change how dentry's d_lock field is accessed

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 <[email protected]>

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/
[email protected]