cifs: don't compare uniqueids in cifs_prime_dcache unless server inode numbers are in use (2f2591a3) · Commits · 戴 / test

Oliver reported that commit caused his cifs mounts to continually thrash through new inodes on readdir. His servers are not sending inode numbers (or he's not using them), and the new test in that function doesn't account for that sort of setup correctly. If we're not using server inode numbers, then assume that the inode attached to the dentry hasn't changed. Go ahead and update the attributes in place, but keep the same inode number. Cc: <stable@vger.kernel.org> # v3.5+ Reported-and-Tested-by:

Oliver MÃ¶ssinger <Oliver.Moessinger@ichaus.de> Signed-off-by:

Jeff Layton <jlayton@redhat.com> Signed-off-by:

Steve French <sfrench@us.ibm.com>

fs/cifs/readdir.c

+15 −4

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ cifs_prime_dcache(struct dentry parent, struct qstr name,
		struct dentry dentry, alias;
		struct inode *inode;
		struct super_block *sb = parent->d_inode->i_sb;
		struct cifs_sb_info *cifs_sb = CIFS_SB(sb);

		cFYI(1, "%s: for %s", __func__, name->name);

		@@ -91,11 +92,21 @@ cifs_prime_dcache(struct dentry parent, struct qstr name,
		int err;

		inode = dentry->d_inode;
		if (inode) {
		/*
		* If we're generating inode numbers, then we don't
		* want to clobber the existing one with the one that
		* the readdir code created.
		*/
		if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM))
		fattr->cf_uniqueid = CIFS_I(inode)->uniqueid;

		/* update inode in place if i_ino didn't change */
		if (inode && CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {
		if (CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {
		cifs_fattr_to_inode(inode, fattr);
		goto out;
		}
		}
		err = d_invalidate(dentry);
		dput(dentry);
		if (err)

Admin message