Changes in / [747ef72:54464f6a] in mainline

Location:

uspace

Files:

• drv/bus/usb/usbhid/kbd.h (added)
• drv/bus/usb/usbhid/kbd/layout.h (added)
• drv/bus/usb/usbhid/kbd/main.c (added)
• drv/bus/usb/usbhid/layout.h (added)
• drv/bus/usb/usbmast/scsi.h (added)
• srv/fs/mfs/mfs_balloc.c (modified) (2 diffs)
• srv/fs/mfs/mfs_dentry.c (modified) (1 diff)
• srv/fs/mfs/mfs_inode.c (modified) (2 diffs)
• srv/fs/mfs/mfs_ops.c (modified) (4 diffs)
• srv/hid/input/include/sun.h (added)
• srv/hid/input/port/dummy.c (added)
• srv/hid/input/port/sgcn.c (added)
• srv/hid/input/port/sun.c (added)
• srv/hid/input/port/z8530.c (added)

uspace/srv/fs/mfs/mfs_balloc.c

@@ -198 +198 @@
                 limit = sbi->nzones - sbi->firstdatazone - 1;
         } else {
-                /*bid == BMAP_INODE*/
+                /* bid == BMAP_INODE */
                 search = &sbi->isearch;
                 start_block = 2;
@@ -212 +212 @@
         for (i = *search / bits_per_block; i < nblocks; ++i) {
                 r = block_get(&b, inst->service_id, i + start_block,
-                              BLOCK_FLAGS_NONE);
+                    BLOCK_FLAGS_NONE);
 
                 if (r != EOK)

uspace/srv/fs/mfs/mfs_dentry.c

@@ -168 +168 @@
                 return ENAMETOOLONG;
 
-        /*Search the directory entry to be removed*/
+        /* Search the directory entry to be removed */
         unsigned i;
         for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize ; ++i) {

uspace/srv/fs/mfs/mfs_inode.c

@@ -235 +235 @@
 
         r = block_get(&b, mnode->instance->service_id,
-                      itable_off + inum / sbi->ino_per_block,
-                      BLOCK_FLAGS_NONE);
+            itable_off + inum / sbi->ino_per_block,
+            BLOCK_FLAGS_NONE);
 
         if (r != EOK)
@@ -278 +278 @@
 
         r = block_get(&b, mnode->instance->service_id,
-                      itable_off + inum / sbi->ino_per_block,
-                      BLOCK_FLAGS_NONE);
+            itable_off + inum / sbi->ino_per_block,
+            BLOCK_FLAGS_NONE);
 
         if (r != EOK)

uspace/srv/fs/mfs/mfs_ops.c

@@ -664 +664 @@
         struct mfs_node *child = cfn->data;
         struct mfs_sb_info *sbi = parent->instance->sbi;
+        bool destroy_dentry = false;
 
         mfsdebug("%s()\n", __FUNCTION__);
@@ -672 +673 @@
         int r = mfs_insert_dentry(parent, name, child->ino_i->index);
         if (r != EOK)
-                goto exit_error;
-
-        child->ino_i->i_nlinks++;
-        child->ino_i->dirty = true;
+                return r;
 
         if (S_ISDIR(child->ino_i->i_mode)) {
+                if (child->ino_i->i_nlinks != 1) {
+                        /* It's not possible to hardlink directories in MFS */
+                        destroy_dentry = true;
+                        r = EMLINK;
+                        goto exit;
+                }
                 r = mfs_insert_dentry(child, ".", child->ino_i->index);
-                if (r != EOK)
-                        goto exit_error;
+                if (r != EOK) {
+                        destroy_dentry = true;
+                        goto exit;
+                }
 
                 r = mfs_insert_dentry(child, "..", parent->ino_i->index);
-                if (r != EOK)
-                        goto exit_error;
+                if (r != EOK) {
+                        destroy_dentry = true;
+                        goto exit;
+                }
 
                 parent->ino_i->i_nlinks++;
@@ -690 +698 @@
         }
 
-exit_error:
+exit:
+        if (destroy_dentry) {
+                int r2 = mfs_remove_dentry(parent, name);
+                if (r2 != EOK)
+                        r = r2;
+        } else {
+                child->ino_i->i_nlinks++;
+                child->ino_i->dirty = true;
+        }
         return r;
 }
@@ -821 +837 @@
 found:
                 async_data_read_finalize(callid, d_info.d_name,
-                                         str_size(d_info.d_name) + 1);
+                    str_size(d_info.d_name) + 1);
                 bytes = ((pos - spos) + 1);
         } else {