mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 13:40:53 +07:00
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>
This commit is contained in:
parent
fee7f23fea
commit
7a13e93228
15
fs/nfs/dir.c
15
fs/nfs/dir.c
@ -38,7 +38,6 @@
|
||||
#include "delegation.h"
|
||||
#include "iostat.h"
|
||||
|
||||
#define NFS_PARANOIA 1
|
||||
/* #define NFS_DEBUG_VERBOSE 1 */
|
||||
|
||||
static int nfs_opendir(struct inode *, struct file *);
|
||||
@ -1362,11 +1361,6 @@ static int nfs_sillyrename(struct inode *dir, struct dentry *dentry)
|
||||
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.
|
||||
*/
|
||||
@ -1683,16 +1677,9 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||
new_inode = NULL;
|
||||
/* instantiate the replacement target */
|
||||
d_instantiate(new_dentry, NULL);
|
||||
} else if (atomic_read(&new_dentry->d_count) > 1) {
|
||||
} 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
|
||||
goto out;
|
||||
}
|
||||
} else
|
||||
drop_nlink(new_inode);
|
||||
|
||||
|
@ -41,7 +41,6 @@
|
||||
#include "internal.h"
|
||||
|
||||
#define NFSDBG_FACILITY NFSDBG_CLIENT
|
||||
#define NFS_PARANOIA 1
|
||||
|
||||
/*
|
||||
* get an NFS2/NFS3 root dentry from the root filehandle
|
||||
|
@ -48,7 +48,6 @@
|
||||
#include "internal.h"
|
||||
|
||||
#define NFSDBG_FACILITY NFSDBG_VFS
|
||||
#define NFS_PARANOIA 1
|
||||
|
||||
static void nfs_invalidate_inode(struct inode *);
|
||||
static int nfs_update_inode(struct inode *, struct nfs_fattr *);
|
||||
@ -1075,10 +1074,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
|
||||
/*
|
||||
* 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
|
||||
|
@ -26,7 +26,6 @@
|
||||
#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
|
||||
|
@ -20,8 +20,6 @@
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
#define NFS_PARANOIA 1
|
||||
|
||||
static struct kmem_cache *nfs_page_cachep;
|
||||
|
||||
static inline struct nfs_page *
|
||||
@ -167,11 +165,6 @@ nfs_release_request(struct nfs_page *req)
|
||||
if (!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);
|
||||
|
Loading…
Reference in New Issue
Block a user