diff options
| author | Davidlohr Bueso <dave@stgolabs.net> | 2015-06-30 17:58:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-30 22:44:58 -0400 |
| commit | 55b7ae50167efc9b1c4f8fb60a99478cd46a82f7 (patch) | |
| tree | 62c41a1492732e4e012c09ad4e319221acd7e51e /ipc/util.c | |
| parent | ff35e5ef86fea1fa84eb7fdc939d0b1e3f1222bf (diff) | |
ipc: rename ipc_obtain_object
... to ipc_obtain_object_idr, which is more meaningful and makes the code
slightly easier to follow.
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/util.c')
| -rw-r--r-- | ipc/util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipc/util.c b/ipc/util.c index 537a41c7f633..3fdfabfdd9c3 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
| @@ -555,7 +555,7 @@ void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out) | |||
| 555 | * Call inside the RCU critical section. | 555 | * Call inside the RCU critical section. |
| 556 | * The ipc object is *not* locked on exit. | 556 | * The ipc object is *not* locked on exit. |
| 557 | */ | 557 | */ |
| 558 | struct kern_ipc_perm *ipc_obtain_object(struct ipc_ids *ids, int id) | 558 | struct kern_ipc_perm *ipc_obtain_object_idr(struct ipc_ids *ids, int id) |
| 559 | { | 559 | { |
| 560 | struct kern_ipc_perm *out; | 560 | struct kern_ipc_perm *out; |
| 561 | int lid = ipcid_to_idx(id); | 561 | int lid = ipcid_to_idx(id); |
| @@ -581,7 +581,7 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id) | |||
| 581 | struct kern_ipc_perm *out; | 581 | struct kern_ipc_perm *out; |
| 582 | 582 | ||
| 583 | rcu_read_lock(); | 583 | rcu_read_lock(); |
| 584 | out = ipc_obtain_object(ids, id); | 584 | out = ipc_obtain_object_idr(ids, id); |
| 585 | if (IS_ERR(out)) | 585 | if (IS_ERR(out)) |
| 586 | goto err1; | 586 | goto err1; |
| 587 | 587 | ||
| @@ -605,7 +605,7 @@ err1: | |||
| 605 | * @ids: ipc identifier set | 605 | * @ids: ipc identifier set |
| 606 | * @id: ipc id to look for | 606 | * @id: ipc id to look for |
| 607 | * | 607 | * |
| 608 | * Similar to ipc_obtain_object() but also checks | 608 | * Similar to ipc_obtain_object_idr() but also checks |
| 609 | * the ipc object reference counter. | 609 | * the ipc object reference counter. |
| 610 | * | 610 | * |
| 611 | * Call inside the RCU critical section. | 611 | * Call inside the RCU critical section. |
| @@ -613,7 +613,7 @@ err1: | |||
| 613 | */ | 613 | */ |
| 614 | struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id) | 614 | struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id) |
| 615 | { | 615 | { |
| 616 | struct kern_ipc_perm *out = ipc_obtain_object(ids, id); | 616 | struct kern_ipc_perm *out = ipc_obtain_object_idr(ids, id); |
| 617 | 617 | ||
| 618 | if (IS_ERR(out)) | 618 | if (IS_ERR(out)) |
| 619 | goto out; | 619 | goto out; |