On Tue, Sep 16, 2014 at 09:17:33AM +0400, Pavel Shilovsky wrote:
> 2014-09-15 23:26 GMT+04:00 Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>:
> > 3.14-stable review patch. If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: Pavel Shilovsky <pshilovsky@xxxxxxxxx>
> >
> > commit a07d322059db66b84c9eb4f98959df468e88b34b upstream.
> >
> > CIFS servers process nlink counts differently for files and directories.
> > In cifs_rename() if we the request fails on the existing target, we
> > try to remove it through cifs_unlink() but this is not what we want
> > to do for directories. As the result the following sequence of commands
> >
> > mkdir {1,2}; mv -T 1 2; rmdir {1,2}; mkdir {1,2}; echo foo > 2/bar
> >
> > and XFS test generic/023 fail with -ENOENT error. That's why the second
> > mkdir reuses the existing inode (target inode of the mv -T command) with
> > S_DEAD flag.
> >
> > Fix this by checking whether the target is directory or not and
> > calling cifs_rmdir() rather than cifs_unlink() for directories.
> >
> > Signed-off-by: Pavel Shilovsky <pshilovsky@xxxxxxxxx>
> > Signed-off-by: Steve French <smfrench@xxxxxxxxx>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> >
> > ---
> > fs/cifs/inode.c | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > --- a/fs/cifs/inode.c
> > +++ b/fs/cifs/inode.c
> > @@ -1706,7 +1706,10 @@ cifs_rename(struct inode *source_dir, st
> > unlink_target:
> > /* Try unlinking the target dentry if it's not negative */
> > if (target_dentry->d_inode && (rc == -EACCES || rc == -EEXIST)) {
> > - tmprc = cifs_unlink(target_dir, target_dentry);
> > + if (d_is_dir(target_dentry))
> > + tmprc = cifs_rmdir(target_dir, target_dentry);
> > + else
> > + tmprc = cifs_unlink(target_dir, target_dentry);
> > if (tmprc)
> > goto cifs_rename_exit;
> > rc = cifs_do_rename(xid, source_dentry, from_name,
> >
> >
>
> Does the next stable-3.14.y have d_is_dir()? v3.14.18 doesn't compile this one.
It does, look in the patch prior to this one in the queue.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html