diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-07-05 10:59:33 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-07-05 10:59:33 -0400 |
commit | 84d08fa888e7c2d53b5bbc764db2ef02968b499c (patch) | |
tree | fa891009d778586eefdf3be8a11671ab9aefb13a /fs/nfs | |
parent | 74b9272bbedf45cb01a048217830d64d59aaa73b (diff) |
helper for reading ->d_count
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/dir.c | 6 | ||||
-rw-r--r-- | fs/nfs/unlink.c | 2 |
2 files changed, 4 insertions, 4 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 */ |
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c index 1f1f38f0c5d5..60395ad3a2e4 100644 --- a/fs/nfs/unlink.c +++ b/fs/nfs/unlink.c | |||
@@ -479,7 +479,7 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry) | |||
479 | 479 | ||
480 | dfprintk(VFS, "NFS: silly-rename(%s/%s, ct=%d)\n", | 480 | dfprintk(VFS, "NFS: silly-rename(%s/%s, ct=%d)\n", |
481 | dentry->d_parent->d_name.name, dentry->d_name.name, | 481 | dentry->d_parent->d_name.name, dentry->d_name.name, |
482 | dentry->d_count); | 482 | d_count(dentry)); |
483 | nfs_inc_stats(dir, NFSIOS_SILLYRENAME); | 483 | nfs_inc_stats(dir, NFSIOS_SILLYRENAME); |
484 | 484 | ||
485 | /* | 485 | /* |