diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2007-04-26 03:29:02 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-09 17:58:01 -0400 |
commit | 7a13e932281e7042a592f4f14db0b348199e7aac (patch) | |
tree | 474245a3ed19f26528fd8b1bdda946fa9cd751d7 /fs/nfs/dir.c | |
parent | fee7f23feaf0845fdfd47d20cddc75652552fbb8 (diff) |
NFS: Kill the obsolete NFS_PARANOIA
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 469cf66e1dc..3df42881655 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include "delegation.h" | 38 | #include "delegation.h" |
39 | #include "iostat.h" | 39 | #include "iostat.h" |
40 | 40 | ||
41 | #define NFS_PARANOIA 1 | ||
42 | /* #define NFS_DEBUG_VERBOSE 1 */ | 41 | /* #define NFS_DEBUG_VERBOSE 1 */ |
43 | 42 | ||
44 | static int nfs_opendir(struct inode *, struct file *); | 43 | static int nfs_opendir(struct inode *, struct file *); |
@@ -1362,11 +1361,6 @@ static int nfs_sillyrename(struct inode *dir, struct dentry *dentry) | |||
1362 | atomic_read(&dentry->d_count)); | 1361 | atomic_read(&dentry->d_count)); |
1363 | nfs_inc_stats(dir, NFSIOS_SILLYRENAME); | 1362 | nfs_inc_stats(dir, NFSIOS_SILLYRENAME); |
1364 | 1363 | ||
1365 | #ifdef NFS_PARANOIA | ||
1366 | if (!dentry->d_inode) | ||
1367 | printk("NFS: silly-renaming %s/%s, negative dentry??\n", | ||
1368 | dentry->d_parent->d_name.name, dentry->d_name.name); | ||
1369 | #endif | ||
1370 | /* | 1364 | /* |
1371 | * We don't allow a dentry to be silly-renamed twice. | 1365 | * We don't allow a dentry to be silly-renamed twice. |
1372 | */ | 1366 | */ |
@@ -1683,16 +1677,9 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
1683 | new_inode = NULL; | 1677 | new_inode = NULL; |
1684 | /* instantiate the replacement target */ | 1678 | /* instantiate the replacement target */ |
1685 | d_instantiate(new_dentry, NULL); | 1679 | d_instantiate(new_dentry, NULL); |
1686 | } else if (atomic_read(&new_dentry->d_count) > 1) { | 1680 | } else if (atomic_read(&new_dentry->d_count) > 1) |
1687 | /* dentry still busy? */ | 1681 | /* dentry still busy? */ |
1688 | #ifdef NFS_PARANOIA | ||
1689 | printk("nfs_rename: target %s/%s busy, d_count=%d\n", | ||
1690 | new_dentry->d_parent->d_name.name, | ||
1691 | new_dentry->d_name.name, | ||
1692 | atomic_read(&new_dentry->d_count)); | ||
1693 | #endif | ||
1694 | goto out; | 1682 | goto out; |
1695 | } | ||
1696 | } else | 1683 | } else |
1697 | drop_nlink(new_inode); | 1684 | drop_nlink(new_inode); |
1698 | 1685 | ||