Changeset 7aaed09 in mainline for uspace/srv/fs/mfs/mfs_ops.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/fs/mfs/mfs_ops.c

@@ -664 +664 @@
         struct mfs_node *child = cfn->data;
         struct mfs_sb_info *sbi = parent->instance->sbi;
+        bool destroy_dentry = false;
 
         mfsdebug("%s()\n", __FUNCTION__);
@@ -672 +673 @@
         int r = mfs_insert_dentry(parent, name, child->ino_i->index);
         if (r != EOK)
-                goto exit_error;
-
-        child->ino_i->i_nlinks++;
-        child->ino_i->dirty = true;
+                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++;
@@ -690 +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;
 }
@@ -821 +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 {