diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-09-17 10:33:10 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-10-01 10:25:29 -0700 |
| commit | 4e8e4213a815a30216e855a805a8bcd5b8c5a886 (patch) | |
| tree | 38dbb503be4f22ae804f3e5f83459c975d83886a /lib/lockfile.c | |
| parent | adf7cfd851c3d9d6f1ad74653cbd2fecce8c3ba9 (diff) | |
Switch many macros from using CONTAINER_OF to using OBJECT_CONTAINING.
These macros require one fewer argument by switching, which makes code
that uses them shorter and more readable.
Diffstat (limited to 'lib/lockfile.c')
| -rw-r--r-- | lib/lockfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/lockfile.c b/lib/lockfile.c index 84bfb3c0..690caf9f 100644 --- a/lib/lockfile.c +++ b/lib/lockfile.c @@ -151,7 +151,7 @@ lockfile_postfork(void) { struct lockfile *lockfile; - HMAP_FOR_EACH (lockfile, struct lockfile, hmap_node, &lock_table) { + HMAP_FOR_EACH (lockfile, hmap_node, &lock_table) { if (lockfile->fd >= 0) { VLOG_WARN("%s: child does not inherit lock", lockfile->name); lockfile_unhash(lockfile); @@ -171,7 +171,7 @@ lockfile_find(dev_t device, ino_t inode) { struct lockfile *lockfile; - HMAP_FOR_EACH_WITH_HASH (lockfile, struct lockfile, hmap_node, + HMAP_FOR_EACH_WITH_HASH (lockfile, hmap_node, lockfile_hash(device, inode), &lock_table) { if (lockfile->device == device && lockfile->inode == inode) { return lockfile; |