cifs: refactor new_inode() calls and inode initialization

[safe/jmp/linux-2.6] / fs / udf / misc.c

diff --git a/fs/udf/misc.c b/fs/udf/misc.c
index 2af4470..84bf0fd 100644 (file)
--- a/fs/udf/misc.c
+++ b/fs/udf/misc.c
@@ -23,8 +23,8 @@
 
 #include <linux/fs.h>
 #include <linux/string.h>
-#include <linux/udf_fs.h>
 #include <linux/buffer_head.h>
+#include <linux/crc-itu-t.h>
 
 #include "udf_i.h"
 #include "udf_sb.h"
@@ -51,17 +51,18 @@ struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size,
        uint8_t *ea = NULL, *ad = NULL;
        int offset;
        uint16_t crclen;
+       struct udf_inode_info *iinfo = UDF_I(inode);
 
-       ea = UDF_I(inode)->i_ext.i_data;
-       if (UDF_I(inode)->i_lenEAttr) {
-               ad = UDF_I(inode)->i_ext.i_data + UDF_I(inode)->i_lenEAttr;
+       ea = iinfo->i_ext.i_data;
+       if (iinfo->i_lenEAttr) {
+               ad = iinfo->i_ext.i_data + iinfo->i_lenEAttr;
        } else {
                ad = ea;
                size += sizeof(struct extendedAttrHeaderDesc);
        }
 
        offset = inode->i_sb->s_blocksize - udf_file_entry_alloc_offset(inode) -
-               UDF_I(inode)->i_lenAlloc;
+               iinfo->i_lenAlloc;
 
        /* TODO - Check for FreeEASpace */
 
@@ -69,21 +70,21 @@ struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size,
                struct extendedAttrHeaderDesc *eahd;
                eahd = (struct extendedAttrHeaderDesc *)ea;
 
-               if (UDF_I(inode)->i_lenAlloc)
-                       memmove(&ad[size], ad, UDF_I(inode)->i_lenAlloc);
+               if (iinfo->i_lenAlloc)
+                       memmove(&ad[size], ad, iinfo->i_lenAlloc);
 
-               if (UDF_I(inode)->i_lenEAttr) {
+               if (iinfo->i_lenEAttr) {
                        /* check checksum/crc */
                        if (eahd->descTag.tagIdent !=
                                        cpu_to_le16(TAG_IDENT_EAHD) ||
                            le32_to_cpu(eahd->descTag.tagLocation) !=
-                                       UDF_I(inode)->i_location.logicalBlockNum)
+                                       iinfo->i_location.logicalBlockNum)
                                return NULL;
                } else {
                        struct udf_sb_info *sbi = UDF_SB(inode->i_sb);
 
                        size -= sizeof(struct extendedAttrHeaderDesc);
-                       UDF_I(inode)->i_lenEAttr +=
+                       iinfo->i_lenEAttr +=
                                sizeof(struct extendedAttrHeaderDesc);
                        eahd->descTag.tagIdent = cpu_to_le16(TAG_IDENT_EAHD);
                        if (sbi->s_udfrev >= 0x0200)
@@ -93,15 +94,15 @@ struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size,
                        eahd->descTag.tagSerialNum =
                                        cpu_to_le16(sbi->s_serial_number);
                        eahd->descTag.tagLocation = cpu_to_le32(
-                               UDF_I(inode)->i_location.logicalBlockNum);
+                                       iinfo->i_location.logicalBlockNum);
                        eahd->impAttrLocation = cpu_to_le32(0xFFFFFFFF);
                        eahd->appAttrLocation = cpu_to_le32(0xFFFFFFFF);
                }
 
-               offset = UDF_I(inode)->i_lenEAttr;
+               offset = iinfo->i_lenEAttr;
                if (type < 2048) {
                        if (le32_to_cpu(eahd->appAttrLocation) <
-                                       UDF_I(inode)->i_lenEAttr) {
+                                       iinfo->i_lenEAttr) {
                                uint32_t aal =
                                        le32_to_cpu(eahd->appAttrLocation);
                                memmove(&ea[offset - aal + size],
@@ -111,7 +112,7 @@ struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size,
                                                cpu_to_le32(aal + size);
                        }
                        if (le32_to_cpu(eahd->impAttrLocation) <
-                                       UDF_I(inode)->i_lenEAttr) {
+                                       iinfo->i_lenEAttr) {
                                uint32_t ial =
                                        le32_to_cpu(eahd->impAttrLocation);
                                memmove(&ea[offset - ial + size],
@@ -122,7 +123,7 @@ struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size,
                        }
                } else if (type < 65536) {
                        if (le32_to_cpu(eahd->appAttrLocation) <
-                                       UDF_I(inode)->i_lenEAttr) {
+                                       iinfo->i_lenEAttr) {
                                uint32_t aal =
                                        le32_to_cpu(eahd->appAttrLocation);
                                memmove(&ea[offset - aal + size],
@@ -135,10 +136,10 @@ struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size,
                /* rewrite CRC + checksum of eahd */
                crclen = sizeof(struct extendedAttrHeaderDesc) - sizeof(tag);
                eahd->descTag.descCRCLength = cpu_to_le16(crclen);
-               eahd->descTag.descCRC = cpu_to_le16(udf_crc((char *)eahd +
-                                               sizeof(tag), crclen, 0));
+               eahd->descTag.descCRC = cpu_to_le16(crc_itu_t(0, (char *)eahd +
+                                               sizeof(tag), crclen));
                eahd->descTag.tagChecksum = udf_tag_checksum(&eahd->descTag);
-               UDF_I(inode)->i_lenEAttr += size;
+               iinfo->i_lenEAttr += size;
                return (struct genericFormat *)&ea[offset];
        }
        if (loc & 0x02)
@@ -153,10 +154,11 @@ struct genericFormat *udf_get_extendedattr(struct inode *inode, uint32_t type,
        struct genericFormat *gaf;
        uint8_t *ea = NULL;
        uint32_t offset;
+       struct udf_inode_info *iinfo = UDF_I(inode);
 
-       ea = UDF_I(inode)->i_ext.i_data;
+       ea = iinfo->i_ext.i_data;
 
-       if (UDF_I(inode)->i_lenEAttr) {
+       if (iinfo->i_lenEAttr) {
                struct extendedAttrHeaderDesc *eahd;
                eahd = (struct extendedAttrHeaderDesc *)ea;
 
@@ -164,7 +166,7 @@ struct genericFormat *udf_get_extendedattr(struct inode *inode, uint32_t type,
                if (eahd->descTag.tagIdent !=
                                cpu_to_le16(TAG_IDENT_EAHD) ||
                    le32_to_cpu(eahd->descTag.tagLocation) !=
-                               UDF_I(inode)->i_location.logicalBlockNum)
+                               iinfo->i_location.logicalBlockNum)
                        return NULL;
 
                if (type < 2048)
@@ -174,7 +176,7 @@ struct genericFormat *udf_get_extendedattr(struct inode *inode, uint32_t type,
                else
                        offset = le32_to_cpu(eahd->appAttrLocation);
 
-               while (offset < UDF_I(inode)->i_lenEAttr) {
+               while (offset < iinfo->i_lenEAttr) {
                        gaf = (struct genericFormat *)&ea[offset];
                        if (le32_to_cpu(gaf->attrType) == type &&
                                        gaf->attrSubtype == subtype)
@@ -202,16 +204,15 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block,
 {
        tag *tag_p;
        struct buffer_head *bh = NULL;
-       struct udf_sb_info *sbi = UDF_SB(sb);
 
        /* Read the block */
        if (block == 0xFFFFFFFF)
                return NULL;
 
-       bh = udf_tread(sb, block + sbi->s_session);
+       bh = udf_tread(sb, block);
        if (!bh) {
                udf_debug("block=%d, location=%d: read failed\n",
-                         block + sbi->s_session, location);
+                         block, location);
                return NULL;
        }
 
@@ -221,8 +222,7 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block,
 
        if (location != le32_to_cpu(tag_p->tagLocation)) {
                udf_debug("location mismatch block %u, tag %u != %u\n",
-                         block + sbi->s_session,
-                         le32_to_cpu(tag_p->tagLocation), location);
+                         block, le32_to_cpu(tag_p->tagLocation), location);
                goto error_out;
        }
 
@@ -242,13 +242,13 @@ struct buffer_head *udf_read_tagged(struct super_block *sb, uint32_t block,
 
        /* Verify the descriptor CRC */
        if (le16_to_cpu(tag_p->descCRCLength) + sizeof(tag) > sb->s_blocksize ||
-           le16_to_cpu(tag_p->descCRC) == udf_crc(bh->b_data + sizeof(tag),
-                                       le16_to_cpu(tag_p->descCRCLength), 0))
+           le16_to_cpu(tag_p->descCRC) == crc_itu_t(0,
+                                       bh->b_data + sizeof(tag),
+                                       le16_to_cpu(tag_p->descCRCLength)))
                return bh;
 
-       udf_debug("Crc failure block %d: crc = %d, crclen = %d\n",
-                 block + sbi->s_session, le16_to_cpu(tag_p->descCRC),
-                 le16_to_cpu(tag_p->descCRCLength));
+       udf_debug("Crc failure block %d: crc = %d, crclen = %d\n", block,
+           le16_to_cpu(tag_p->descCRC), le16_to_cpu(tag_p->descCRCLength));
 
 error_out:
        brelse(bh);
@@ -268,7 +268,7 @@ void udf_update_tag(char *data, int length)
        length -= sizeof(tag);
 
        tptr->descCRCLength = cpu_to_le16(length);
-       tptr->descCRC = cpu_to_le16(udf_crc(data + sizeof(tag), length, 0));
+       tptr->descCRC = cpu_to_le16(crc_itu_t(0, data + sizeof(tag), length));
        tptr->tagChecksum = udf_tag_checksum(tptr);
 }