Changes in uspace/srv/fs/mfs/mfs_ops.c [9d58539:df3caec5] in mainline

File:

• uspace/srv/fs/mfs/mfs_ops.c (modified) (5 diffs)

uspace/srv/fs/mfs/mfs_ops.c

@@ -384 +384 @@
         if (flags & L_DIRECTORY) {
                 ino_i->i_mode = S_IFDIR;
-                ino_i->i_nlinks = 1; /* This accounts for the '.' dentry */
-        } else
+                ino_i->i_nlinks = 2; /* This accounts for the '.' dentry */
+        } else {
                 ino_i->i_mode = S_IFREG;
+                ino_i->i_nlinks = 1;
+        }
 
         ino_i->i_uid = 0;
@@ -664 +666 @@
         struct mfs_node *child = cfn->data;
         struct mfs_sb_info *sbi = parent->instance->sbi;
-        bool destroy_dentry = false;
 
         mfsdebug("%s()\n", __FUNCTION__);
@@ -673 +674 @@
         int r = mfs_insert_dentry(parent, name, child->ino_i->index);
         if (r != EOK)
-                return r;
+                goto exit_error;
 
         if (S_ISDIR(child->ino_i->i_mode)) {
-                if (child->ino_i->i_nlinks != 1) {
-                        /* It's not possible to hardlink directories in MFS */
-                        destroy_dentry = true;
-                        r = EMLINK;
-                        goto exit;
-                }
                 r = mfs_insert_dentry(child, ".", child->ino_i->index);
-                if (r != EOK) {
-                        destroy_dentry = true;
-                        goto exit;
-                }
+                if (r != EOK)
+                        goto exit_error;
 
                 r = mfs_insert_dentry(child, "..", parent->ino_i->index);
-                if (r != EOK) {
-                        destroy_dentry = true;
-                        goto exit;
-                }
+                if (r != EOK)
+                        goto exit_error;
 
                 parent->ino_i->i_nlinks++;
@@ -698 +689 @@
         }
 
-exit:
-        if (destroy_dentry) {
-                int r2 = mfs_remove_dentry(parent, name);
-                if (r2 != EOK)
-                        r = r2;
-        } else {
-                child->ino_i->i_nlinks++;
-                child->ino_i->dirty = true;
-        }
+exit_error:
         return r;
 }
@@ -837 +820 @@
 found:
                 async_data_read_finalize(callid, d_info.d_name,
-                    str_size(d_info.d_name) + 1);
+                                         str_size(d_info.d_name) + 1);
                 bytes = ((pos - spos) + 1);
         } else {