diff --git a/headers/posix/sys/param.h b/headers/posix/sys/param.h index a072674c7b..c5e5ea8b0e 100644 --- a/headers/posix/sys/param.h +++ b/headers/posix/sys/param.h @@ -14,6 +14,7 @@ #define MAXPATHLEN PATH_MAX #define MAXSYMLINKS SYMLOOP_MAX #define NOFILE OPEN_MAX +#define DEV_BSIZE 512 #ifndef MIN diff --git a/headers/private/fs_shell/fssh_api_wrapper.h b/headers/private/fs_shell/fssh_api_wrapper.h index 6b3925463d..65a62c22e8 100644 --- a/headers/private/fs_shell/fssh_api_wrapper.h +++ b/headers/private/fs_shell/fssh_api_wrapper.h @@ -154,6 +154,10 @@ #define B_MIME_TYPE_LENGTH FSSH_B_MIME_TYPE_LENGTH #define B_MAX_SYMLINKS FSSH_B_MAX_SYMLINKS +// Params + +#define DEV_BSIZE FSSH_DEV_BSIZE + // Open Modes #define B_READ_ONLY FSSH_B_READ_ONLY #define B_WRITE_ONLY FSSH_B_WRITE_ONLY diff --git a/headers/private/fs_shell/fssh_defs.h b/headers/private/fs_shell/fssh_defs.h index 5bba3e0af1..80ac5da782 100644 --- a/headers/private/fs_shell/fssh_defs.h +++ b/headers/private/fs_shell/fssh_defs.h @@ -24,6 +24,9 @@ #define FSSH_B_MIME_TYPE_LENGTH (FSSH_B_ATTR_NAME_LENGTH - 15) #define FSSH_B_MAX_SYMLINKS 16 +// Params +#define FSSH_DEV_BSIZE 512 + // Open Modes #define FSSH_B_READ_ONLY FSSH_O_RDONLY // read only #define FSSH_B_WRITE_ONLY FSSH_O_WRONLY // write only diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp index b2aa325b12..8fbc685f19 100644 --- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp @@ -90,7 +90,7 @@ fill_stat_buffer(Inode* inode, struct stat& stat) } else stat.st_size = inode->Size(); - stat.st_blocks = inode->AllocatedSize() / 512; + stat.st_blocks = inode->AllocatedSize() / DEV_BSIZE; } @@ -2226,7 +2226,7 @@ bfs_stat_index(fs_volume* _volume, const char* name, struct stat* stat) stat->st_mode = node.Mode(); stat->st_size = node.data.Size(); - stat->st_blocks = index.Node()->AllocatedSize() / 512; + stat->st_blocks = index.Node()->AllocatedSize() / DEV_BSIZE; stat->st_nlink = 1; stat->st_blksize = 65536; diff --git a/src/add-ons/kernel/file_systems/btrfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/btrfs/kernel_interface.cpp index cb2cc085aa..fc4c0ffda1 100644 --- a/src/add-ons/kernel/file_systems/btrfs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/btrfs/kernel_interface.cpp @@ -431,7 +431,7 @@ btrfs_read_stat(fs_volume* _volume, fs_vnode* _node, struct stat* stat) inode->GetCreationTime(stat->st_crtim); stat->st_size = inode->Size(); - stat->st_blocks = (inode->Size() + 511) / 512; + stat->st_blocks = (inode->Size() + DEV_BSIZE - 1) / DEV_BSIZE; return B_OK; } diff --git a/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp b/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp index 7e00236e67..9d228136e2 100644 --- a/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp @@ -519,7 +519,7 @@ fill_stat_buffer(Volume* volume, Inode* inode, Attribute* attribute, stat.st_type = attribute->Type(); } else { stat.st_size = inode->Size() + sizeof(wav_header); - stat.st_blocks = inode->Size() / 512; + stat.st_blocks = inode->Size() / DEV_BSIZE; stat.st_mode = inode->Type(); stat.st_type = 0; } diff --git a/src/add-ons/kernel/file_systems/exfat/kernel_interface.cpp b/src/add-ons/kernel/file_systems/exfat/kernel_interface.cpp index 2145e65b89..b4342612a7 100644 --- a/src/add-ons/kernel/file_systems/exfat/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/exfat/kernel_interface.cpp @@ -445,7 +445,7 @@ exfat_read_stat(fs_volume* _volume, fs_vnode* _node, struct stat* stat) inode->GetCreationTime(stat->st_crtim); stat->st_size = inode->Size(); - stat->st_blocks = (inode->Size() + 511) / 512; + stat->st_blocks = (inode->Size() + DEV_BSIZE - 1) / DEV_BSIZE; return B_OK; } diff --git a/src/add-ons/kernel/file_systems/fat/bsd/sys/param.h b/src/add-ons/kernel/file_systems/fat/bsd/sys/param.h index caadea751e..143cba2014 100644 --- a/src/add-ons/kernel/file_systems/fat/bsd/sys/param.h +++ b/src/add-ons/kernel/file_systems/fat/bsd/sys/param.h @@ -48,17 +48,6 @@ #include "sys/types.h" -#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ -#define DEV_BSIZE (1 << DEV_BSHIFT) - -#ifndef MAXPHYS /* max raw I/O transfer size */ -#ifdef __ILP32__ -#define MAXPHYS (128 * 1024) -#else -#define MAXPHYS (1024 * 1024) -#endif -#endif - /* * Machine-independent constants (some used in following include files). */ diff --git a/src/add-ons/kernel/file_systems/fat/kernel_interface.cpp b/src/add-ons/kernel/file_systems/fat/kernel_interface.cpp index d89832aaf2..a7b84b10b2 100644 --- a/src/add-ons/kernel/file_systems/fat/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/fat/kernel_interface.cpp @@ -1783,7 +1783,7 @@ dosfs_rstat(fs_volume* volume, fs_vnode* vnode, struct stat* stat) fattime2timespec(fatNode->de_CDate, fatNode->de_CTime, fatNode->de_CHun, 1, &stat->st_crtim); - stat->st_blocks = howmany(fatNode->de_FileSize, 512); + stat->st_blocks = howmany(fatNode->de_FileSize, DEV_BSIZE); RETURN_ERROR(status); } diff --git a/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp b/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp index 4d740bbfb1..52ca4c7250 100644 --- a/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp @@ -496,7 +496,7 @@ fs_read_stat(fs_volume* _volume, fs_vnode* _node, struct stat* st) // Same for file/dir in ISO9660 st->st_size = node->dataLen[FS_DATA_FORMAT]; - st->st_blocks = (st->st_size + 511) / 512; + st->st_blocks = (st->st_size + DEV_BSIZE) / DEV_BSIZE; if (ConvertRecDate(&(node->recordDate), &time) == B_NO_ERROR) { st->st_ctim.tv_sec = st->st_mtim.tv_sec = st->st_atim.tv_sec = time; st->st_ctim.tv_nsec = st->st_mtim.tv_nsec = st->st_atim.tv_nsec = 0; diff --git a/src/add-ons/kernel/file_systems/layers/attribute_overlay/attribute_overlay.cpp b/src/add-ons/kernel/file_systems/layers/attribute_overlay/attribute_overlay.cpp index bab61b6bf6..7a3119f407 100644 --- a/src/add-ons/kernel/file_systems/layers/attribute_overlay/attribute_overlay.cpp +++ b/src/add-ons/kernel/file_systems/layers/attribute_overlay/attribute_overlay.cpp @@ -1087,7 +1087,7 @@ AttributeEntry::ReadStat(struct stat *stat) stat->st_mode = S_ATTR | 0x0777; stat->st_type = fEntry->type; stat->st_atime = stat->st_mtime = stat->st_crtime = time(NULL); - stat->st_blocks = (fEntry->size + stat->st_blksize - 1) / stat->st_blksize; + stat->st_blocks = (fEntry->size + DEV_BSIZE - 1) / DEV_BSIZE; return B_OK; } diff --git a/src/add-ons/kernel/file_systems/layers/write_overlay/write_overlay.cpp b/src/add-ons/kernel/file_systems/layers/write_overlay/write_overlay.cpp index f8a224d1d0..1f1ab2d408 100644 --- a/src/add-ons/kernel/file_systems/layers/write_overlay/write_overlay.cpp +++ b/src/add-ons/kernel/file_systems/layers/write_overlay/write_overlay.cpp @@ -502,7 +502,7 @@ OverlayInode::ReadStat(struct stat *stat) _PopulateStat(); memcpy(stat, &fStat, sizeof(struct stat)); - stat->st_blocks = (stat->st_size + stat->st_blksize - 1) / stat->st_blksize; + stat->st_blocks = (stat->st_size + DEV_BSIZE - 1) / DEV_BSIZE; return B_OK; } diff --git a/src/add-ons/kernel/file_systems/nfs4/Inode.cpp b/src/add-ons/kernel/file_systems/nfs4/Inode.cpp index 2bc8fc2fba..8f772eef58 100644 --- a/src/add-ons/kernel/file_systems/nfs4/Inode.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/Inode.cpp @@ -642,8 +642,8 @@ Inode::GetStat(struct stat* st, OpenAttrCookie* attr) delete[] values; st->st_blksize = fFileSystem->Root()->IOSize(); - st->st_blocks = st->st_size / st->st_blksize; - st->st_blocks += st->st_size % st->st_blksize == 0 ? 0 : 1; + st->st_blocks = st->st_size / DEV_BSIZE; + st->st_blocks += (st->st_size % DEV_BSIZE) == 0 ? 0 : 1; return B_OK; } diff --git a/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp index 946c29b1b7..e66058267c 100644 --- a/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp @@ -385,7 +385,7 @@ packagefs_read_stat(fs_volume* fsVolume, fs_vnode* fsNode, struct stat* st) st->st_ctim = st->st_mtim; // TODO: Perhaps manage a changed time (particularly for directories)? st->st_crtim = st->st_mtim; - st->st_blocks = (st->st_size + 511) / 512; + st->st_blocks = (st->st_size + DEV_BSIZE - 1) / DEV_BSIZE; return B_OK; } diff --git a/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp index db7bcf7372..7a0bcef485 100644 --- a/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp @@ -700,7 +700,7 @@ ramfs_read_stat(fs_volume* _volume, fs_vnode* _node, struct stat *st) st->st_gid = node->GetGID(); st->st_size = node->GetSize(); st->st_blksize = kOptimalIOSize; - st->st_blocks = (st->st_size + st->st_blksize - 1) / st->st_blksize; + st->st_blocks = (st->st_size + DEV_BSIZE - 1) / DEV_BSIZE; st->st_atime = node->GetATime(); st->st_mtime = node->GetMTime(); st->st_ctime = node->GetCTime(); diff --git a/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp b/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp index d28bc4684c..44e02abee7 100644 --- a/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp @@ -291,7 +291,7 @@ udf_read_stat(fs_volume *_volume, fs_vnode *node, struct stat *stat) stat->st_mode = icb->Mode(); stat->st_size = icb->Length(); - stat->st_blocks = (stat->st_size + 511) / 512; + stat->st_blocks = (stat->st_size + DEV_BSIZE - 1) / DEV_BSIZE; // File times. For now, treat the modification time as creation // time as well, since true creation time is an optional extended