Changeset 3908355 in mainline for uspace/srv/fs/mfs/mfs_dentry.c

Timestamp:

2013-07-11T12:40:54Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dad0d2f

Parents:

c8bb1633 (diff), 1ba6651 (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_dentry.c (modified) (3 diffs)

uspace/srv/fs/mfs/mfs_dentry.c

@@ -36 +36 @@
  *
  * @param mnode         Pointer to the directory node.
- * @param d_info        Pointer to a directory entry structure where the dentry info
- *                      will be stored.
+ * @param d_info        Pointer to a directory entry structure where
+ *                      the dentry info will be stored.
  * @param index         index of the dentry in the list.
  *
@@ -101 +101 @@
 /**Write a directory entry on disk.
  *
- * @param d_info Pointer to the directory entry structure to write on disk.
+ * @param d_info The directory entry to write to disk.
  *
  * @return       EOK on success or a negative error code.
@@ -240 +240 @@
                                 goto out;
                         r = mfs_write_map(mnode, pos, b, &dummy);
-                        if (r != EOK)
+                        if (r != EOK) {
+                                mfs_free_zone(mnode->instance, b);
                                 goto out;
+                        }
                 }