diff options
author | Sage Weil <sage@newdream.net> | 2010-05-06 00:30:35 -0400 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-05-06 00:31:40 -0400 |
commit | 54ad023ba8108d0163acc931ed4b5e4a8a3a7327 (patch) | |
tree | 93edeaba0b8f851c9b5a18c6e42c92b2237480c5 /fs/ceph/osd_client.h | |
parent | 5dfc589a8467470226feccdc50f1b32713318e7b (diff) |
ceph: don't use writeback_control in writepages completion
The ->writepages writeback_control is not still valid in the writepages
completion. We were touching it solely to adjust pages_skipped when there
was a writeback error (EIO, ENOSPC, EPERM due to bad osd credentials),
causing an oops in the writeback code shortly thereafter. Updating
pages_skipped on error isn't correct anyway, so let's just rip out this
(clearly broken) code to pass the wbc to the completion.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/osd_client.h')
-rw-r--r-- | fs/ceph/osd_client.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ceph/osd_client.h b/fs/ceph/osd_client.h index b0759911e7c3..c5191d62f243 100644 --- a/fs/ceph/osd_client.h +++ b/fs/ceph/osd_client.h | |||
@@ -66,7 +66,6 @@ struct ceph_osd_request { | |||
66 | struct list_head r_unsafe_item; | 66 | struct list_head r_unsafe_item; |
67 | 67 | ||
68 | struct inode *r_inode; /* for use by callbacks */ | 68 | struct inode *r_inode; /* for use by callbacks */ |
69 | struct writeback_control *r_wbc; /* ditto */ | ||
70 | 69 | ||
71 | char r_oid[40]; /* object name */ | 70 | char r_oid[40]; /* object name */ |
72 | int r_oid_len; | 71 | int r_oid_len; |