Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 59dac16fb95f09253b8086134443abeb439703cd

Authored by Paul Jackson
Committed by Linus Torvalds
1 parent c5b2aff896
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] cpuset: update_nodemask code reformat 

Restructure code layout of the kernel/cpuset.c update_nodemask() routine,
removing embedded returns and nested if's in favor of goto completion labels.
This is being done in anticipation of adding more logic to this routine, which
will favor the goto style structure.

Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 15 additions and 10 deletions Side-by-side Diff

... ... @@ -799,18 +799,23 @@
799 799 trialcs = *cs;
800 800 retval = nodelist_parse(buf, trialcs.mems_allowed);
801 801 if (retval < 0)
802   - return retval;
  802 + goto done;
803 803 nodes_and(trialcs.mems_allowed, trialcs.mems_allowed, node_online_map);
804   - if (nodes_empty(trialcs.mems_allowed))
805   - return -ENOSPC;
806   - retval = validate_change(cs, &trialcs);
807   - if (retval == 0) {
808   - down(&callback_sem);
809   - cs->mems_allowed = trialcs.mems_allowed;
810   - atomic_inc(&cpuset_mems_generation);
811   - cs->mems_generation = atomic_read(&cpuset_mems_generation);
812   - up(&callback_sem);
  804 + if (nodes_empty(trialcs.mems_allowed)) {
  805 + retval = -ENOSPC;
  806 + goto done;
813 807 }
  808 + retval = validate_change(cs, &trialcs);
  809 + if (retval < 0)
  810 + goto done;
  811 +
  812 + down(&callback_sem);
  813 + cs->mems_allowed = trialcs.mems_allowed;
  814 + atomic_inc(&cpuset_mems_generation);
  815 + cs->mems_generation = atomic_read(&cpuset_mems_generation);
  816 + up(&callback_sem);
  817 +
  818 +done:
814 819 return retval;
815 820 }
816 821