Changes in uspace/srv/fs/fat/fat_ops.c [feeac0d:f73b291] in mainline

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (5 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -149 +149 @@
 static int fat_node_fini_by_service_id(service_id_t service_id)
 {
+        fat_node_t *nodep;
         int rc;
 
@@ -159 +160 @@
 restart:
         fibril_mutex_lock(&ffn_mutex);
-        list_foreach(ffn_list, ffn_link, fat_node_t, nodep) {
+        list_foreach(ffn_list, lnk) {
+                nodep = list_get_instance(lnk, fat_node_t, ffn_link);
                 if (!fibril_mutex_trylock(&nodep->lock)) {
                         fibril_mutex_unlock(&ffn_mutex);
@@ -649 +651 @@
                 d = (fat_dentry_t *) b->data;
                 if ((fat_classify_dentry(d) == FAT_DENTRY_LAST) ||
-                    (memcmp(d->name, FAT_NAME_DOT, FAT_NAME_LEN)) == 0) {
+                    (bcmp(d->name, FAT_NAME_DOT, FAT_NAME_LEN)) == 0) {
                         memset(d, 0, sizeof(fat_dentry_t));
                         memcpy(d->name, FAT_NAME_DOT, FAT_NAME_LEN);
@@ -659 +661 @@
                 d++;
                 if ((fat_classify_dentry(d) == FAT_DENTRY_LAST) ||
-                    (memcmp(d->name, FAT_NAME_DOT_DOT, FAT_NAME_LEN) == 0)) {
+                    (bcmp(d->name, FAT_NAME_DOT_DOT, FAT_NAME_LEN) == 0)) {
                         memset(d, 0, sizeof(fat_dentry_t));
                         memcpy(d->name, FAT_NAME_DOT_DOT, FAT_NAME_LEN);
@@ -1040 +1042 @@
         info = (fat32_fsinfo_t *) b->data;
 
-        if (memcmp(info->sig1, FAT32_FSINFO_SIG1, sizeof(info->sig1)) != 0 ||
-            memcmp(info->sig2, FAT32_FSINFO_SIG2, sizeof(info->sig2)) != 0 ||
-            memcmp(info->sig3, FAT32_FSINFO_SIG3, sizeof(info->sig3)) != 0) {
+        if (bcmp(info->sig1, FAT32_FSINFO_SIG1, sizeof(info->sig1)) ||
+            bcmp(info->sig2, FAT32_FSINFO_SIG2, sizeof(info->sig2)) ||
+            bcmp(info->sig3, FAT32_FSINFO_SIG3, sizeof(info->sig3))) {
                 (void) block_put(b);
                 return EINVAL;