Changeset efdfebc in mainline for uspace/lib/fs/libfs.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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 mainline changes.

File:

• uspace/lib/fs/libfs.c (modified) (2 diffs)

uspace/lib/fs/libfs.c

@@ -631 +631 @@
                                                 async_answer_0(rid, rc);
                                         } else {
-                                                aoff64_t size = ops->size_get(fn);
-                                                async_answer_5(rid, fs_handle,
-                                                    service_id,
-                                                    ops->index_get(fn),
-                                                    LOWER32(size),
-                                                    UPPER32(size),
-                                                    ops->lnkcnt_get(fn));
-                                                (void) ops->node_put(fn);
+                                                (void) ops->node_put(cur);
+                                                cur = fn;
+                                                goto out_with_answer;
                                         }
                                 } else
@@ -715 +710 @@
                                         async_answer_0(rid, rc);
                                 } else {
-                                        aoff64_t size = ops->size_get(fn);
-                                        async_answer_5(rid, fs_handle,
-                                            service_id,
-                                            ops->index_get(fn),
-                                            LOWER32(size),
-                                            UPPER32(size),
-                                            ops->lnkcnt_get(fn));
-                                        (void) ops->node_put(fn);
+                                        (void) ops->node_put(cur);
+                                        cur = fn;
+                                        goto out_with_answer;
                                 }
                         } else