From e6d11e4dd53d161cdb7680e77c1f39ab762d4f43 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Fri, 23 Mar 2012 14:40:55 -0400
Subject: [PATCH] --- yaml --- r: 297972 b: refs/heads/master c:
 fe5f5d2e908957392aebbb852a6fb22885860d4b h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/cifs/cifsproto.h | 1 +
 trunk/fs/cifs/cifssmb.c   | 4 ++--
 trunk/fs/cifs/file.c      | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a698679cb12a..9e5162a51f4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da472fc847e9d8c9da69b09ce0ab975b24f9b894
+refs/heads/master: fe5f5d2e908957392aebbb852a6fb22885860d4b
diff --git a/trunk/fs/cifs/cifsproto.h b/trunk/fs/cifs/cifsproto.h
index 95ee5a64e0b0..9e68340c7306 100644
--- a/trunk/fs/cifs/cifsproto.h
+++ b/trunk/fs/cifs/cifsproto.h
@@ -487,6 +487,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/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c
index 76d8981736e1..61922142cf0d 100644
--- a/trunk/fs/cifs/cifssmb.c
+++ b/trunk/fs/cifs/cifssmb.c
@@ -2166,8 +2166,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/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index 159fcc56dc2d..5fedf6cb5a56 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/fs/cifs/file.c
@@ -1802,6 +1802,7 @@ static int cifs_writepages(struct address_space *mapping,
 				rc = -EBADF;
 				break;
 			}
+			wdata->pid = wdata->cfile->pid;
 			rc = cifs_async_writev(wdata);
 		} while (wbc->sync_mode == WB_SYNC_ALL && rc == -EAGAIN);