diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /fs/ntfs/attr.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'fs/ntfs/attr.c')
| -rw-r--r-- | fs/ntfs/attr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ntfs/attr.c b/fs/ntfs/attr.c index a796f136c..7c6a64e0d 100644 --- a/fs/ntfs/attr.c +++ b/fs/ntfs/attr.c @@ -56,7 +56,7 @@ new_attr(ntfs_inode *ino,int type,void *name,int namelen,int *pos, int *found) } } if(do_insert) - ntfs_memcpy(ino->attrs+i+1,ino->attrs+i,(ino->attr_count-i)* + ntfs_memmove(ino->attrs+i+1,ino->attrs+i,(ino->attr_count-i)* sizeof(ntfs_attribute)); ino->attr_count++; ino->attrs[i].type=type; @@ -95,7 +95,7 @@ ntfs_insert_run(ntfs_attribute *attr,int cnum,int cluster,int len) } } if(attr->d.r.len>cnum) - ntfs_memcpy(attr->d.r.runlist+cnum+1,attr->d.r.runlist+cnum, + ntfs_memmove(attr->d.r.runlist+cnum+1,attr->d.r.runlist+cnum, (attr->d.r.len-cnum)*sizeof(ntfs_runlist)); attr->d.r.runlist[cnum].cluster=cluster; attr->d.r.runlist[cnum].len=len; @@ -399,7 +399,7 @@ int ntfs_read_compressed(ntfs_inode *ino, ntfs_attribute *attr, int offset, clustersize=ino->vol->clustersize; /* starting cluster of potential chunk there are three situations: - a) in a large uncompressable or sparse chunk, + a) in a large uncompressible or sparse chunk, s_vcn is in the middle of a run b) s_vcn is right on a run border c) when several runs make a chunk, s_vcn is before the chunks |