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@xxxxxx>
---
fs/cifs/dir.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 5699b50..51d9f7e 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -115,10 +115,10 @@ cifs_bp_rename_retry:
full_path[namelen] = 0; /* trailing null */
rcu_read_lock();
for (temp = direntry; !IS_ROOT(temp);) {
- spin_lock(&temp->d_lock);
+ d_lock(temp);
namelen -= 1 + temp->d_name.len;
if (namelen < 0) {
- spin_unlock(&temp->d_lock);
+ d_unlock(temp);
break;
} else {
full_path[namelen] = dirsep;
@@ -126,7 +126,7 @@ cifs_bp_rename_retry:
temp->d_name.len);
cifs_dbg(FYI, "name: %s\n", full_path + namelen);
}
- spin_unlock(&temp->d_lock);
+ d_unlock(temp);
temp = temp->d_parent;
if (temp == NULL) {
cifs_dbg(VFS, "corrupt dentry\n");
@@ -777,9 +777,9 @@ cifs_d_revalidate(struct dentry *direntry, unsigned int flags)
*/
if (IS_AUTOMOUNT(direntry->d_inode) &&
!(direntry->d_flags & DCACHE_NEED_AUTOMOUNT)) {
- spin_lock(&direntry->d_lock);
+ d_lock(direntry);
direntry->d_flags |= DCACHE_NEED_AUTOMOUNT;
- spin_unlock(&direntry->d_lock);
+ d_unlock(direntry);
}
return 1;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
