diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-10-05 13:22:15 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-10-05 13:22:20 -0300 |
| commit | d0ee47da9a09d4e55bf0a76747667c9dd0875506 (patch) | |
| tree | bda46068cb16b108fa229b23ce585088358b7ea3 /block | |
| parent | 6bc02055c373a850394a7846b2155066ab1f8de2 (diff) | |
| parent | 7217df81279835a7aee62a07aabb7b8fb8c766f2 (diff) | |
Merge tag 'v5.15.60' into 5.15-2.1.x-imx
This is the 5.15.60 stable release
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-ioc.c | 1 | ||||
| -rw-r--r-- | block/ioprio.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/block/blk-ioc.c b/block/blk-ioc.c index 57299f860d41..90c05971f71e 100644 --- a/block/blk-ioc.c +++ b/block/blk-ioc.c @@ -265,6 +265,7 @@ int create_task_io_context(struct task_struct *task, gfp_t gfp_flags, int node) INIT_RADIX_TREE(&ioc->icq_tree, GFP_ATOMIC); INIT_HLIST_HEAD(&ioc->icq_list); INIT_WORK(&ioc->release_work, ioc_release_fn); + ioc->ioprio = IOPRIO_DEFAULT; /* * Try to install. ioc shouldn't be installed if someone else diff --git a/block/ioprio.c b/block/ioprio.c index 6f01d35a5145..6c830154856f 100644 --- a/block/ioprio.c +++ b/block/ioprio.c @@ -189,9 +189,9 @@ out: int ioprio_best(unsigned short aprio, unsigned short bprio) { if (!ioprio_valid(aprio)) - aprio = IOPRIO_DEFAULT; + aprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, IOPRIO_BE_NORM); if (!ioprio_valid(bprio)) - bprio = IOPRIO_DEFAULT; + bprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, IOPRIO_BE_NORM); return min(aprio, bprio); } |