aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-03-25 09:37:35 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-05-13 12:23:53 -0400
commitcc64f774b4acd4954abe54f5919f50d78aba1e5f (patch)
tree9b8058302b65896e1dcf2bdac408939680fcba2e
parentc43615702f9c5957981693a4d966ed81d8fc1ecc (diff)
UBIFS: use __packed instead of __attribute__((packed))
There was an attempt to standartize various "__attribute__" and other macros in order to have potentially portable and more consistent code, see commit 82ddcb040570411fc2d421d96b3e69711c670328. Note, that commit refers Rober Love's blog post, but the URL is broken, the valid URL is: http://blog.rlove.org/2005/10/with-little-help-from-your-compiler.html Moreover, nowadays checkpatch.pl warns about using __attribute__((packed)): "WARNING: __packed is preferred over __attribute__((packed))" It is not a big deal for UBIFS to use __packed, so let's do it. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--fs/ubifs/ubifs-media.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h
index 191ca7863fe7..b922f03c31ae 100644
--- a/fs/ubifs/ubifs-media.h
+++ b/fs/ubifs/ubifs-media.h
@@ -434,7 +434,7 @@ struct ubifs_ch {
434 __u8 node_type; 434 __u8 node_type;
435 __u8 group_type; 435 __u8 group_type;
436 __u8 padding[2]; 436 __u8 padding[2];
437} __attribute__ ((packed)); 437} __packed;
438 438
439/** 439/**
440 * union ubifs_dev_desc - device node descriptor. 440 * union ubifs_dev_desc - device node descriptor.
@@ -448,7 +448,7 @@ struct ubifs_ch {
448union ubifs_dev_desc { 448union ubifs_dev_desc {
449 __le32 new; 449 __le32 new;
450 __le64 huge; 450 __le64 huge;
451} __attribute__ ((packed)); 451} __packed;
452 452
453/** 453/**
454 * struct ubifs_ino_node - inode node. 454 * struct ubifs_ino_node - inode node.
@@ -509,7 +509,7 @@ struct ubifs_ino_node {
509 __le16 compr_type; 509 __le16 compr_type;
510 __u8 padding2[26]; /* Watch 'zero_ino_node_unused()' if changing! */ 510 __u8 padding2[26]; /* Watch 'zero_ino_node_unused()' if changing! */
511 __u8 data[]; 511 __u8 data[];
512} __attribute__ ((packed)); 512} __packed;
513 513
514/** 514/**
515 * struct ubifs_dent_node - directory entry node. 515 * struct ubifs_dent_node - directory entry node.
@@ -534,7 +534,7 @@ struct ubifs_dent_node {
534 __le16 nlen; 534 __le16 nlen;
535 __u8 padding2[4]; /* Watch 'zero_dent_node_unused()' if changing! */ 535 __u8 padding2[4]; /* Watch 'zero_dent_node_unused()' if changing! */
536 __u8 name[]; 536 __u8 name[];
537} __attribute__ ((packed)); 537} __packed;
538 538
539/** 539/**
540 * struct ubifs_data_node - data node. 540 * struct ubifs_data_node - data node.
@@ -555,7 +555,7 @@ struct ubifs_data_node {
555 __le16 compr_type; 555 __le16 compr_type;
556 __u8 padding[2]; /* Watch 'zero_data_node_unused()' if changing! */ 556 __u8 padding[2]; /* Watch 'zero_data_node_unused()' if changing! */
557 __u8 data[]; 557 __u8 data[];
558} __attribute__ ((packed)); 558} __packed;
559 559
560/** 560/**
561 * struct ubifs_trun_node - truncation node. 561 * struct ubifs_trun_node - truncation node.
@@ -575,7 +575,7 @@ struct ubifs_trun_node {
575 __u8 padding[12]; /* Watch 'zero_trun_node_unused()' if changing! */ 575 __u8 padding[12]; /* Watch 'zero_trun_node_unused()' if changing! */
576 __le64 old_size; 576 __le64 old_size;
577 __le64 new_size; 577 __le64 new_size;
578} __attribute__ ((packed)); 578} __packed;
579 579
580/** 580/**
581 * struct ubifs_pad_node - padding node. 581 * struct ubifs_pad_node - padding node.
@@ -586,7 +586,7 @@ struct ubifs_trun_node {
586struct ubifs_pad_node { 586struct ubifs_pad_node {
587 struct ubifs_ch ch; 587 struct ubifs_ch ch;
588 __le32 pad_len; 588 __le32 pad_len;
589} __attribute__ ((packed)); 589} __packed;
590 590
591/** 591/**
592 * struct ubifs_sb_node - superblock node. 592 * struct ubifs_sb_node - superblock node.
@@ -644,7 +644,7 @@ struct ubifs_sb_node {
644 __u8 uuid[16]; 644 __u8 uuid[16];
645 __le32 ro_compat_version; 645 __le32 ro_compat_version;
646 __u8 padding2[3968]; 646 __u8 padding2[3968];
647} __attribute__ ((packed)); 647} __packed;
648 648
649/** 649/**
650 * struct ubifs_mst_node - master node. 650 * struct ubifs_mst_node - master node.
@@ -711,7 +711,7 @@ struct ubifs_mst_node {
711 __le32 idx_lebs; 711 __le32 idx_lebs;
712 __le32 leb_cnt; 712 __le32 leb_cnt;
713 __u8 padding[344]; 713 __u8 padding[344];
714} __attribute__ ((packed)); 714} __packed;
715 715
716/** 716/**
717 * struct ubifs_ref_node - logical eraseblock reference node. 717 * struct ubifs_ref_node - logical eraseblock reference node.
@@ -727,7 +727,7 @@ struct ubifs_ref_node {
727 __le32 offs; 727 __le32 offs;
728 __le32 jhead; 728 __le32 jhead;
729 __u8 padding[28]; 729 __u8 padding[28];
730} __attribute__ ((packed)); 730} __packed;
731 731
732/** 732/**
733 * struct ubifs_branch - key/reference/length branch 733 * struct ubifs_branch - key/reference/length branch
@@ -741,7 +741,7 @@ struct ubifs_branch {
741 __le32 offs; 741 __le32 offs;
742 __le32 len; 742 __le32 len;
743 __u8 key[]; 743 __u8 key[];
744} __attribute__ ((packed)); 744} __packed;
745 745
746/** 746/**
747 * struct ubifs_idx_node - indexing node. 747 * struct ubifs_idx_node - indexing node.
@@ -755,7 +755,7 @@ struct ubifs_idx_node {
755 __le16 child_cnt; 755 __le16 child_cnt;
756 __le16 level; 756 __le16 level;
757 __u8 branches[]; 757 __u8 branches[];
758} __attribute__ ((packed)); 758} __packed;
759 759
760/** 760/**
761 * struct ubifs_cs_node - commit start node. 761 * struct ubifs_cs_node - commit start node.
@@ -765,7 +765,7 @@ struct ubifs_idx_node {
765struct ubifs_cs_node { 765struct ubifs_cs_node {
766 struct ubifs_ch ch; 766 struct ubifs_ch ch;
767 __le64 cmt_no; 767 __le64 cmt_no;
768} __attribute__ ((packed)); 768} __packed;
769 769
770/** 770/**
771 * struct ubifs_orph_node - orphan node. 771 * struct ubifs_orph_node - orphan node.
@@ -777,6 +777,6 @@ struct ubifs_orph_node {
777 struct ubifs_ch ch; 777 struct ubifs_ch ch;
778 __le64 cmt_no; 778 __le64 cmt_no;
779 __le64 inos[]; 779 __le64 inos[];
780} __attribute__ ((packed)); 780} __packed;
781 781
782#endif /* __UBIFS_MEDIA_H__ */ 782#endif /* __UBIFS_MEDIA_H__ */