hfsplus: code style fixes - reworked support of extended attributes

This patch fixes code style issues:
1. Rephrase comment.
2. Fix multiline comment style.
3. The hfsplus_alloc_attr_entry() was corrected.
4. The hfsplus_unistr and hfsplus_attr_unistr structures were declared
   independently.

Signed-off-by: Vyacheslav Dubeyko <slava@dubeyko.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/hfsplus/attributes.c b/fs/hfsplus/attributes.c
index ad126aeefc27d9bbf1c7661025f78800bfa26906..8d691f124714bd491593932ad347bee6041bdf65 100644 (file)
--- a/fs/hfsplus/attributes.c
+++ b/fs/hfsplus/attributes.c
@@ -67,10 +67,14 @@ int hfsplus_attr_build_key(struct super_block *sb, hfsplus_btree_key *key,
                key->attr.key_name.length = 0;
                len = 0;
        }
-       /* The key_length (be16) doesn't summed in the lenght of whole key.
-          But the length of the string (be16) should be included in sum.
-          So, offsetof(hfsplus_attr_key, key_name) is a trick that give
-          right value. */
+
+       /* The length of the key, as stored in key_len field, does not include
+        * the size of the key_len field itself.
+        * So, offsetof(hfsplus_attr_key, key_name) is a trick because
+        * it takes into consideration key_len field (__be16) of
+        * hfsplus_attr_key structure instead of length field (__be16) of
+        * hfsplus_attr_unistr structure.
+        */
        key->key_len =
                cpu_to_be16(offsetof(struct hfsplus_attr_key, key_name) +
                                2 * len);
@@ -90,10 +94,14 @@ void hfsplus_attr_build_key_uni(hfsplus_btree_key *key,
        key->attr.key_name.length = cpu_to_be16(ustrlen);
        ustrlen *= 2;
        memcpy(key->attr.key_name.unicode, name->unicode, ustrlen);
-       /* The key_length (be16) doesn't summed in the lenght of whole key.
-          But the length of the string (be16) should be included in sum.
-          So, offsetof(hfsplus_attr_key, key_name) is a trick that give
-          right value. */
+
+       /* The length of the key, as stored in key_len field, does not include
+        * the size of the key_len field itself.
+        * So, offsetof(hfsplus_attr_key, key_name) is a trick because
+        * it takes into consideration key_len field (__be16) of
+        * hfsplus_attr_key structure instead of length field (__be16) of
+        * hfsplus_attr_unistr structure.
+        */
        key->key_len =
                cpu_to_be16(offsetof(struct hfsplus_attr_key, key_name) +
                                ustrlen);
@@ -101,10 +109,7 @@ void hfsplus_attr_build_key_uni(hfsplus_btree_key *key,
 
 hfsplus_attr_entry *hfsplus_alloc_attr_entry(void)
 {
-       hfsplus_attr_entry *entry;
-       entry = kmem_cache_alloc(hfsplus_attr_tree_cachep, GFP_KERNEL);
-
-       return (entry) ? entry : NULL;
+       return kmem_cache_alloc(hfsplus_attr_tree_cachep, GFP_KERNEL);
 }
 
 void hfsplus_destroy_attr_entry(hfsplus_attr_entry *entry)
@@ -119,13 +124,17 @@ static int hfsplus_attr_build_record(hfsplus_attr_entry *entry, int record_type,
                                u32 cnid, const void *value, size_t size)
 {
        if (record_type == HFSPLUS_ATTR_FORK_DATA) {
-               /* Mac OS X supports only inline data attributes.
-                  Do nothing. */
+               /*
+                * Mac OS X supports only inline data attributes.
+                * Do nothing
+                */
                memset(entry, 0, sizeof(*entry));
                return sizeof(struct hfsplus_attr_fork_data);
        } else if (record_type == HFSPLUS_ATTR_EXTENTS) {
-               /* Mac OS X supports only inline data attributes.
-                  Do nothing. */
+               /*
+                * Mac OS X supports only inline data attributes.
+                * Do nothing.
+                */
                memset(entry, 0, sizeof(*entry));
                return sizeof(struct hfsplus_attr_extents);
        } else if (record_type == HFSPLUS_ATTR_INLINE_DATA) {
@@ -139,8 +148,10 @@ static int hfsplus_attr_build_record(hfsplus_attr_entry *entry, int record_type,
                        return HFSPLUS_INVALID_ATTR_RECORD;
                entry->inline_data.length = cpu_to_be16(len);
                memcpy(entry->inline_data.raw_bytes, value, len);
-               /* Align len on two-byte boundary.
-                  It needs to add pad byte if we have odd len. */
+               /*
+                * Align len on two-byte boundary.
+                * It needs to add pad byte if we have odd len.
+                */
                len = round_up(len, 2);
                return offsetof(struct hfsplus_attr_inline_data, raw_bytes) +
                                        len;

diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h
index 56f393f906dd57dab24a7008ca67e779595c57ee..452ede01b036c4de551e2cb9a723855bf066070b 100644 (file)
--- a/fs/hfsplus/hfsplus_raw.h
+++ b/fs/hfsplus/hfsplus_raw.h
@@ -55,18 +55,20 @@ typedef __be16 hfsplus_unichr;
 #define HFSPLUS_MAX_STRLEN 255
 #define HFSPLUS_ATTR_MAX_STRLEN 127
 
-#define HFSPLUS_STRING(name, max_len)          \
-struct hfsplus_##name {                                \
-       __be16 length;                          \
-       hfsplus_unichr unicode[max_len];        \
-} __packed;                                    \
-
 /* A "string" as used in filenames, etc. */
-HFSPLUS_STRING(unistr, HFSPLUS_MAX_STRLEN)
+struct hfsplus_unistr {
+       __be16 length;
+       hfsplus_unichr unicode[HFSPLUS_MAX_STRLEN];
+} __packed;
 
-/* A "string" is used in attributes file
-   for name of extended attribute */
-HFSPLUS_STRING(attr_unistr, HFSPLUS_ATTR_MAX_STRLEN)
+/*
+ * A "string" is used in attributes file
+ * for name of extended attribute
+ */
+struct hfsplus_attr_unistr {
+       __be16 length;
+       hfsplus_unichr unicode[HFSPLUS_ATTR_MAX_STRLEN];
+} __packed;
 
 /* POSIX permissions */
 struct hfsplus_perm {