Skip to content

Commit

Permalink
cifs: add wrapper for cifs_async_readv to retry opening file
Browse files Browse the repository at this point in the history
We'll need this same bit of code for the uncached case.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
  • Loading branch information
Jeff Layton authored and Steve French committed May 17, 2012
1 parent 6993f74 commit 2a1bb13
Showing 1 changed file with 18 additions and 9 deletions.
27 changes: 18 additions & 9 deletions fs/cifs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -2366,6 +2366,23 @@ cifs_readdata_release(struct kref *refcount)
kfree(rdata);
}

static int
cifs_retry_async_readv(struct cifs_readdata *rdata)
{
int rc;

do {
if (rdata->cfile->invalidHandle) {
rc = cifs_reopen_file(rdata->cfile, true);
if (rc != 0)
continue;
}
rc = cifs_async_readv(rdata);
} while (rc == -EAGAIN);

return rc;
}

static ssize_t
cifs_iovec_read(struct file *file, const struct iovec *iov,
unsigned long nr_segs, loff_t *poffset)
Expand Down Expand Up @@ -2852,15 +2869,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,
rdata->marshal_iov = cifs_readpages_marshal_iov;
list_splice_init(&tmplist, &rdata->pages);

do {
if (open_file->invalidHandle) {
rc = cifs_reopen_file(open_file, true);
if (rc != 0)
continue;
}
rc = cifs_async_readv(rdata);
} while (rc == -EAGAIN);

rc = cifs_retry_async_readv(rdata);
if (rc != 0) {
list_for_each_entry_safe(page, tpage, &rdata->pages,
lru) {
Expand Down

0 comments on commit 2a1bb13

Please sign in to comment.