Changeset 45e7868 in mainline for uspace/srv/fs/mfs/mfs_ops.c

Timestamp:

2011-11-07T23:02:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8c62a71

Parents:

a0c05e7 (diff), 7b5f4c9 (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 from mainline.

File:

• uspace/srv/fs/mfs/mfs_ops.c (modified) (2 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;
@@ -675 +673 @@
         if (r != EOK)
                 goto exit_error;
+
+        child->ino_i->i_nlinks++;
+        child->ino_i->dirty = true;
 
         if (S_ISDIR(child->ino_i->i_mode)) {