diff options
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index d7ed697133f0..c933bdfbcb1f 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -1721,7 +1721,7 @@ int nfs_unlink(struct inode *dir, struct dentry *dentry) | |||
1721 | dir->i_ino, dentry->d_name.name); | 1721 | dir->i_ino, dentry->d_name.name); |
1722 | 1722 | ||
1723 | spin_lock(&dentry->d_lock); | 1723 | spin_lock(&dentry->d_lock); |
1724 | if (dentry->d_count > 1) { | 1724 | if (d_count(dentry) > 1) { |
1725 | spin_unlock(&dentry->d_lock); | 1725 | spin_unlock(&dentry->d_lock); |
1726 | /* Start asynchronous writeout of the inode */ | 1726 | /* Start asynchronous writeout of the inode */ |
1727 | write_inode_now(dentry->d_inode, 0); | 1727 | write_inode_now(dentry->d_inode, 0); |
@@ -1866,7 +1866,7 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
1866 | dfprintk(VFS, "NFS: rename(%s/%s -> %s/%s, ct=%d)\n", | 1866 | dfprintk(VFS, "NFS: rename(%s/%s -> %s/%s, ct=%d)\n", |
1867 | old_dentry->d_parent->d_name.name, old_dentry->d_name.name, | 1867 | old_dentry->d_parent->d_name.name, old_dentry->d_name.name, |
1868 | new_dentry->d_parent->d_name.name, new_dentry->d_name.name, | 1868 | new_dentry->d_parent->d_name.name, new_dentry->d_name.name, |
1869 | new_dentry->d_count); | 1869 | d_count(new_dentry)); |
1870 | 1870 | ||
1871 | /* | 1871 | /* |
1872 | * For non-directories, check whether the target is busy and if so, | 1872 | * For non-directories, check whether the target is busy and if so, |
@@ -1884,7 +1884,7 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
1884 | rehash = new_dentry; | 1884 | rehash = new_dentry; |
1885 | } | 1885 | } |
1886 | 1886 | ||
1887 | if (new_dentry->d_count > 2) { | 1887 | if (d_count(new_dentry) > 2) { |
1888 | int err; | 1888 | int err; |
1889 | 1889 | ||
1890 | /* copy the target dentry's name */ | 1890 | /* copy the target dentry's name */ |