lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

Browse Source
This commit is contained in:
Greg Kroah-Hartman
2006-08-21 10:24:02 -07:00
parent da547d775f be33c3a67b
commit ae298c98e5
4 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
block/cfq-iosched.c
View File

@@ -1561,7 +1561,7 @@ restart:
/* ->key must be copied to avoid race with cfq_exit_queue() */ /* ->key must be copied to avoid race with cfq_exit_queue() */
k = __cic->key; k = __cic->key;
if (unlikely(!k)) { if (unlikely(!k)) {
cfq_drop_dead_cic(ioc, cic); cfq_drop_dead_cic(ioc, __cic);
goto restart; goto restart;
} }

2
block/ll_rw_blk.c
View File

@@ -3628,6 +3628,8 @@ struct io_context *current_io_context(gfp_t gfp_flags)
ret->nr_batch_requests = 0; /* because this is 0 */ ret->nr_batch_requests = 0; /* because this is 0 */
ret->aic = NULL; ret->aic = NULL;
ret->cic_root.rb_node = NULL; ret->cic_root.rb_node = NULL;
/* make sure set_task_ioprio() sees the settings above */
smp_wmb();
tsk->io_context = ret; tsk->io_context = ret;
} }

30
fs/ioprio.c
View File

@@ -44,6 +44,9 @@ static int set_task_ioprio(struct task_struct *task, int ioprio)
task->ioprio = ioprio; task->ioprio = ioprio;
ioc = task->io_context; ioc = task->io_context;
/* see wmb() in current_io_context() */
smp_read_barrier_depends();
if (ioc && ioc->set_ioprio) if (ioc && ioc->set_ioprio)
ioc->set_ioprio(ioc, ioprio); ioc->set_ioprio(ioc, ioprio);
@@ -111,9 +114,9 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
continue; continue;
ret = set_task_ioprio(p, ioprio); ret = set_task_ioprio(p, ioprio);
if (ret) if (ret)
break; goto free_uid;
} while_each_thread(g, p); } while_each_thread(g, p);
free_uid:
if (who) if (who)
free_uid(user); free_uid(user);
break; break;
@@ -137,6 +140,29 @@ out:
return ret; return ret;
} }
int ioprio_best(unsigned short aprio, unsigned short bprio)
{
unsigned short aclass = IOPRIO_PRIO_CLASS(aprio);
unsigned short bclass = IOPRIO_PRIO_CLASS(bprio);
if (!ioprio_valid(aprio))
return bprio;
if (!ioprio_valid(bprio))
return aprio;
if (aclass == IOPRIO_CLASS_NONE)
aclass = IOPRIO_CLASS_BE;
if (bclass == IOPRIO_CLASS_NONE)
bclass = IOPRIO_CLASS_BE;
if (aclass == bclass)
return min(aprio, bprio);
if (aclass > bclass)
return bprio;
else
return aprio;
}
asmlinkage long sys_ioprio_get(int which, int who) asmlinkage long sys_ioprio_get(int which, int who)
{ {
struct task_struct *g, *p; struct task_struct *g, *p;

23
include/linux/ioprio.h
View File

@@ -59,27 +59,6 @@ static inline int task_nice_ioprio(struct task_struct *task)
/* /*
* For inheritance, return the highest of the two given priorities * For inheritance, return the highest of the two given priorities
*/ */
static inline int ioprio_best(unsigned short aprio, unsigned short bprio) extern int ioprio_best(unsigned short aprio, unsigned short bprio);
{
unsigned short aclass = IOPRIO_PRIO_CLASS(aprio);
unsigned short bclass = IOPRIO_PRIO_CLASS(bprio);
if (!ioprio_valid(aprio))
return bprio;
if (!ioprio_valid(bprio))
return aprio;
if (aclass == IOPRIO_CLASS_NONE)
aclass = IOPRIO_CLASS_BE;
if (bclass == IOPRIO_CLASS_NONE)
bclass = IOPRIO_CLASS_BE;
if (aclass == bclass)
return min(aprio, bprio);
if (aclass > bclass)
return bprio;
else
return aprio;
}
#endif #endif