diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /fs/ntfs | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/ntfstypes.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index 7fcc86754..8a5e404b1 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c @@ -612,7 +612,7 @@ int ntfs_vcn_to_lcn(ntfs_inode *ino,int vcn) return 0; for(rnum=0;rnum<data->d.r.len && - vcn>data->d.r.runlist[rnum].len;rnum++) + vcn>=data->d.r.runlist[rnum].len;rnum++) vcn-=data->d.r.runlist[rnum].len; return data->d.r.runlist[rnum].cluster+vcn; diff --git a/fs/ntfs/ntfstypes.h b/fs/ntfs/ntfstypes.h index 075a60806..56c295714 100644 --- a/fs/ntfs/ntfstypes.h +++ b/fs/ntfs/ntfstypes.h @@ -72,11 +72,11 @@ typedef __kernel_mode_t ntmode_t; #endif #ifndef NTFS_UID_T #define NTFS_UID_T -typedef __kernel_uid_t ntfs_uid_t; +typedef uid_t ntfs_uid_t; #endif #ifndef NTFS_GID_T #define NTFS_GID_T -typedef __kernel_gid_t ntfs_gid_t; +typedef gid_t ntfs_gid_t; #endif #ifndef NTFS_SIZE_T #define NTFS_SIZE_T |