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]>
---
 net/sunrpc/rpc_pipe.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index e7ce4b3..58bc128 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -427,14 +427,14 @@ rpc_info_open(struct inode *inode, struct file *file)
        if (!ret) {
                struct seq_file *m = file->private_data;
 
-               spin_lock(&file->f_path.dentry->d_lock);
+               d_lock(file->f_path.dentry);
                if (!d_unhashed(file->f_path.dentry))
                        clnt = RPC_I(inode)->private;
                if (clnt != NULL && atomic_inc_not_zero(&clnt->cl_count)) {
-                       spin_unlock(&file->f_path.dentry->d_lock);
+                       d_unlock(file->f_path.dentry);
                        m->private = clnt;
                } else {
-                       spin_unlock(&file->f_path.dentry->d_lock);
+                       d_unlock(file->f_path.dentry);
                        single_release(inode, file);
                        ret = -EINVAL;
                }
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to