diff options
author | Ouyang Maochun <[email protected]> | 2013-02-18 09:54:52 -0600 |
---|---|---|
committer | Steve French <[email protected]> | 2013-02-28 09:01:47 -0600 |
commit | c51bb0ea40ca038da26b1fa7d450f4078124af03 (patch) | |
tree | bf3f85dbf6263612dbdea9676670d75777a9d895 | |
parent | 0b7bc84000d71f3647ca33ab1bf5bd928535c846 (diff) |
cifs: bugfix for unreclaimed writeback pages in cifs_writev_requeue()
Pages get the PG_writeback flag set before cifs sends its
request to SMB server in cifs_writepages(), if the SMB service
goes down, cifs may try to recommit the writing requests in
cifs_writev_requeue(). However, it does not clean its PG_writeback
flag and relaimed the pages even if it fails again in
cifs_writev_requeue(), which may lead to the hanging of the
processes accessing the cifs directory. This patch just cleans
the PG_writeback flags and reclaims the pages under that circumstances.
Steps to reproduce the bug(trying serveral times may trigger the issue):
1.Write from cifs client continuously.(e.g dd if=/dev/zero of=<cifs file>)
2.Stop SMB service from server.(e.g service smb stop)
3.Wait for two minutes, and then start SMB service from
server.(e.g service smb start)
4.The processes which are accessing cifs directory may hang up.
Signed-off-by: Ouyang Maochun <[email protected]>
Signed-off-by: Jiang Yong <[email protected]>
Tested-by: Zhang Xianwei <[email protected]>
Reviewed-by: Wang Liang <[email protected]>
Reviewed-by: Cai Qu <[email protected]>
Reviewed-by: Jiang Biao <[email protected]>
Reviewed-by: Jeff Layton <[email protected]>
Reviewed-by: Pavel Shilovsky <[email protected]>
Signed-off-by: Steve French <[email protected]>
-rw-r--r-- | fs/cifs/cifssmb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 00e12f2d626b..7353bc5d73d7 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -1909,8 +1909,11 @@ cifs_writev_requeue(struct cifs_writedata *wdata) } while (rc == -EAGAIN); for (i = 0; i < wdata->nr_pages; i++) { - if (rc != 0) + if (rc != 0) { SetPageError(wdata->pages[i]); + end_page_writeback(wdata->pages[i]); + page_cache_release(wdata->pages[i]); + } unlock_page(wdata->pages[i]); } |