Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46287aa6 authored by Al Viro's avatar Al Viro
Browse files

hpfs: annotate struct hpfs_dirent 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6ce2bbba

fs/hpfs/dnode.c

+4 −4
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void set_last_pointer(struct super_block *s, struct dnode *d, dnode_secno 
		}

		de->length = cpu_to_le16(36);

		de->down = 1;

		*(dnode_secno *)((char *)de + 32) = cpu_to_le32(ptr);

		*(__le32 *)((char *)de + 32) = cpu_to_le32(ptr);

	}

}
@@ -177,7 +177,7 @@ struct hpfs_dirent *hpfs_add_de(struct super_block *s, struct dnode *d, 
	memmove((char *)de + d_size, de, (char *)de_end - (char *)de);

	memset(de, 0, d_size);

	if (down_ptr) {

		*(dnode_secno *)((char *)de + d_size - 4) = cpu_to_le32(down_ptr);

		*(__le32 *)((char *)de + d_size - 4) = cpu_to_le32(down_ptr);

		de->down = 1;

	}

	de->length = cpu_to_le16(d_size);
@@ -656,7 +656,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) 
				del->down = 0;

				d1->first_free = cpu_to_le32(le32_to_cpu(d1->first_free) - 4);

			} else if (down)

				*(dnode_secno *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down);

				*(__le32 *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down);

		} else goto endm;

		if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) {

			printk("HPFS: out of memory for dtree balancing\n");
@@ -672,7 +672,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) 
			de_prev->down = 1;

			dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) + 4);

		}

		*(dnode_secno *) ((void *) de_prev + le16_to_cpu(de_prev->length) - 4) = cpu_to_le32(ndown);

		*(__le32 *) ((void *) de_prev + le16_to_cpu(de_prev->length) - 4) = cpu_to_le32(ndown);

		hpfs_mark_4buffers_dirty(&qbh);

		hpfs_brelse4(&qbh);

		for_all_poss(i, hpfs_pos_subst, ((loff_t)up << 4) | (p - 1), 4);

fs/hpfs/hpfs.h

+7 −7
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ struct dnode { 
};



struct hpfs_dirent {

  u16 length;				/* offset to next dirent */

  __le16 length;			/* offset to next dirent */



#ifdef __LITTLE_ENDIAN

  u8 first: 1;				/* set on phony ^A^A (".") entry */
@@ -346,12 +346,12 @@ struct hpfs_dirent { 
  u8 read_only: 1;			/* dos attrib */

#endif



  fnode_secno fnode;			/* fnode giving allocation info */

  time32_t write_date;			/* mtime */

  u32 file_size;			/* file length, bytes */

  time32_t read_date;			/* atime */

  time32_t creation_date;			/* ctime */

  u32 ea_size;				/* total EA length, bytes */

  __le32 fnode;				/* fnode giving allocation info */

  __le32 write_date;			/* mtime */

  __le32 file_size;			/* file length, bytes */

  __le32 read_date;			/* atime */

  __le32 creation_date;			/* ctime */

  __le32 ea_size;			/* total EA length, bytes */

  u8 no_of_acls;			/* number of ACL's (low 3 bits) */

  u8 ix;				/* code page index (of filename), see

					   struct code_page_data */

fs/hpfs/hpfs_fn.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct quad_buffer_head { 
static inline dnode_secno de_down_pointer (struct hpfs_dirent *de)

{

  CHKCOND(de->down,("HPFS: de_down_pointer: !de->down\n"));

  return le32_to_cpu(*(dnode_secno *) ((void *) de + le16_to_cpu(de->length) - 4));

  return le32_to_cpu(*(__le32 *) ((void *) de + le16_to_cpu(de->length) - 4));

}



/* The first dir entry in a dnode */