Changes in / [330df83:cd18cd1] in mainline
- Files:
-
- 3 deleted
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.common
r330df83 rcd18cd1 202 202 $(USPACE_PATH)/app/websrv/websrv \ 203 203 $(USPACE_PATH)/app/date/date \ 204 $(USPACE_PATH)/app/vdemo/vdemo \ 205 $(USPACE_PATH)/app/df/df 204 $(USPACE_PATH)/app/vdemo/vdemo 206 205 207 206 ifeq ($(CONFIG_PCC),y) -
uspace/Makefile
r330df83 rcd18cd1 80 80 app/vlaunch \ 81 81 app/vterm \ 82 app/df \83 82 srv/clipboard \ 84 83 srv/locsrv \ -
uspace/app/trace/trace.c
r330df83 rcd18cd1 724 724 o = oper_new("stat", 0, arg_def, V_ERRNO, 0, resp_def); 725 725 proto_add_oper(p, VFS_IN_STAT, o); 726 o = oper_new("statfs", 0, arg_def, V_ERRNO, 0, resp_def);727 proto_add_oper(p, VFS_IN_STATFS, o);728 726 729 727 proto_register(SERVICE_VFS, p); -
uspace/lib/c/generic/vfs/vfs.c
r330df83 rcd18cd1 43 43 #include <stdio.h> 44 44 #include <sys/stat.h> 45 #include <sys/statfs.h>46 45 #include <sys/types.h> 47 46 #include <ipc/services.h> … … 893 892 } 894 893 895 int statfs(const char *path, struct statfs *statfs)896 {897 sysarg_t rc;898 sysarg_t rc_orig;899 aid_t req;900 size_t pa_size;901 902 char *pa = absolutize(path, &pa_size);903 if (!pa)904 return ENOMEM;905 async_exch_t *exch = vfs_exchange_begin();906 907 req = async_send_0(exch, VFS_IN_STATFS, NULL);908 rc = async_data_write_start(exch, pa, pa_size);909 if (rc != EOK) {910 vfs_exchange_end(exch);911 free(pa);912 async_wait_for(req, &rc_orig);913 if (rc_orig == EOK)914 return (int) rc;915 else916 return (int) rc_orig;917 }918 rc = async_data_read_start(exch, (void *) statfs, sizeof(struct statfs));919 if (rc != EOK) {920 vfs_exchange_end(exch);921 free(pa);922 async_wait_for(req, &rc_orig);923 if (rc_orig == EOK)924 return (int) rc;925 else926 return (int) rc_orig;927 }928 vfs_exchange_end(exch);929 free(pa);930 async_wait_for(req, &rc);931 return rc;932 }933 934 894 /** @} 935 895 */ -
uspace/lib/c/include/ipc/vfs.h
r330df83 rcd18cd1 82 82 VFS_IN_WAIT_HANDLE, 83 83 VFS_IN_MTAB_GET, 84 VFS_IN_STATFS85 84 } vfs_in_request_t; 86 85 … … 99 98 VFS_OUT_LOOKUP, 100 99 VFS_OUT_DESTROY, 101 VFS_OUT_STATFS,102 100 VFS_OUT_LAST 103 101 } vfs_out_request_t; -
uspace/lib/c/include/vfs/vfs.h
r330df83 rcd18cd1 44 44 #include "vfs_mtab.h" 45 45 46 47 46 enum vfs_change_state_type { 48 47 VFS_PASS_HANDLE 49 48 }; 50 51 49 52 50 extern char *absolutize(const char *, size_t *); … … 63 61 extern async_exch_t *vfs_exchange_begin(void); 64 62 extern void vfs_exchange_end(async_exch_t *); 63 65 64 #endif 66 65 -
uspace/lib/fs/libfs.c
r330df83 rcd18cd1 45 45 #include <mem.h> 46 46 #include <sys/stat.h> 47 #include <sys/statfs.h>48 47 #include <stdlib.h> 49 48 … … 75 74 static void libfs_open_node(libfs_ops_t *, fs_handle_t, ipc_callid_t, 76 75 ipc_call_t *); 77 static void libfs_statfs(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);78 76 79 77 static void vfs_out_mounted(ipc_callid_t rid, ipc_call_t *req) … … 221 219 } 222 220 223 static void vfs_out_statfs(ipc_callid_t rid, ipc_call_t *req)224 {225 libfs_statfs(libfs_ops, reg.fs_handle, rid, req);226 }227 221 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) 228 222 { … … 282 276 case VFS_OUT_SYNC: 283 277 vfs_out_sync(callid, &call); 284 break;285 case VFS_OUT_STATFS:286 vfs_out_statfs(callid, &call);287 278 break; 288 279 default: … … 839 830 } 840 831 841 void libfs_statfs(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_callid_t rid,842 ipc_call_t *request)843 {844 service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);845 fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);846 847 fs_node_t *fn;848 int rc = ops->node_get(&fn, service_id, index);849 on_error(rc, answer_and_return(rid, rc));850 851 ipc_callid_t callid;852 size_t size;853 if ((!async_data_read_receive(&callid, &size)) ||854 (size != sizeof(struct statfs))) {855 ops->node_put(fn);856 async_answer_0(callid, EINVAL);857 async_answer_0(rid, EINVAL);858 return;859 }860 861 struct statfs statfs;862 memset(&statfs, 0, sizeof(struct statfs));863 864 if (NULL != ops->size_block)865 statfs.f_bsize = ops->size_block(service_id);866 if (NULL != ops->total_block_count)867 statfs.f_blocks = ops->total_block_count(service_id);868 if (NULL != ops->free_block_count)869 statfs.f_bfree = ops->free_block_count(service_id);870 871 ops->node_put(fn);872 873 async_data_read_finalize(callid, &statfs, sizeof(struct statfs));874 async_answer_0(rid, EOK);875 }876 877 878 832 /** Open VFS triplet. 879 833 * -
uspace/lib/fs/libfs.h
r330df83 rcd18cd1 93 93 bool (* is_file)(fs_node_t *); 94 94 service_id_t (* service_get)(fs_node_t *); 95 uint32_t (* size_block)(service_id_t);96 uint64_t (* total_block_count)(service_id_t);97 uint64_t (* free_block_count)(service_id_t);98 95 } libfs_ops_t; 99 96 -
uspace/srv/fs/cdfs/cdfs_ops.c
r330df83 rcd18cd1 625 625 } 626 626 627 static uint32_t cdfs_size_block(service_id_t service_id)628 {629 uint32_t block_size = BLOCK_SIZE;630 return block_size;631 }632 633 627 libfs_ops_t cdfs_libfs_ops = { 634 628 .root_get = cdfs_root_get, … … 647 641 .is_directory = cdfs_is_directory, 648 642 .is_file = cdfs_is_file, 649 .service_get = cdfs_service_get, 650 .size_block = cdfs_size_block 643 .service_get = cdfs_service_get 651 644 }; 652 645 -
uspace/srv/fs/exfat/exfat_ops.c
r330df83 rcd18cd1 89 89 static bool exfat_is_file(fs_node_t *node); 90 90 static service_id_t exfat_service_get(fs_node_t *node); 91 static uint32_t exfat_size_block(service_id_t);92 static uint64_t exfat_total_block_count(service_id_t);93 static uint64_t exfat_free_block_count(service_id_t);94 91 95 92 /* … … 915 912 } 916 913 917 uint32_t exfat_size_block(service_id_t service_id)918 {919 exfat_bs_t *bs;920 bs = block_bb_get(service_id);921 922 return BPC(bs);923 }924 925 uint64_t exfat_total_block_count(service_id_t service_id)926 {927 exfat_bs_t *bs;928 bs = block_bb_get(service_id);929 930 uint64_t block_count = DATA_CNT(bs);931 932 return block_count;933 }934 935 uint64_t exfat_free_block_count(service_id_t service_id)936 {937 exfat_bs_t *bs;938 bs = block_bb_get(service_id);939 940 uint64_t block_count = (DATA_CNT(bs) / 100) *941 bs->allocated_percent;942 943 return block_count;944 }945 914 946 915 /** libfs operations */ … … 961 930 .is_directory = exfat_is_directory, 962 931 .is_file = exfat_is_file, 963 .service_get = exfat_service_get, 964 .size_block = exfat_size_block, 965 .total_block_count = exfat_total_block_count, 966 .free_block_count = exfat_free_block_count 932 .service_get = exfat_service_get 967 933 }; 968 934 -
uspace/srv/fs/ext4fs/ext4fs_ops.c
r330df83 rcd18cd1 101 101 static bool ext4fs_is_file(fs_node_t *node); 102 102 static service_id_t ext4fs_service_get(fs_node_t *node); 103 static uint32_t ext4fs_size_block(service_id_t);104 static uint64_t ext4fs_total_block_count(service_id_t);105 static uint64_t ext4fs_free_block_count(service_id_t);106 103 107 104 /* Static variables */ … … 839 836 ext4fs_node_t *enode = EXT4FS_NODE(fn); 840 837 return enode->instance->service_id; 841 }842 843 uint32_t ext4fs_size_block(service_id_t service_id)844 {845 ext4fs_instance_t *inst;846 int rc = ext4fs_instance_get(service_id, &inst);847 if (rc != EOK)848 return rc;849 if (NULL == inst)850 return ENOENT;851 852 ext4_superblock_t *sb = inst->filesystem->superblock;853 uint32_t block_size = ext4_superblock_get_block_size(sb);854 855 return block_size;856 }857 858 uint64_t ext4fs_total_block_count(service_id_t service_id)859 {860 ext4fs_instance_t *inst;861 int rc = ext4fs_instance_get(service_id, &inst);862 if (rc != EOK)863 return rc;864 if (NULL == inst)865 return ENOENT;866 867 ext4_superblock_t *sb = inst->filesystem->superblock;868 uint64_t block_count = ext4_superblock_get_blocks_count(sb);869 870 return block_count;871 }872 873 uint64_t ext4fs_free_block_count(service_id_t service_id)874 {875 ext4fs_instance_t *inst;876 int rc = ext4fs_instance_get(service_id, &inst);877 if (rc != EOK)878 return rc;879 if (NULL == inst)880 return ENOENT;881 882 ext4_superblock_t *sb = inst->filesystem->superblock;883 uint64_t block_count = ext4_superblock_get_free_blocks_count(sb);884 885 return block_count;886 838 } 887 839 … … 905 857 .is_directory = ext4fs_is_directory, 906 858 .is_file = ext4fs_is_file, 907 .service_get = ext4fs_service_get, 908 .size_block = ext4fs_size_block, 909 .total_block_count = ext4fs_total_block_count, 910 .free_block_count = ext4fs_free_block_count 859 .service_get = ext4fs_service_get 911 860 }; 912 861 -
uspace/srv/fs/fat/fat_ops.c
r330df83 rcd18cd1 91 91 static bool fat_is_file(fs_node_t *node); 92 92 static service_id_t fat_service_get(fs_node_t *node); 93 static uint32_t fat_size_block(service_id_t);94 93 95 94 /* … … 844 843 } 845 844 846 uint32_t fat_size_block(service_id_t service_id)847 {848 fat_bs_t *bs;849 bs = block_bb_get(service_id);850 851 return BPC(bs);852 }853 854 845 /** libfs operations */ 855 846 libfs_ops_t fat_libfs_ops = { … … 869 860 .is_directory = fat_is_directory, 870 861 .is_file = fat_is_file, 871 .service_get = fat_service_get, 872 .size_block = fat_size_block 862 .service_get = fat_service_get 873 863 }; 874 864 -
uspace/srv/fs/mfs/mfs.h
r330df83 rcd18cd1 58 58 #endif 59 59 60 #define MFS_BMAP_START_BLOCK(sbi, bid) \61 ((bid) == BMAP_ZONE ? 2 + (sbi)->ibmap_blocks : 2)62 63 #define MFS_BMAP_SIZE_BITS(sbi, bid) \64 ((bid) == BMAP_ZONE ? (sbi)->nzones - (sbi)->firstdatazone - 1 : \65 (sbi)->ninodes - 1)66 67 #define MFS_BMAP_SIZE_BLOCKS(sbi, bid) \68 ((bid) == BMAP_ZONE ? (sbi)->zbmap_blocks : (sbi)->ibmap_blocks)69 70 60 typedef uint32_t bitchunk_t; 71 61 … … 211 201 mfs_free_zone(struct mfs_instance *inst, uint32_t zone); 212 202 213 extern int214 mfs_count_free_zones(struct mfs_instance *inst, uint32_t *zones);215 216 extern int217 mfs_count_free_inodes(struct mfs_instance *inst, uint32_t *inodes);218 219 220 203 /* mfs_utils.c */ 221 204 extern uint16_t -
uspace/srv/fs/mfs/mfs_balloc.c
r330df83 rcd18cd1 44 44 mfs_alloc_bit(struct mfs_instance *inst, uint32_t *idx, bmap_id_t bid); 45 45 46 static int47 mfs_count_free_bits(struct mfs_instance *inst, bmap_id_t bid, uint32_t *free);48 49 50 46 /**Allocate a new inode. 51 47 * … … 106 102 107 103 return mfs_free_bit(inst, zone, BMAP_ZONE); 108 }109 110 /** Count the number of free zones111 *112 * @param inst Pointer to the instance structure.113 * @param zones Pointer to the memory location where the result114 * will be stored.115 *116 * @return EOK on success or a negative error code.117 */118 int119 mfs_count_free_zones(struct mfs_instance *inst, uint32_t *zones)120 {121 return mfs_count_free_bits(inst, BMAP_ZONE, zones);122 }123 124 /** Count the number of free inodes125 *126 * @param inst Pointer to the instance structure.127 * @param zones Pointer to the memory location where the result128 * will be stored.129 *130 * @return EOK on success or a negative error code.131 */132 133 int134 mfs_count_free_inodes(struct mfs_instance *inst, uint32_t *inodes)135 {136 return mfs_count_free_bits(inst, BMAP_INODE, inodes);137 }138 139 /** Count the number of free bits in a bitmap140 *141 * @param inst Pointer to the instance structure.142 * @param bid Type of the bitmap (inode or zone).143 * @param free Pointer to the memory location where the result144 * will be stores.145 *146 * @return EOK on success or a negative error code.147 */148 static int149 mfs_count_free_bits(struct mfs_instance *inst, bmap_id_t bid, uint32_t *free)150 {151 int r;152 unsigned start_block;153 unsigned long nblocks;154 unsigned long nbits;155 unsigned long block;156 unsigned long free_bits = 0;157 bitchunk_t chunk;158 size_t const bitchunk_bits = sizeof(bitchunk_t) * 8;159 block_t *b;160 struct mfs_sb_info *sbi = inst->sbi;161 162 start_block = MFS_BMAP_START_BLOCK(sbi, bid);163 nblocks = MFS_BMAP_SIZE_BLOCKS(sbi, bid);164 nbits = MFS_BMAP_SIZE_BITS(sbi, bid);165 166 for (block = 0; block < nblocks; ++block) {167 r = block_get(&b, inst->service_id, block + start_block,168 BLOCK_FLAGS_NONE);169 if (r != EOK)170 return r;171 172 size_t i;173 bitchunk_t *data = (bitchunk_t *) b->data;174 175 /* Read the bitmap block, chunk per chunk,176 * counting the zero bits.177 */178 for (i = 0; i < sbi->block_size / sizeof(bitchunk_t); ++i) {179 chunk = conv32(sbi->native, data[i]);180 181 size_t bit;182 for (bit = 0; bit < bitchunk_bits && nbits > 0;183 ++bit, --nbits) {184 if (!(chunk & (1 << bit)))185 free_bits++;186 }187 188 if (nbits == 0)189 break;190 }191 192 r = block_put(b);193 if (r != EOK)194 return r;195 }196 197 *free = free_bits;198 assert(nbits == 0);199 200 return EOK;201 104 } 202 105 … … 221 124 sbi = inst->sbi; 222 125 223 start_block = MFS_BMAP_START_BLOCK(sbi, bid);224 225 126 if (bid == BMAP_ZONE) { 226 127 search = &sbi->zsearch; 128 start_block = 2 + sbi->ibmap_blocks; 227 129 if (idx > sbi->nzones) { 228 130 printf(NAME ": Error! Trying to free beyond the " … … 233 135 /* bid == BMAP_INODE */ 234 136 search = &sbi->isearch; 137 start_block = 2; 235 138 if (idx > sbi->ninodes) { 236 139 printf(NAME ": Error! Trying to free beyond the " … … 289 192 sbi = inst->sbi; 290 193 291 start_block = MFS_BMAP_START_BLOCK(sbi, bid);292 limit = MFS_BMAP_SIZE_BITS(sbi, bid);293 nblocks = MFS_BMAP_SIZE_BLOCKS(sbi, bid);294 295 194 if (bid == BMAP_ZONE) { 296 195 search = &sbi->zsearch; 196 start_block = 2 + sbi->ibmap_blocks; 197 nblocks = sbi->zbmap_blocks; 198 limit = sbi->nzones - sbi->firstdatazone - 1; 297 199 } else { 298 200 /* bid == BMAP_INODE */ 299 201 search = &sbi->isearch; 202 start_block = 2; 203 nblocks = sbi->ibmap_blocks; 204 limit = sbi->ninodes - 1; 300 205 } 301 206 bits_per_block = sbi->block_size * 8; -
uspace/srv/fs/mfs/mfs_ops.c
r330df83 rcd18cd1 64 64 static int mfs_check_sanity(struct mfs_sb_info *sbi); 65 65 static bool is_power_of_two(uint32_t n); 66 static uint32_t mfs_size_block(service_id_t service_id);67 static uint64_t mfs_total_block_count(service_id_t service_id);68 static uint64_t mfs_free_block_count(service_id_t service_id);69 66 70 67 static hash_table_t open_nodes; … … 87 84 .destroy = mfs_destroy_node, 88 85 .has_children = mfs_has_children, 89 .lnkcnt_get = mfs_lnkcnt_get, 90 .size_block = mfs_size_block, 91 .total_block_count = mfs_total_block_count, 92 .free_block_count = mfs_free_block_count 86 .lnkcnt_get = mfs_lnkcnt_get 93 87 }; 94 88 … … 1135 1129 } 1136 1130 1137 static uint32_t1138 mfs_size_block(service_id_t service_id)1139 {1140 uint32_t block_size;1141 1142 struct mfs_instance *inst;1143 int rc = mfs_instance_get(service_id, &inst);1144 if (rc != EOK)1145 return rc;1146 if (NULL == inst)1147 return ENOENT;1148 1149 block_size = inst->sbi->block_size;1150 1151 return block_size;1152 }1153 1154 static uint64_t1155 mfs_total_block_count(service_id_t service_id)1156 {1157 uint64_t block_total;1158 1159 struct mfs_instance *inst;1160 int rc = mfs_instance_get(service_id, &inst);1161 if (rc != EOK)1162 return rc;1163 1164 if (NULL == inst)1165 return ENOENT;1166 1167 block_total = (uint64_t) MFS_BMAP_SIZE_BITS(inst->sbi, BMAP_ZONE);1168 1169 return block_total;1170 }1171 1172 static uint64_t1173 mfs_free_block_count(service_id_t service_id)1174 {1175 uint32_t block_free;1176 1177 struct mfs_instance *inst;1178 int rc = mfs_instance_get(service_id, &inst);1179 if (rc != EOK)1180 return rc;1181 1182 if (NULL == inst)1183 return ENOENT;1184 1185 mfs_count_free_zones(inst, &block_free);1186 1187 return (uint64_t)block_free;1188 }1189 1190 1131 vfs_out_ops_t mfs_ops = { 1191 1132 .mounted = mfs_mounted, -
uspace/srv/fs/udf/udf_ops.c
r330df83 rcd18cd1 249 249 } 250 250 251 static uint32_t udf_size_block(service_id_t service_id)252 {253 udf_instance_t *instance;254 int rc = fs_instance_get(service_id, (void **) &instance);255 if (rc != EOK)256 return rc;257 258 if (NULL == instance)259 return ENOENT;260 261 return instance->volumes[DEFAULT_VOL].logical_block_size;262 }263 264 251 libfs_ops_t udf_libfs_ops = { 265 252 .root_get = udf_root_get, … … 278 265 .is_directory = udf_is_directory, 279 266 .is_file = udf_is_file, 280 .service_get = udf_service_get, 281 .size_block = udf_size_block 267 .service_get = udf_service_get 282 268 }; 283 269 -
uspace/srv/vfs/vfs.c
r330df83 rcd18cd1 130 130 vfs_get_mtab(callid, &call); 131 131 break; 132 case VFS_IN_STATFS:133 vfs_statfs(callid, &call);134 break;135 132 default: 136 133 async_answer_0(callid, ENOTSUP); -
uspace/srv/vfs/vfs.h
r330df83 rcd18cd1 222 222 extern void vfs_wait_handle(ipc_callid_t, ipc_call_t *); 223 223 extern void vfs_get_mtab(ipc_callid_t, ipc_call_t *); 224 extern void vfs_statfs(ipc_callid_t, ipc_call_t *);225 224 226 225 #endif -
uspace/srv/vfs/vfs_ops.c
r330df83 rcd18cd1 1418 1418 } 1419 1419 1420 void vfs_statfs(ipc_callid_t rid, ipc_call_t *request)1421 {1422 char *path;1423 int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL);1424 if (rc != EOK) {1425 async_answer_0(rid, rc);1426 return;1427 }1428 1429 ipc_callid_t callid;1430 if (!async_data_read_receive(&callid, NULL)) {1431 free(path);1432 async_answer_0(callid, EINVAL);1433 async_answer_0(rid, EINVAL);1434 return;1435 }1436 1437 vfs_lookup_res_t lr;1438 fibril_rwlock_read_lock(&namespace_rwlock);1439 rc = vfs_lookup_internal(path, L_NONE, &lr, NULL);1440 free(path);1441 if (rc != EOK) {1442 fibril_rwlock_read_unlock(&namespace_rwlock);1443 async_answer_0(callid, rc);1444 async_answer_0(rid, rc);1445 return;1446 }1447 vfs_node_t *node = vfs_node_get(&lr);1448 if (!node) {1449 fibril_rwlock_read_unlock(&namespace_rwlock);1450 async_answer_0(callid, ENOMEM);1451 async_answer_0(rid, ENOMEM);1452 return;1453 }1454 1455 fibril_rwlock_read_unlock(&namespace_rwlock);1456 1457 async_exch_t *exch = vfs_exchange_grab(node->fs_handle);1458 1459 aid_t msg;1460 msg = async_send_3(exch, VFS_OUT_STATFS, node->service_id,1461 node->index, false, NULL);1462 async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);1463 1464 vfs_exchange_release(exch);1465 1466 sysarg_t rv;1467 async_wait_for(msg, &rv);1468 1469 async_answer_0(rid, rv);1470 1471 vfs_node_put(node);1472 }1473 1474 1420 /** 1475 1421 * @}
Note:
See TracChangeset
for help on using the changeset viewer.