NFS: Kill the obsolete NFS_PARANOIA
PATCH 1/1 NFS: Kill the obsolete NFS_PARANOIA
Linus,
This patch has been both compile and run-time tested. It has been in -mm for quite a while without problems. Trond & Andrew have both signed off on it.
Please apply.
Remove obsolete NFS_PARANOIA.
Signed-off-by Jesper Juhl <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Acked-by Trond Myklebust <[email protected]>
---
fs/nfs/dir.c | 17 ++--------------- fs/nfs/getroot.c | 1 - fs/nfs/inode.c | 3 --- fs/nfs/nfs2xdr.c | 1 - fs/nfs/pagelist.c | 7 ------- 5 files changed, 2 insertions(+), 27 deletions(-)
fs/nfs/dir.c +2 -15
@@ -38,7 +38,6 @@ #include "nfs4_fs.h"#include "delegation.h" #include "iostat.h" -#define NFS_PARANOIA 1/* #define NFS_DEBUG_VERBOSE 1 */ static int nfs_opendir (struct inode *,struct file *);
@@ -1322,11 +1321,6 @@ static int nfs_sillyrename(struct inode atomic_read(&dentry->d_count));nfs_inc_stats (dir,NFSIOS_SILLYRENAME ); -#ifdef NFS_PARANOIA -if (!dentry->d_inode) -printk ("NFS: silly-renaming %s/%s, negative dentry??\n" , -dentry->d_parent->d_name.name, dentry->d_name.name); -#endif /* * We don't allow a dentry to be silly-renamed twice. */
@@ -1641,16 +1635,9 @@ static int nfs_rename(struct inode *old_ new_inode =NULL ;/* instantiate the replacement target */ d_instantiate (new_dentry,NULL ); - }else if (atomic_read (&new_dentry->d_count) >1 ) { -/* dentry still busy? */ -#ifdef NFS_PARANOIA -printk ("nfs_rename: target %s/%s busy, d_count=%d\n" , - new_dentry->d_parent->d_name.name, - new_dentry->d_name.name, -atomic_read (&new_dentry->d_count)); -#endif + }else if (atomic_read (&new_dentry->d_count) >1 ) +/* dentry still busy? */ goto out; - } }else drop_nlink (new_inode);
fs/nfs/getroot.c +0 -1
@@ -42,7 +42,6 @@ #include "delegation.h"#include "internal.h" #define NFSDBG_FACILITY NFSDBG_CLIENT -#define NFS_PARANOIA 1/* * get an NFS2/NFS3 root dentry from the root filehandle
fs/nfs/inode.c +0 -3
@@ -48,7 +48,6 @@ #include "iostat.h"#include "internal.h" #define NFSDBG_FACILITY NFSDBG_VFS -#define NFS_PARANOIA 1static void nfs_invalidate_inode (struct inode *);static int nfs_update_inode (struct inode *,struct nfs_fattr *);
@@ -1022,10 +1021,8 @@ static int nfs_update_inode(struct inode/* * Big trouble! The inode has become a different object. */ -#ifdef NFS_PARANOIA printk (KERN_DEBUG "%s: inode %ld mode changed, %07o to %07o\n" , __FUNCTION__, inode->i_ino, inode->i_mode, fattr->mode); -#endif out_err:/* * No need to worry about unhashing the dentry, as the
fs/nfs/nfs2xdr.c +0 -1
@@ -26,7 +26,6 @@ #include <linux/nfs_fs.h>#include "internal.h" #define NFSDBG_FACILITY NFSDBG_XDR -/* #define NFS_PARANOIA 1 */ /* Mapping from NFS error code to "errno" error code. */ #define errno_NFSERR_IO EIO
fs/nfs/pagelist.c +0 -7
@@ -19,8 +19,6 @@ #include <linux/nfs_fs.h>#include <linux/nfs_mount.h> #include <linux/writeback.h> -#define NFS_PARANOIA 1 -static struct kmem_cache *nfs_page_cachep; static inline struct nfs_page *
@@ -172,11 +170,6 @@ nfs_release_request(struct nfs_page *reqif (!atomic_dec_and_test (&req->wb_count))return ; -#ifdef NFS_PARANOIA -BUG_ON (!list_empty (&req->wb_list)); -BUG_ON (NFS_WBACK_BUSY (req)); -#endif -/* Release struct file or cached credential */ nfs_clear_request (req);put_nfs_open_context (req->wb_context);