| Message ID | 1498690555-8454-1-git-send-email-longli@exchange.microsoft.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
merged into cifs-2.6.git for-next On Wed, Jun 28, 2017 at 5:55 PM, Long Li <longli@exchange.microsoft.com> wrote: > From: Long Li <longli@microsoft.com> > > In cifs_call_async, server may respond as soon as I/O is submitted. Because > mid entry is freed on the return path, it should not be modified after I/O > is submitted. > > cifs_save_when_sent modifies the sent timestamp in mid entry, and should not > be called after I/O. Call it before I/O. > > Signed-off-by: Long Li <longli@microsoft.com> > Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> > --- > fs/cifs/transport.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c > index 47a125e..7efbab0 100644 > --- a/fs/cifs/transport.c > +++ b/fs/cifs/transport.c > @@ -536,11 +536,14 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst, > list_add_tail(&mid->qhead, &server->pending_mid_q); > spin_unlock(&GlobalMid_Lock); > > - > + /* > + * Need to store the time in mid before calling I/O. For call_async, > + * I/O response may come back and free the mid entry on another thread. > + */ > + cifs_save_when_sent(mid); > cifs_in_send_inc(server); > rc = smb_send_rqst(server, rqst, flags); > cifs_in_send_dec(server); > - cifs_save_when_sent(mid); > > if (rc < 0) { > server->sequence_number -= 2; > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-cifs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 47a125e..7efbab0 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -536,11 +536,14 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst, list_add_tail(&mid->qhead, &server->pending_mid_q); spin_unlock(&GlobalMid_Lock); - + /* + * Need to store the time in mid before calling I/O. For call_async, + * I/O response may come back and free the mid entry on another thread. + */ + cifs_save_when_sent(mid); cifs_in_send_inc(server); rc = smb_send_rqst(server, rqst, flags); cifs_in_send_dec(server); - cifs_save_when_sent(mid); if (rc < 0) { server->sequence_number -= 2;