fs-udf: Improve six size determinations

[linux.git] / fs / udf / inode.c

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 18fdb9d90812a2849376de612ac2a52bc487324e..2bdb68215771cf70b830584607b65a2fa021e6e6 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -114,7 +114,7 @@ static void udf_update_extent_cache(struct inode *inode, loff_t estart,
        __udf_clear_extent_cache(inode);
        if (pos->bh)
                get_bh(pos->bh);
-       memcpy(&iinfo->cached_extent.epos, pos, sizeof(struct extent_position));
+       memcpy(&iinfo->cached_extent.epos, pos, sizeof(*pos));
        iinfo->cached_extent.lstart = estart;
        switch (iinfo->i_alloc_type) {
        case ICBTAG_FLAG_AD_SHORT:
@@ -1703,7 +1703,7 @@ static int udf_update_inode(struct inode *inode, int do_sync)
                        dsea->impUseLength = cpu_to_le32(sizeof(struct regid));
                }
                eid = (struct regid *)dsea->impUse;
-               memset(eid, 0, sizeof(struct regid));
+               memset(eid, 0, sizeof(*eid));
                strcpy(eid->ident, UDF_ID_DEVELOPER);
                eid->identSuffix[0] = UDF_OS_CLASS_UNIX;
                eid->identSuffix[1] = UDF_OS_ID_LINUX;
@@ -1754,7 +1754,7 @@ static int udf_update_inode(struct inode *inode, int do_sync)
                udf_time_to_disk_stamp(&efe->createTime, iinfo->i_crtime);
                udf_time_to_disk_stamp(&efe->attrTime, inode->i_ctime);
 
-               memset(&(efe->impIdent), 0, sizeof(struct regid));
+               memset(&(efe->impIdent), 0, sizeof(efe->impIdent));
                strcpy(efe->impIdent.ident, UDF_ID_DEVELOPER);
                efe->impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX;
                efe->impIdent.identSuffix[1] = UDF_OS_ID_LINUX;