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

Timestamp:

2011-10-15T20:05:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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 with mainline

File:

• uspace/srv/fs/mfs/mfs_dentry.c (modified) (9 diffs)

uspace/srv/fs/mfs/mfs_dentry.c

@@ -44 +44 @@
 int
 mfs_read_dentry(struct mfs_node *mnode,
-                     struct mfs_dentry_info *d_info, unsigned index)
+    struct mfs_dentry_info *d_info, unsigned index)
 {
         const struct mfs_instance *inst = mnode->instance;
@@ -57 +57 @@
 
         if (block == 0) {
-                /*End of the dentries list*/
+                /* End of the dentries list */
                 r = EOK;
                 goto out_err;
@@ -79 +79 @@
         } else {
                 const int namelen = longnames ? MFS_L_MAX_NAME_LEN :
-                                    MFS_MAX_NAME_LEN;
+                    MFS_MAX_NAME_LEN;
 
                 struct mfs_dentry *d;
 
                 d = b->data + dentry_off * (longnames ? MFSL_DIRSIZE :
-                                            MFS_DIRSIZE);
+                    MFS_DIRSIZE);
                 d_info->d_inum = conv16(sbi->native, d->d_inum);
                 memcpy(d_info->d_name, d->d_name, namelen);
@@ -101 +101 @@
 /**Write a directory entry on disk.
  *
- * @param d_info        Pointer to the directory entry structure to write on disk.
- *
- * @return              EOK on success or a negative error code.
+ * @param d_info Pointer to the directory entry structure to write on disk.
+ *
+ * @return       EOK on success or a negative error code.
  */
 int
@@ -178 +178 @@
 
                 if (name_len == d_name_len &&
-                                !bcmp(d_info.d_name, d_name, name_len)) {
+                    !bcmp(d_info.d_name, d_name, name_len)) {
+
                         d_info.d_inum = 0;
                         r = mfs_write_dentry(&d_info);
@@ -197 +198 @@
  */
 int
-mfs_insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum)
+mfs_insert_dentry(struct mfs_node *mnode, const char *d_name,
+    fs_index_t d_inum)
 {
         int r;
@@ -209 +211 @@
                 return ENAMETOOLONG;
 
-        /*Search for an empty dentry*/
+        /* Search for an empty dentry */
         unsigned i;
         for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
@@ -217 +219 @@
 
                 if (d_info.d_inum == 0) {
-                        /*This entry is not used*/
+                        /* This entry is not used */
                         empty_dentry_found = true;
                         break;
@@ -231 +233 @@
 
                 if (b == 0) {
-                        /*Increase the inode size*/
+                        /* Increase the inode size */
 
                         uint32_t dummy;