Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 (d0b6e0e3) · Commits · 戴 / test

fs/nfs/dir.c

+13 −24

Original line number	Diff line number	Diff line
		@@ -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 );
		@@ -650,12 +649,15 @@ int nfs_fsync_dir(struct file filp, struct dentry dentry, int datasync)
		*/
		static int nfs_check_verifier(struct inode dir, struct dentry dentry)
		{
		unsigned long verf;

		if (IS_ROOT(dentry))
		return 1;
		if ((NFS_I(dir)->cache_validity & NFS_INO_INVALID_ATTR) != 0
		\|\| nfs_attribute_timeout(dir))
		verf = (unsigned long)dentry->d_fsdata;
		if (nfs_caches_unstable(dir)
		\|\| verf != NFS_I(dir)->cache_change_attribute)
		return 0;
		return nfs_verify_change_attribute(dir, (unsigned long)dentry->d_fsdata);
		return 1;
		}

		static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
		@@ -665,7 +667,6 @@ static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)

		static void nfs_refresh_verifier(struct dentry * dentry, unsigned long verf)
		{
		if (time_after(verf, (unsigned long)dentry->d_fsdata))
		nfs_set_verifier(dentry, verf);
		}

		@@ -765,6 +766,10 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
		nfs_inc_stats(dir, NFSIOS_DENTRYREVALIDATE);
		inode = dentry->d_inode;

		/* Revalidate parent directory attribute cache */
		if (nfs_revalidate_inode(NFS_SERVER(dir), dir) < 0)
		goto out_zap_parent;

		if (!inode) {
		if (nfs_neg_need_reval(dir, dentry, nd))
		goto out_bad;
		@@ -778,10 +783,6 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
		goto out_bad;
		}

		/* Revalidate parent directory attribute cache */
		if (nfs_revalidate_inode(NFS_SERVER(dir), dir) < 0)
		goto out_zap_parent;

		/* Force a full look up iff the parent directory has changed */
		if (nfs_check_verifier(dir, dentry)) {
		if (nfs_lookup_verify_inode(inode, nd))
		@@ -1360,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.
		*/
		@@ -1681,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);

fs/nfs/getroot.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

fs/nfs/idmap.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -272,7 +272,7 @@ nfs_idmap_id(struct idmap idmap, struct idmap_hashtable h,
		set_current_state(TASK_UNINTERRUPTIBLE);
		mutex_unlock(&idmap->idmap_im_lock);
		schedule();
		current->state = TASK_RUNNING;
		__set_current_state(TASK_RUNNING);
		remove_wait_queue(&idmap->idmap_wq, &wq);
		mutex_lock(&idmap->idmap_im_lock);

		@@ -333,7 +333,7 @@ nfs_idmap_name(struct idmap idmap, struct idmap_hashtable h,
		set_current_state(TASK_UNINTERRUPTIBLE);
		mutex_unlock(&idmap->idmap_im_lock);
		schedule();
		current->state = TASK_RUNNING;
		__set_current_state(TASK_RUNNING);
		remove_wait_queue(&idmap->idmap_wq, &wq);
		mutex_lock(&idmap->idmap_im_lock);

fs/nfs/inode.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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

fs/nfs/nfs2xdr.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message