aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r--fs/nfs/dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 9184c7c80f78..12de824edb5c 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1720,7 +1720,7 @@ static int nfs_unlink(struct inode *dir, struct dentry *dentry)
1720 1720
1721 spin_lock(&dcache_lock); 1721 spin_lock(&dcache_lock);
1722 spin_lock(&dentry->d_lock); 1722 spin_lock(&dentry->d_lock);
1723 if (atomic_read(&dentry->d_count) > 1) { 1723 if (dentry->d_count > 1) {
1724 spin_unlock(&dentry->d_lock); 1724 spin_unlock(&dentry->d_lock);
1725 spin_unlock(&dcache_lock); 1725 spin_unlock(&dcache_lock);
1726 /* Start asynchronous writeout of the inode */ 1726 /* Start asynchronous writeout of the inode */
@@ -1868,7 +1868,7 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1868 dfprintk(VFS, "NFS: rename(%s/%s -> %s/%s, ct=%d)\n", 1868 dfprintk(VFS, "NFS: rename(%s/%s -> %s/%s, ct=%d)\n",
1869 old_dentry->d_parent->d_name.name, old_dentry->d_name.name, 1869 old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
1870 new_dentry->d_parent->d_name.name, new_dentry->d_name.name, 1870 new_dentry->d_parent->d_name.name, new_dentry->d_name.name,
1871 atomic_read(&new_dentry->d_count)); 1871 new_dentry->d_count);
1872 1872
1873 /* 1873 /*
1874 * For non-directories, check whether the target is busy and if so, 1874 * For non-directories, check whether the target is busy and if so,
@@ -1886,7 +1886,7 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1886 rehash = new_dentry; 1886 rehash = new_dentry;
1887 } 1887 }
1888 1888
1889 if (atomic_read(&new_dentry->d_count) > 2) { 1889 if (new_dentry->d_count > 2) {
1890 int err; 1890 int err;
1891 1891
1892 /* copy the target dentry's name */ 1892 /* copy the target dentry's name */