Changeset 5f9f37d in mainline

Timestamp:

2011-03-24T00:34:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

84f0a79

Parents:

ab10b842 (diff), 2815505 (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:~jakub/helenos/fs.

Location:

uspace

Files:

• app/bdsh/cmds/modules/cp/cp.c (modified) (2 diffs)
• srv/vfs/vfs_ops.c (modified) (6 diffs)

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -108 +108 @@
         for (;;) {
                 ssize_t res;
+                size_t written = 0;
 
                 bytes = read(fd1, buff, blen);
@@ -120 +121 @@
                          * returned less data than requested.
                          */
-                        bytes = write(fd2, buff, res);
+                        bytes = write(fd2, buff + written, res);
                         if (bytes < 0)
                                 goto err;
+                        written += bytes;
                         res -= bytes;
                 } while (res > 0);

uspace/srv/vfs/vfs_ops.c

@@ -1234 +1234 @@
         if (!parentc) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
+                vfs_node_put(old_node);
                 async_answer_0(rid, rc);
                 free(old);
@@ -1251 +1252 @@
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
+                vfs_node_put(old_node);
                 async_answer_0(rid, rc);
                 free(old);
@@ -1261 +1263 @@
             (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
+                vfs_node_put(old_node);
                 async_answer_0(rid, EXDEV);     /* different file systems */
                 free(old);
@@ -1279 +1282 @@
                 if (!new_node) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
+                        vfs_node_put(old_node);
                         async_answer_0(rid, ENOMEM);
                         free(old);
@@ -1290 +1294 @@
         default:
                 fibril_rwlock_write_unlock(&namespace_rwlock);
+                vfs_node_put(old_node);
                 async_answer_0(rid, ENOTEMPTY);
                 free(old);
@@ -1300 +1305 @@
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
+                vfs_node_put(old_node);
                 if (new_node)
                         vfs_node_put(new_node);