diff options
| author | Jeff Layton <jlayton@redhat.com> | 2013-03-04 21:18:25 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2013-03-07 02:03:57 +0100 |
| commit | 94e18007688a13e5da1a2f1b7f52f15cc56c9f5e (patch) | |
| tree | f01a05a61a19dc40599d2692226b6ddfb3e2ee76 /fs/cifs | |
| parent | cifs: remove the sockopt= mount option (diff) | |
| download | linux-94e18007688a13e5da1a2f1b7f52f15cc56c9f5e.tar.xz linux-94e18007688a13e5da1a2f1b7f52f15cc56c9f5e.zip | |
cifs: don't try to unlock pagecache page after releasing it
We had a recent fix to fix the release of pagecache pages when
cifs_writev_requeue writes fail. Unfortunately, it releases the page
before trying to unlock it. At that point, the page might be gone by the
time the unlock comes in.
Unlock the page first before checking the value of "rc", and only then
end writeback and release the pages. The page lock isn't required for
any of those operations so this should be safe.
Reported-by: Anton Altaparmakov <aia21@cam.ac.uk>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/cifssmb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 7353bc5d73d7..8e2e799e7a24 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -1909,12 +1909,12 @@ cifs_writev_requeue(struct cifs_writedata *wdata) } while (rc == -EAGAIN); for (i = 0; i < wdata->nr_pages; i++) { + unlock_page(wdata->pages[i]); if (rc != 0) { SetPageError(wdata->pages[i]); end_page_writeback(wdata->pages[i]); page_cache_release(wdata->pages[i]); } - unlock_page(wdata->pages[i]); } mapping_set_error(inode->i_mapping, rc); |