On Wed, 09 Jan 2013 09:42:07 -0800
<gre...@linuxfoundation.org> wrote:
>
> The patch below does not apply to the 3.7-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
>
> thanks,
>
> greg k-h
>
I think the best thing would be to just pull in eb1b3fa5cdb9c2 as a
prerequisite. Should I resend this patch with a Cc: stable line that
has those prereqs in it?
> ------------------ original commit in Linus's tree ------------------
>
> From 2f2591a34db6c9361faa316c91a6e320cb4e6aee Mon Sep 17 00:00:00 2001
> From: Jeff Layton <jlay...@redhat.com>
> Date: Tue, 18 Dec 2012 06:35:10 -0500
> Subject: [PATCH] cifs: don't compare uniqueids in cifs_prime_dcache unless
> server inode numbers are in use
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> Oliver reported that commit cd60042c 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.moessin...@ichaus.de>
> Signed-off-by: Jeff Layton <jlay...@redhat.com>
> Signed-off-by: Steve French <sfre...@us.ibm.com>
>
> diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
> index 6002fdc..cdd6ff4 100644
> --- a/fs/cifs/readdir.c
> +++ b/fs/cifs/readdir.c
> @@ -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,10 +92,20 @@ cifs_prime_dcache(struct dentry *parent, struct qstr
> *name,
> int err;
>
> inode = dentry->d_inode;
> - /* update inode in place if i_ino didn't change */
> - if (inode && CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {
> - cifs_fattr_to_inode(inode, fattr);
> - goto out;
> + 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 (CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {
> + cifs_fattr_to_inode(inode, fattr);
> + goto out;
> + }
> }
> err = d_invalidate(dentry);
> dput(dentry);
>
--
Jeff Layton <jlay...@redhat.com>
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
