diff options
author | Ilya Dryomov <idryomov@gmail.com> | 2018-05-30 10:29:14 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2018-06-04 14:46:00 -0400 |
commit | c843d13caefad9f2f182f38d6bfe492c9f00e086 (patch) | |
tree | 7e8c0e4e299aab12bc529379f0db84ef09d4cee7 /include/linux/ceph | |
parent | 690f951d7eb8c0529f8a367a3db9cfbfde624db4 (diff) |
libceph: make abort_on_full a per-osdc setting
The intent behind making it a per-request setting was that it would be
set for writes, but not for reads. As it is, the flag is set for all
fs/ceph requests except for pool perm check stat request (technically
a read).
ceph_osdc_abort_on_full() skips reads since the previous commit and
I don't see a use case for marking individual requests.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Diffstat (limited to 'include/linux/ceph')
-rw-r--r-- | include/linux/ceph/osd_client.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index d4191bde95a4..0d6ee04b4c41 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h | |||
@@ -202,7 +202,6 @@ struct ceph_osd_request { | |||
202 | struct timespec r_mtime; /* ditto */ | 202 | struct timespec r_mtime; /* ditto */ |
203 | u64 r_data_offset; /* ditto */ | 203 | u64 r_data_offset; /* ditto */ |
204 | bool r_linger; /* don't resend on failure */ | 204 | bool r_linger; /* don't resend on failure */ |
205 | bool r_abort_on_full; /* return ENOSPC when full */ | ||
206 | 205 | ||
207 | /* internal */ | 206 | /* internal */ |
208 | unsigned long r_stamp; /* jiffies, send or check time */ | 207 | unsigned long r_stamp; /* jiffies, send or check time */ |
@@ -348,6 +347,7 @@ struct ceph_osd_client { | |||
348 | struct rb_root linger_map_checks; | 347 | struct rb_root linger_map_checks; |
349 | atomic_t num_requests; | 348 | atomic_t num_requests; |
350 | atomic_t num_homeless; | 349 | atomic_t num_homeless; |
350 | bool abort_on_full; /* abort w/ ENOSPC when full */ | ||
351 | int abort_err; | 351 | int abort_err; |
352 | struct delayed_work timeout_work; | 352 | struct delayed_work timeout_work; |
353 | struct delayed_work osds_timeout_work; | 353 | struct delayed_work osds_timeout_work; |