Changeset 3ce78580 in mainline for uspace/srv/fs/mfs/mfs_ops.c

Timestamp:

2011-10-30T20:45:03Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

10e4cd7, 4f100f4, 8a363ab3, c289457, c83a55c

Parents:

45bf63c (diff), 20a3465 (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 lp:mfs.

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)) {