Context Navigation

Changes in / [3781092:5da7199] in mainline

Location:

uspace

Files:

r3781092	r5da7199
159	159
160	160	extern int
161		mfs_put_inode(struct mfs_node *mnode);
	161	mfs_put_inode_core(struct mfs_node *mnode);
162	162
163	163	extern int

-              r3781092
+              r5da7199
                 d_info->d_inum = conv32(sbi->native, d3->d_inum);
                 memcpy(d_info->d_name, d3->d_name, MFS3_MAX_NAME_LEN);
-                d_info->d_name[MFS3_MAX_NAME_LEN] = 0;
         } else {
                 const int namelen = longnames ? MFS_L_MAX_NAME_LEN :
 …
                 d_info->d_inum = conv16(sbi->native, d->d_inum);
                 memcpy(d_info->d_name, d->d_name, namelen);
-                d_info->d_name[namelen] = 0;
+        }
 …
         d_info.d_inum = d_inum;
         memcpy(d_info.d_name, d_name, name_len);
+        if (name_len < sbi->max_name_len)
+                d_info.d_name[name_len] = 0;
+        d_info.d_name[name_len] = 0;
         r = mfs_write_dentry(&d_info);

-              r3781092
+              r5da7199
                 struct mfs_ino_info **ino_ptr, uint32_t inum);
+/**Read a MINIX inode from disk
+ *
+ * @param inst          Pointer to the filesystem instance.
+ * @param ino_i         Pointer to the generic MINIX inode
+ *                      where the inode content will be stored.
+ * @param index         index of the inode to read.
+ *
+ * @return              EOK on success or a negative error code.
+ */
 int
 mfs_get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
 …
+}
-/**Write a MINIX inode on disk (if marked as dirty)
+ *
- * @param mnode         Pointer to the generic MINIX inode in memory.
+ *
- * @return              EOK on success or a negative error code.
- */
 int
 mfs_put_inode(struct mfs_node *mnode)
+mfs_put_inode_core(struct mfs_node *mnode)
+{
         int rc = EOK;
 …
+}
-/**Reduce the inode size of a given number of bytes
+ *
- * @param mnode         Pointer to the generic MINIX inode in memory.
- * @param size_shrink   Number of bytes that will be subtracted to the inode.
+ *
- * @return              EOK on success or a negative error code.
- */
 int
 mfs_inode_shrink(struct mfs_node *mnode, size_t size_shrink)

r3781092	r5da7199
513	513	assert(mnode->instance->open_nodes_cnt > 0);
514	514	mnode->instance->open_nodes_cnt--;
515		rc = mfs_put_inode(mnode);
	515	rc = mfs_put_inode_core(mnode);
516	516	free(mnode->ino_i);
517	517	free(mnode);

-              r3781092
+              r5da7199
  *bytes, this function returns the on-disk block
  *relative to that position.
+ *
+ * @param b     Pointer to a 32bit number where the block number will be stored
+ * @param mnode Pointer to a generic MINIX inode in memory.
+ * @param pos   Position in file.
+ *
+ * @return      EOK on success or a negative error code.
+ *Returns zero if the block does not exist.
  */
 int
 …
+}
+/**Free unused indirect zones from a MINIX inode according to it's new size.
+ *
+ * @param mnode         Pointer to a generic MINIX inode in memory.
+ * @param new_size      The new size of the inode.
+ *
+ * @return              EOK on success or a negative error code.
+ */
+/*Free unused indirect zones*/
 int
 mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size)
 …
         mfs_version_t fs_version = sbi->fs_version;
-        assert(new_size <= ino_i->i_size);
         if (fs_version == MFS_VERSION_V1) {
                 nr_direct = V1_NR_DIRECT_ZONES;

Note: See TracChangeset for help on using the changeset viewer.