nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix partition inode type and stat method.

This commit is contained in:
Jonas 'Sortie' Termansen 2015-02-16 14:23:59 +01:00
parent 472e31a9a1
commit d511bfb75b
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/partition.cpp
View File

@ -1,6 +1,6 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2013.
Copyright(C) Jonas 'Sortie' Termansen 2013, 2015.
This file is part of Sortix.
@ -27,8 +27,10 @@
#include <errno.h>
#include <sortix/seek.h>
#include <sortix/stat.h>
#include <sortix/kernel/inode.h>
#include <sortix/kernel/ioctx.h>
#include <sortix/kernel/kernel.h>
#include <sortix/kernel/refcount.h>
@ -40,11 +42,11 @@ Partition::Partition(Ref<Inode> inner_inode, off_t start, off_t length)
{
this->dev = (dev_t) this;
this->ino = (ino_t) this;
this->type = inner_inode->type;
this->inode_type = INODE_TYPE_FILE;
this->inner_inode = inner_inode;
this->start = start;
this->length = length;
this->stat_size = length;
}
Partition::~Partition()
@ -98,4 +100,18 @@ ssize_t Partition::pwrite(ioctx_t* ctx, const uint8_t* buf, size_t count,
return inner_inode->pwrite(ctx, buf, count, start + off);
}
int Partition::stat(ioctx_t* ctx, struct stat* st)
{
if ( inner_inode->stat(ctx, st) < 0 )
return -1;
struct stat myst;
if ( !ctx->copy_from_src(&myst, st, sizeof(myst)) )
return -1;
myst.st_size = length;
myst.st_blocks = length / (myst.st_blksize ? myst.st_blksize : 1);
if ( !ctx->copy_to_dest(st, &myst, sizeof(myst)) )
return -1;
return 0;
}
}

3
kernel/partition.h
View File

@ -1,6 +1,6 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2013.
Copyright(C) Jonas 'Sortie' Termansen 2013, 2015.
This file is part of Sortix.
@ -48,6 +48,7 @@ public:
virtual ssize_t pread(ioctx_t* ctx, uint8_t* buf, size_t count, off_t off);
virtual ssize_t pwrite(ioctx_t* ctx, const uint8_t* buf, size_t count,
off_t off);
virtual int stat(ioctx_t* ctx, struct stat* st);
};