Changeset 128b8ee in mainline

Timestamp:

2011-02-27T22:47:25Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

a6e094f

Parents:

f6d4462 (diff), e6cb880 (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

Location:

uspace

Files:

• app/bdsh/cmds/modules/mount/mount.c (modified) (3 diffs)
• srv/fs/fat/fat_ops.c (modified) (3 diffs)

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

@@ -31 +31 @@
 #include <vfs/vfs.h>
 #include <errno.h>
+#include <getopt.h>
 #include "config.h"
 #include "util.h"
@@ -40 +41 @@
 static const char *cmdname = "mount";
 
-/* Dispays help for mount in various levels */
+static struct option const long_options[] = {
+        { "help", no_argument, 0, 'h' },
+        { 0, 0, 0, 0 }
+};
+
+
+/* Displays help for mount in various levels */
 void help_cmd_mount(unsigned int level)
 {
@@ -59 +66 @@
         unsigned int argc;
         const char *mopts = "";
-        int rc;
+        int rc, c, opt_ind;
 
         argc = cli_count_args(argv);
 
+        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+                c = getopt_long(argc, argv, "h", long_options, &opt_ind);
+                switch (c) {
+                case 'h':
+                        help_cmd_mount(HELP_LONG);
+                        return CMD_SUCCESS;
+                }
+        }
+
         if ((argc < 4) || (argc > 5)) {
-                printf("%s: invalid number of arguments.\n",
+                printf("%s: invalid number of arguments. Try `mount --help'\n",
                     cmdname);
                 return CMD_FAILURE;

uspace/srv/fs/fat/fat_ops.c

@@ -812 +812 @@
         fibril_mutex_unlock(&childp->idx->lock);
         childp->lnkcnt = 0;
+        childp->refcnt++;       /* keep the node in memory until destroyed */
         childp->dirty = true;
         fibril_mutex_unlock(&childp->lock);
@@ -1489 +1490 @@
         fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
         fs_node_t *fn;
+        fat_node_t *nodep;
         int rc;
 
@@ -1500 +1502 @@
                 return;
         }
+
+        nodep = FAT_NODE(fn);
+        /*
+         * We should have exactly two references. One for the above
+         * call to fat_node_get() and one from fat_unlink().
+         */
+        assert(nodep->refcnt == 2);
 
         rc = fat_destroy_node(fn);