Changeset bbd4c72 in mainline

Timestamp:

2011-09-05T18:16:45Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

75e0f15

Parents:

3a5ee6c

Message:

The lnkcnt_get() function will ignore the ".." hardlinks when dealing with directories

File:

• uspace/srv/fs/minixfs/mfs_ops.c (modified) (7 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -161 +161 @@
 
         /* initialize libblock */
-        rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
+        rc = block_init(EXCHANGE_SERIALIZE, service_id, 4096);
         if (rc != EOK)
                 return rc;
@@ -175 +175 @@
         instance = malloc(sizeof(*instance));
         if (!instance) {
+                free(sbi);
                 block_fini(service_id);
                 return ENOMEM;
@@ -307 +308 @@
         struct mfs_instance *inst;
 
+        mfsdebug("%s()\n", __FUNCTION__);
+
         int r = mfs_instance_get(service_id, &inst);
         if (r != EOK)
@@ -372 +375 @@
         }
 
-        if (flags & L_DIRECTORY)
+        if (flags & L_DIRECTORY) {
                 ino_i->i_mode = S_IFDIR;
-        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_nlinks = 1;
+        }
+
         ino_i->i_uid = 0;
         ino_i->i_gid = 0;
@@ -546 +551 @@
         mfsdebug("%s()\n", __FUNCTION__);
 
-        assert(mnode);
-        assert(mnode->ino_i);
+        if (S_ISDIR(mnode->ino_i->i_mode)) {
+                if (mnode->ino_i->i_nlinks > 1)
+                        return 1;
+                else
+                        return 0;
+        }
 
         return mnode->ino_i->i_nlinks;
@@ -662 +671 @@
                 if (r != EOK)
                         goto exit_error;
-                //child->ino_i->i_nlinks++;
-                //child->ino_i->dirty = true;
+
                 r = mfs_insert_dentry(child, "..", parent->ino_i->index);
                 if (r != EOK)
                         goto exit_error;
-                //parent->ino_i->i_nlinks++;
-                //parent->ino_i->dirty = true;
+
+                parent->ino_i->i_nlinks++;
+                parent->ino_i->dirty = true;
         }
 
@@ -702 +711 @@
 
         assert(chino->i_nlinks >= 1);
-        --chino->i_nlinks;
-/*
-        if (chino->i_nlinks == 0 && S_ISDIR(chino->i_mode)) {
+        chino->i_nlinks--;
+        mfsdebug("Links: %d\n", chino->i_nlinks);
+
+        if (chino->i_nlinks <= 1 && S_ISDIR(chino->i_mode)) {
+                /* The child directory will be destroyed, decrease the
+                 * parent hard links counter.
+                 */
                 parent->ino_i->i_nlinks--;
                 parent->ino_i->dirty = true;
         }
-*/
 
         chino->dirty = true;