vol_id: README update

[elogind.git] / udevsettle.c

diff --git a/udevsettle.c b/udevsettle.c
index b38968e7dfa644b6b08501a771fdafd945041bee..f76ad7160d6c9c3f1c8c055856cd3010aaaa5b65 100644 (file)
--- a/udevsettle.c
+++ b/udevsettle.c
@@ -1,6 +1,4 @@
 /*
- * udevsettle.c
- *
  * Copyright (C) 2006 Kay Sievers <kay@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -112,9 +110,9 @@ int main(int argc, char *argv[], char *envp[])
                        goto exit;
                }
 
-               /* read current kernel seqnum */
-               strlcpy(filename, sysfs_path, sizeof(filename));
-               strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
+               /* read current udev seqnum */
+               strlcpy(filename, udev_root, sizeof(filename));
+               strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
                fd = open(filename, O_RDONLY);
                if (fd < 0)
                        goto exit;
@@ -123,12 +121,12 @@ int main(int argc, char *argv[], char *envp[])
                if (len <= 0)
                        goto exit;
                seqnum[len] = '\0';
-               seq_kernel = strtoull(seqnum, NULL, 10);
-               info("kernel seqnum = %llu", seq_kernel);
+               seq_udev = strtoull(seqnum, NULL, 10);
+               info("udev seqnum = %llu", seq_udev);
 
-               /* read current udev seqnum */
-               strlcpy(filename, udev_root, sizeof(filename));
-               strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+               /* read current kernel seqnum */
+               strlcpy(filename, sysfs_path, sizeof(filename));
+               strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
                fd = open(filename, O_RDONLY);
                if (fd < 0)
                        goto exit;
@@ -137,8 +135,8 @@ int main(int argc, char *argv[], char *envp[])
                if (len <= 0)
                        goto exit;
                seqnum[len] = '\0';
-               seq_udev = strtoull(seqnum, NULL, 10);
-               info("udev seqnum = %llu", seq_udev);
+               seq_kernel = strtoull(seqnum, NULL, 10);
+               info("kernel seqnum = %llu", seq_kernel);
 
                /* make sure all kernel events have arrived in the queue */
                if (seq_udev >= seq_kernel) {