Changes in uspace/srv/fs/mfs/mfs_ops.c [df3caec5:9d58539] 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 = 2; /* This accounts for the '.' dentry */
-        } else {
+                ino_i->i_nlinks = 1; /* This accounts for the '.' dentry */
+        } else
                 ino_i->i_mode = S_IFREG;
-                ino_i->i_nlinks = 1;
-        }
 
         ino_i->i_uid = 0;
@@ -666 +664 @@
         struct mfs_node *child = cfn->data;
         struct mfs_sb_info *sbi = parent->instance->sbi;
+        bool destroy_dentry = false;
 
         mfsdebug("%s()\n", __FUNCTION__);
@@ -674 +673 @@
         int r = mfs_insert_dentry(parent, name, child->ino_i->index);
         if (r != EOK)
-                goto exit_error;
+                return r;
 
         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)
-                        goto exit_error;
+                if (r != EOK) {
+                        destroy_dentry = true;
+                        goto exit;
+                }
 
                 r = mfs_insert_dentry(child, "..", parent->ino_i->index);
-                if (r != EOK)
-                        goto exit_error;
+                if (r != EOK) {
+                        destroy_dentry = true;
+                        goto exit;
+                }
 
                 parent->ino_i->i_nlinks++;
@@ -689 +698 @@
         }
 
-exit_error:
+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;
+        }
         return r;
 }
@@ -820 +837 @@
 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 {