2012/2/3 Jeff Layton <jlayton@xxxxxxxxxx>:
> We'll need this to handle rwpidforward option correctly when we use
> async writes in the aio_write op.
>
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> ---
> fs/cifs/cifsproto.h | 1 +
> fs/cifs/cifssmb.c | 4 ++--
> fs/cifs/file.c | 1 +
> 3 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
> index a81549d..2778605 100644
> --- a/fs/cifs/cifsproto.h
> +++ b/fs/cifs/cifsproto.h
> @@ -477,6 +477,7 @@ struct cifs_writedata {
> struct work_struct work;
> struct cifsFileInfo *cfile;
> __u64 offset;
> + pid_t pid;
> unsigned int bytes;
> int result;
> unsigned int nr_pages;
> diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
> index cf12c0c..9525ae3 100644
> --- a/fs/cifs/cifssmb.c
> +++ b/fs/cifs/cifssmb.c
> @@ -2122,8 +2122,8 @@ cifs_async_writev(struct cifs_writedata *wdata)
> goto async_writev_out;
> }
>
> - smb->hdr.Pid = cpu_to_le16((__u16)wdata->cfile->pid);
> - smb->hdr.PidHigh = cpu_to_le16((__u16)(wdata->cfile->pid >> 16));
> + smb->hdr.Pid = cpu_to_le16((__u16)wdata->pid);
> + smb->hdr.PidHigh = cpu_to_le16((__u16)(wdata->pid >> 16));
>
> smb->AndXCommand = 0xFF; /* none */
> smb->Fid = wdata->cfile->netfid;
> diff --git a/fs/cifs/file.c b/fs/cifs/file.c
> index 4dd9283..ffbb2b4 100644
> --- a/fs/cifs/file.c
> +++ b/fs/cifs/file.c
> @@ -1758,6 +1758,7 @@ retry:
> rc = -EBADF;
> break;
> }
> + wdata->pid = wdata->cfile->pid;
> rc = cifs_async_writev(wdata);
> } while (wbc->sync_mode == WB_SYNC_ALL && rc == -EAGAIN);
>
> --
> 1.7.7.6
>
Looks good.
Reviewed-by: Pavel Shilovsky <piastry@xxxxxxxxxxx>
--
Best regards,
Pavel Shilovsky.
--
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
