merged into cifs-2.6.git for-next On Tue, Aug 26, 2014 at 10:04 AM, Pavel Shilovsky <pshilovsky@xxxxxxxxx> wrote: > The existing code calls server->ops->close() that is not > right. This causes XFS test generic/310 to fail. Fix this > by using server->ops->closedir() function. > > Cc: <stable@xxxxxxxxxxxxxxx> # v3.7+ > Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> > Signed-off-by: Pavel Shilovsky <pshilovsky@xxxxxxxxx> > --- > fs/cifs/readdir.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c > index 798c80a..b334a89 100644 > --- a/fs/cifs/readdir.c > +++ b/fs/cifs/readdir.c > @@ -596,8 +596,8 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos, > if (server->ops->dir_needs_close(cfile)) { > cfile->invalidHandle = true; > spin_unlock(&cifs_file_list_lock); > - if (server->ops->close) > - server->ops->close(xid, tcon, &cfile->fid); > + if (server->ops->close_dir) > + server->ops->close_dir(xid, tcon, &cfile->fid); > } else > spin_unlock(&cifs_file_list_lock); > if (cfile->srch_inf.ntwrk_buf_start) { > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-cifs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Thanks, Steve -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html