i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Got rid of the duality of FS_WRITE_STAT_* vs. B_STAT_* flags (removed

Browse Source 
the former ones).
* Removed extraneous white space.
* net_server settings are now also updated when the size of the 
  file changed.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24552 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-03-24 12:04:47 +00:00
parent 1879dc35bf
commit 5e2ef462ec
13 changed files with 576 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/drivers/fs_interface.h
+6 -15
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2004-2007, Haiku Inc. All Rights Reserved.
* Copyright 2004-2008, Haiku Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _FS_INTERFACE_H
@@ -26,18 +26,9 @@ typedef void *fs_volume;
typedef void *fs_cookie;
typedef void *fs_vnode;
/* passed to write_stat() */
enum write_stat_mask {
FS_WRITE_STAT_MODE = 0x0001,
FS_WRITE_STAT_UID = 0x0002,
FS_WRITE_STAT_GID = 0x0004,
FS_WRITE_STAT_SIZE = 0x0008,
FS_WRITE_STAT_ATIME = 0x0010,
FS_WRITE_STAT_MTIME = 0x0020,
FS_WRITE_STAT_CRTIME = 0x0040
// NOTE: Changing these constants will break
/* additional flags passed to write_stat() (see NodeMonitor.h for the others) */
// NOTE: Changing the constants here or in NodeMonitor.h will break
// src/kits/storage/LibBeAdapter.cpp:_kern_write_stat().
};
/* passed to write_fs_info() */
#define FS_WRITE_FSINFO_NAME 0x0001
@@ -51,7 +42,7 @@ struct file_io_vec {
#ifdef __cplusplus
extern "C" {
#endif
#endif
typedef struct file_system_module_info {
struct module_info info;
@@ -68,7 +59,7 @@ typedef struct file_system_module_info {
void (*free_partition_content_cookie)(partition_data *partition);
/* general operations */
status_t (*mount)(dev_t id, const char *device, uint32 flags,
status_t (*mount)(dev_t id, const char *device, uint32 flags,
const char *args, fs_volume *_fs, ino_t *_rootVnodeID);
status_t (*unmount)(fs_volume fs);
@@ -201,7 +192,7 @@ typedef struct file_system_module_info {
port_id port, uint32 token, fs_cookie *_cookie);
status_t (*close_query)(fs_volume fs, fs_cookie cookie);
status_t (*free_query_cookie)(fs_volume fs, fs_cookie cookie);
status_t (*read_query)(fs_volume fs, fs_cookie cookie,
status_t (*read_query)(fs_volume fs, fs_cookie cookie,
struct dirent *buffer, size_t bufferSize, uint32 *_num);
status_t (*rewind_query)(fs_volume fs, fs_cookie cookie);
headers/private/fs_shell/fssh_api_wrapper.h
+4 -15
View File
@@ -874,17 +874,6 @@
#define fs_cookie fssh_fs_cookie
#define fs_vnode fssh_fs_vnode
/* passed to write_stat() */
#define write_stat_mask fssh_write_stat_mask
#define FS_WRITE_STAT_MODE FSSH_FS_WRITE_STAT_MODE
#define FS_WRITE_STAT_UID FSSH_FS_WRITE_STAT_UID
#define FS_WRITE_STAT_GID FSSH_FS_WRITE_STAT_GID
#define FS_WRITE_STAT_SIZE FSSH_FS_WRITE_STAT_SIZE
#define FS_WRITE_STAT_ATIME FSSH_FS_WRITE_STAT_ATIME
#define FS_WRITE_STAT_MTIME FSSH_FS_WRITE_STAT_MTIME
#define FS_WRITE_STAT_CRTIME FSSH_FS_WRITE_STAT_CRTIME
/* passed to write_fs_info() */
#define FS_WRITE_FSINFO_NAME FSSH_FS_WRITE_FSINFO_NAME
@@ -896,7 +885,7 @@
/* file system add-ons only prototypes */
#define new_vnode fssh_new_vnode
#define new_vnode fssh_new_vnode
#define publish_vnode fssh_publish_vnode
#define get_vnode fssh_get_vnode
#define put_vnode fssh_put_vnode
@@ -1099,9 +1088,9 @@
#define suspend_thread fssh_suspend_thread
#define rename_thread fssh_rename_thread
#define set_thread_priority fssh_set_thread_priority
#define set_thread_priority fssh_set_thread_priority
#define exit_thread fssh_exit_thread
#define wait_for_thread fssh_wait_for_thread
#define wait_for_thread fssh_wait_for_thread
#define on_exit_thread fssh_on_exit_thread
#define find_thread fssh_find_thread
@@ -1497,7 +1486,7 @@
#define sync fssh_sync
#define fsync fssh_fsync
/* access permissions */
/* access permissions */
#define getegid fssh_getegid
#define geteuid fssh_geteuid
#define getgid fssh_getgid
headers/private/fs_shell/fssh_fs_interface.h
+5 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2004-2007, Haiku Inc. All Rights Reserved.
* Copyright 2004-2008, Haiku Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _FSSH_FS_INTERFACE_H
@@ -28,16 +28,7 @@ typedef void *fssh_fs_volume;
typedef void *fssh_fs_cookie;
typedef void *fssh_fs_vnode;
/* passed to write_stat() */
enum fssh_write_stat_mask {
FSSH_FS_WRITE_STAT_MODE = 0x0001,
FSSH_FS_WRITE_STAT_UID = 0x0002,
FSSH_FS_WRITE_STAT_GID = 0x0004,
FSSH_FS_WRITE_STAT_SIZE = 0x0008,
FSSH_FS_WRITE_STAT_ATIME = 0x0010,
FSSH_FS_WRITE_STAT_MTIME = 0x0020,
FSSH_FS_WRITE_STAT_CRTIME = 0x0040
};
/* additional flags passed to write_stat() */
/* passed to write_fs_info() */
#define FSSH_FS_WRITE_FSINFO_NAME 0x0001
@@ -51,7 +42,7 @@ struct fssh_file_io_vec {
#ifdef __cplusplus
extern "C" {
#endif
#endif
typedef struct fssh_file_system_module_info {
struct fssh_module_info info;
@@ -68,7 +59,7 @@ typedef struct fssh_file_system_module_info {
void (*free_partition_content_cookie)(fssh_partition_data *partition);
/* general operations */
fssh_status_t (*mount)(fssh_mount_id id, const char *device, uint32_t flags,
fssh_status_t (*mount)(fssh_mount_id id, const char *device, uint32_t flags,
const char *args, fssh_fs_volume *_fs,
fssh_vnode_id *_rootVnodeID);
fssh_status_t (*unmount)(fssh_fs_volume fs);
@@ -235,7 +226,7 @@ typedef struct fssh_file_system_module_info {
fssh_status_t (*close_query)(fssh_fs_volume fs, fssh_fs_cookie cookie);
fssh_status_t (*free_query_cookie)(fssh_fs_volume fs,
fssh_fs_cookie cookie);
fssh_status_t (*read_query)(fssh_fs_volume fs, fssh_fs_cookie cookie,
fssh_status_t (*read_query)(fssh_fs_volume fs, fssh_fs_cookie cookie,
struct fssh_dirent *buffer, fssh_size_t bufferSize,
uint32_t *_num);
fssh_status_t (*rewind_query)(fssh_fs_volume fs, fssh_fs_cookie cookie);
src/add-ons/kernel/file_systems/fat/file.c
+73 -73
View File
@@ -62,7 +62,7 @@ status_t write_vnode_entry(nspace *vol, vnode *node)
struct diri diri;
uint8 *buffer;
// TODO : is it needed ? vfs job ?
// don't update entries of deleted files
//if (is_vnode_removed(vol->id, node->vnid) > 0) return 0;
@@ -80,7 +80,7 @@ status_t write_vnode_entry(nspace *vol, vnode *node)
return ENOENT;
buffer[0x0b] = node->mode; // file attributes
memset(buffer+0xc, 0, 0x16-0xc);
i = time_t2dos(node->st_time);
buffer[0x16] = i & 0xff;
@@ -113,7 +113,7 @@ status_t write_vnode_entry(nspace *vol, vnode *node)
// called when fs is done with vnode
// after close, etc. free vnode resources here
status_t
status_t
dosfs_release_vnode(void *_vol, void *_node, bool reenter)
{
nspace *vol = (nspace *)_vol;
@@ -127,7 +127,7 @@ dosfs_release_vnode(void *_vol, void *_node, bool reenter)
}
DPRINTF(0, ("dosfs_write_vnode (ino_t %Lx)\n", ((vnode *)_node)->vnid));
if ((vol->fs_flags & FS_FLAGS_OP_SYNC) && node->dirty) {
LOCK_VOL(vol);
_dosfs_sync(vol);
@@ -138,7 +138,7 @@ dosfs_release_vnode(void *_vol, void *_node, bool reenter)
#if TRACK_FILENAME
if (node->filename) free(node->filename);
#endif
if (node->vnid != vol->root_vnode.vnid) {
node->magic = ~VNODE_MAGIC; // munge magic number to be safe
file_cache_delete(node->cache);
@@ -151,7 +151,7 @@ dosfs_release_vnode(void *_vol, void *_node, bool reenter)
}
status_t
status_t
dosfs_rstat(void *_vol, void *_node, struct stat *st)
{
nspace *vol = (nspace*)_vol;
@@ -190,7 +190,7 @@ dosfs_rstat(void *_vol, void *_node, struct stat *st)
}
status_t
status_t
dosfs_wstat(void *_vol, void *_node, const struct stat *st, uint32 mask)
{
int err = B_OK;
@@ -220,7 +220,7 @@ dosfs_wstat(void *_vol, void *_node, const struct stat *st, uint32 mask)
return EPERM;
}
if (mask & FS_WRITE_STAT_MODE) {
if (mask & B_STAT_MODE) {
DPRINTF(0, ("setting file mode to %o\n", st->st_mode));
if (st->st_mode & S_IWUSR)
node->mode &= ~FAT_READ_ONLY;
@@ -229,7 +229,7 @@ dosfs_wstat(void *_vol, void *_node, const struct stat *st, uint32 mask)
dirty = true;
}
if (mask & FS_WRITE_STAT_SIZE) {
if (mask & B_STAT_SIZE) {
DPRINTF(0, ("setting file size to %Lx\n", st->st_size));
if (node->mode & FAT_SUBDIR) {
dprintf("dosfs_wstat: can't set file size of directory!\n");
@@ -249,8 +249,8 @@ dosfs_wstat(void *_vol, void *_node, const struct stat *st, uint32 mask)
}
}
}
if (mask & FS_WRITE_STAT_MTIME) {
if (mask & B_STAT_MODIFICATION_TIME) {
DPRINTF(0, ("setting modification time\n"));
node->st_time = st->st_mtime;
dirty = true;
@@ -270,12 +270,12 @@ dosfs_wstat(void *_vol, void *_node, const struct stat *st, uint32 mask)
if (err != B_OK) DPRINTF(0, ("dosfs_wstat (%s)\n", strerror(err)));
UNLOCK_VOL(vol);
return err;
}
status_t
status_t
dosfs_open(void *_vol, void *_node, int omode, void **_cookie)
{
status_t result = EINVAL;
@@ -301,7 +301,7 @@ dosfs_open(void *_vol, void *_node, int omode, void **_cookie)
goto error;
}
if ((vol->flags & B_FS_IS_READONLY) ||
if ((vol->flags & B_FS_IS_READONLY) ||
(node->mode & FAT_READ_ONLY) ||
(node->disk_image != 0) ||
// allow opening directories for ioctl() calls
@@ -348,7 +348,7 @@ error:
}
status_t
status_t
dosfs_read(void *_vol, void *_node, void *_cookie, off_t pos,
void *buf, size_t *len)
{
@@ -393,7 +393,7 @@ dosfs_read(void *_vol, void *_node, void *_cookie, off_t pos,
// truncate bytes to read to file size
if (pos + *len >= node->st_size)
*len = node->st_size - pos;
result = file_cache_read(node->cache, cookie, pos, buf, len);
#if 0
@@ -416,7 +416,7 @@ dosfs_read(void *_vol, void *_node, void *_cookie, off_t pos,
dprintf("dosfs_read: invalid starting cluster (%lx)\n", cluster1);
goto bi;
}
if (diff && ((result = iter_csi(&iter, diff)) != B_OK)) {
dprintf("dosfs_read: end of file reached (init)\n");
result = EIO;
@@ -480,8 +480,8 @@ dosfs_read(void *_vol, void *_node, void *_cookie, off_t pos,
csi_release_block(&iter);
bytes_read += amt;
}
if (*len) {
if (*len) {
cookie->ccache.iteration = node->iteration;
cookie->ccache.index = (pos + *len - 1) / vol->bytes_per_sector / vol->sectors_per_cluster;
cookie->ccache.cluster = iter.cluster;
@@ -491,7 +491,7 @@ dosfs_read(void *_vol, void *_node, void *_cookie, off_t pos,
result = B_OK;
#endif
bi:
if (result != B_OK) {
DPRINTF(0, ("dosfs_read (%s)\n", strerror(result)));
@@ -499,12 +499,12 @@ bi:
DPRINTF(0, ("dosfs_read: read %lx bytes\n", *len));
}
UNLOCK_VOL(vol);
return result;
}
status_t
status_t
dosfs_write(void *_vol, void *_node, void *_cookie, off_t pos,
const void *buf, size_t *len)
{
@@ -534,11 +534,11 @@ dosfs_write(void *_vol, void *_node, void *_cookie, off_t pos,
*len = 0;
UNLOCK_VOL(vol);
return EISDIR;
}
DPRINTF(0, ("dosfs_write called %lx bytes at %Lx from buffer at %lx (vnode id %Lx)\n", *len, pos, (uint32)buf, node->vnid));
if ((cookie->mode & O_RWMASK) == O_RDONLY) {
dprintf("dosfs_write: called on file opened as read-only\n");
*len = 0;
@@ -547,10 +547,10 @@ dosfs_write(void *_vol, void *_node, void *_cookie, off_t pos,
}
if (pos < 0) pos = 0;
if (cookie->mode & O_APPEND) {
pos = node->st_size;
}
}
if (pos >= MAX_FILE_SIZE) {
dprintf("dosfs_write: write position exceeds fat limits\n");
@@ -562,10 +562,10 @@ dosfs_write(void *_vol, void *_node, void *_cookie, off_t pos,
if (pos + *len >= MAX_FILE_SIZE) {
*len = (size_t)(MAX_FILE_SIZE - pos);
}
#if 0
if (node->st_size &&
if (node->st_size &&
(cookie->ccache.iteration == node->iteration) &&
(pos >= cookie->ccache.index * vol->bytes_per_sector * vol->sectors_per_cluster)) {
ASSERT(IS_DATA_CLUSTER(cookie->ccache.cluster));
@@ -598,9 +598,9 @@ dosfs_write(void *_vol, void *_node, void *_cookie, off_t pos,
file_cache_set_size(node->cache, node->st_size);
file_map_set_size(node->file_map, node->st_size);
}
result = file_cache_write(node->cache, cookie, pos, buf, len);
#if 0
if (cluster1 == 0xffffffff) {
cluster1 = node->cluster;
@@ -612,7 +612,7 @@ dosfs_write(void *_vol, void *_node, void *_cookie, off_t pos,
dprintf("dosfs_write: invalid starting cluster (%lx)\n", cluster1);
goto bi;
}
if (diff && ((result = iter_csi(&iter, diff)) != B_OK)) {
dprintf("dosfs_write: end of file reached (init)\n");
result = EIO;
@@ -682,7 +682,7 @@ dosfs_write(void *_vol, void *_node, void *_cookie, off_t pos,
bytes_written += amt;
}
if (*len) {
if (*len) {
cookie->ccache.iteration = node->iteration;
cookie->ccache.index = (pos + *len - 1) / vol->bytes_per_sector / vol->sectors_per_cluster;
cookie->ccache.cluster = iter.cluster;
@@ -692,7 +692,7 @@ dosfs_write(void *_vol, void *_node, void *_cookie, off_t pos,
result = B_OK;
#endif
bi:
if (result != B_OK) {
DPRINTF(0, ("dosfs_write (%s)\n", strerror(result)));
@@ -700,12 +700,12 @@ bi:
DPRINTF(0, ("dosfs_write: wrote %lx bytes\n", *len));
}
UNLOCK_VOL(vol);
return result;
}
status_t
status_t
dosfs_close(void *_vol, void *_node, void *_cookie)
{
nspace *vol = (nspace *)_vol;
@@ -733,7 +733,7 @@ dosfs_close(void *_vol, void *_node, void *_cookie)
}
status_t
status_t
dosfs_free_cookie(void *_vol, void *_node, void *_cookie)
{
nspace *vol = _vol;
@@ -759,7 +759,7 @@ dosfs_free_cookie(void *_vol, void *_node, void *_cookie)
}
status_t
status_t
dosfs_create(void *_vol, void *_dir, const char *name, int omode,
int perms, void **_cookie, ino_t *vnid)
{
@@ -768,7 +768,7 @@ dosfs_create(void *_vol, void *_dir, const char *name, int omode,
filecookie *cookie;
status_t result = EINVAL;
bool dups_exist;
LOCK_VOL(vol);
if (check_nspace_magic(vol, "dosfs_create")
@@ -785,7 +785,7 @@ dosfs_create(void *_vol, void *_dir, const char *name, int omode,
}
DPRINTF(0, ("dosfs_create called: %Lx/%s perms=%o omode=%o\n", dir->vnid, name, perms, omode));
if (vol->flags & B_FS_IS_READONLY) {
dprintf("dosfs_create called on read-only volume\n");
UNLOCK_VOL(vol);
@@ -819,7 +819,7 @@ dosfs_create(void *_vol, void *_dir, const char *name, int omode,
result = EEXIST;
goto bi;
}
if (file->mode & FAT_SUBDIR) {
dprintf("can't dosfs_create over an existing subdirectory\n");
put_vnode(vol->id, file->vnid);
@@ -839,7 +839,7 @@ dosfs_create(void *_vol, void *_dir, const char *name, int omode,
file->st_size = 0;
file->iteration++;
}
} else if (result == ENOENT && dups_exist) {
} else if (result == ENOENT && dups_exist) {
// the file doesn't exist in the exact case, but another does in the
// non-exact case. We wont create the new file.
result = EEXIST;
@@ -884,7 +884,7 @@ dosfs_create(void *_vol, void *_dir, const char *name, int omode,
} else {
goto bi;
}
cookie->magic = FILECOOKIE_MAGIC;
cookie->mode = omode;
cookie->ccache.iteration = file->iteration;
@@ -902,14 +902,14 @@ dosfs_create(void *_vol, void *_dir, const char *name, int omode,
bi: if (result != B_OK) free(cookie);
UNLOCK_VOL(vol);
if (result != B_OK) DPRINTF(0, ("dosfs_create (%s)\n", strerror(result)));
return result;
}
status_t
status_t
dosfs_mkdir(void *_vol, void *_dir, const char *name, int perms, ino_t *_vnid)
{
nspace *vol = (nspace *)_vol;
@@ -918,7 +918,7 @@ dosfs_mkdir(void *_vol, void *_dir, const char *name, int perms, ino_t *_vnid)
struct csi csi;
uchar *buffer;
uint32 i;
LOCK_VOL(vol);
if (check_nspace_magic(vol, "dosfs_mkdir")
@@ -1061,7 +1061,7 @@ bi: dummy.magic = ~VNODE_MAGIC;
}
status_t
status_t
dosfs_rename(void *_vol, void *_odir, const char *oldname,
void *_ndir, const char *newname)
{
@@ -1182,7 +1182,7 @@ dosfs_rename(void *_vol, void *_odir, const char *oldname,
if ((result = erase_dir_entry(vol, file)) != B_OK) {
dprintf("dosfs_rename: error erasing old directory entry for %s (%s)\n", newname, strerror(result));
goto bi1;
}
}
} else if (result == ENOENT && (!dups_exist || (odir->vnid == ndir->vnid && !strcasecmp(oldname, newname)))) {
// there isn't an entry and there are no duplicates in the target dir or
// there isn't an entry and the target dir is the same as the source dir and
@@ -1195,7 +1195,7 @@ dosfs_rename(void *_vol, void *_odir, const char *oldname,
}
dirty = true;
// create the new directory entry
if ((result = create_dir_entry(vol, ndir, file, newname, &ns, &ne)) != B_OK) {
dprintf("dosfs_rename: error creating directory entry for %s\n", newname);
@@ -1222,10 +1222,10 @@ dosfs_rename(void *_vol, void *_odir, const char *oldname,
// update vcache
vcache_set_entry(vol, file->vnid,
(file->st_size) ?
GENERATE_DIR_CLUSTER_VNID(file->dir_vnid, file->cluster) :
GENERATE_DIR_CLUSTER_VNID(file->dir_vnid, file->cluster) :
GENERATE_DIR_INDEX_VNID(file->dir_vnid, file->sindex));
// XXX: only write changes in the directory entry if needed
// XXX: only write changes in the directory entry if needed
// (i.e. old entry, not new)
write_vnode_entry(vol, file);
@@ -1276,7 +1276,7 @@ dosfs_rename(void *_vol, void *_odir, const char *oldname,
}
result = 0;
bi2:
if (result != B_OK) put_vnode(vol->id, file2->vnid);
bi1:
@@ -1290,7 +1290,7 @@ bi:
}
status_t
status_t
dosfs_remove_vnode(void *_vol, void *_node, bool reenter)
{
nspace *vol = (nspace *)_vol;
@@ -1329,7 +1329,7 @@ dosfs_remove_vnode(void *_vol, void *_node, bool reenter)
node->magic = ~VNODE_MAGIC; // munge magic number to be safe
free(node);
if (!reenter) {
if (vol->fs_flags & FS_FLAGS_OP_SYNC) {
// sync the entire filesystem,
@@ -1344,7 +1344,7 @@ dosfs_remove_vnode(void *_vol, void *_node, bool reenter)
}
// get rid of node or directory
static status_t
static status_t
do_unlink(void *_vol, void *_dir, const char *name, bool is_file)
{
status_t result = EINVAL;
@@ -1441,7 +1441,7 @@ do_unlink(void *_vol, void *_dir, const char *name, bool is_file)
remove_vnode(vol->id, file->vnid);
result = 0;
if (vol->fs_flags & FS_FLAGS_OP_SYNC)
_dosfs_sync(vol);
@@ -1453,7 +1453,7 @@ bi: UNLOCK_VOL(vol);
return result;
}
status_t
status_t
dosfs_unlink(void *vol, void *dir, const char *name)
{
DPRINTF(1, ("dosfs_unlink called\n"));
@@ -1462,11 +1462,11 @@ dosfs_unlink(void *vol, void *dir, const char *name)
}
status_t
status_t
dosfs_rmdir(void *vol, void *dir, const char *name)
{
DPRINTF(1, ("dosfs_rmdir called\n"));
return do_unlink(vol, dir, name, false);
}
@@ -1612,7 +1612,7 @@ dosfs_get_file_map(void *_fs, void *_node, off_t pos, size_t len,
}
DPRINTF(0, ("dosfs_get_file_map called %lx bytes at %Lx (vnode id %Lx)\n", len, pos, node->vnid));
if (pos < 0) pos = 0;
if ((node->st_size == 0) || (len == 0) || (pos >= node->st_size)) {
@@ -1623,7 +1623,7 @@ dosfs_get_file_map(void *_fs, void *_node, off_t pos, size_t len,
// truncate bytes to read to file size
if (pos + len >= node->st_size)
len = node->st_size - pos;
/* the fat chain changed, so we have to start from the beginning */
cluster1 = node->cluster;
diff = pos;
@@ -1633,19 +1633,19 @@ dosfs_get_file_map(void *_fs, void *_node, off_t pos, size_t len,
dprintf("dosfs_get_file_map: invalid starting cluster (%lx)\n", cluster1);
goto bi;
}
if (diff && ((result = iter_csi(&iter, diff)) != B_OK)) {
dprintf("dosfs_get_file_map: end of file reached (init)\n");
result = EIO;
goto bi;
}
ASSERT(iter.cluster == get_nth_fat_entry(vol, node->cluster, pos / vol->bytes_per_sector / vol->sectors_per_cluster));
if ((pos % vol->bytes_per_sector) != 0) {
// read in partial first sector if necessary
size_t amt = vol->bytes_per_sector - (pos % vol->bytes_per_sector);
if (amt > len)
if (amt > len)
amt = len;
vecs[index].offset = csi_to_block(&iter) * vol->bytes_per_sector + (pos % vol->bytes_per_sector);
vecs[index].length = amt;
@@ -1655,7 +1655,7 @@ dosfs_get_file_map(void *_fs, void *_node, off_t pos, size_t len,
result = B_BUFFER_OVERFLOW;
goto bi;
}
bytes_read += amt;
if (bytes_read < len)
@@ -1672,7 +1672,7 @@ dosfs_get_file_map(void *_fs, void *_node, off_t pos, size_t len,
uint32 sectors = 1;
off_t block = csi_to_block(&iter);
status_t err;
while (1) {
old_csi = iter;
err = iter_csi(&iter, 1);
@@ -1682,19 +1682,19 @@ dosfs_get_file_map(void *_fs, void *_node, off_t pos, size_t len,
break;
sectors++;
}
vecs[index].offset = block * vol->bytes_per_sector;
vecs[index].length = sectors * vol->bytes_per_sector;
bytes_read += sectors * vol->bytes_per_sector;
index++;
iter = old_csi;
if (index >= max) {
// we're out of file_io_vecs; let's bail out
result = B_BUFFER_OVERFLOW;
goto bi;
}
if (bytes_read < len)
if ((result = iter_csi(&iter, 1)) != B_OK) {
dprintf("dosfs_get_file_map: end of file reached\n");
@@ -1702,7 +1702,7 @@ dosfs_get_file_map(void *_fs, void *_node, off_t pos, size_t len,
goto bi;
}
}
// read part of remaining sector if needed
if (bytes_read < len) {
size_t amt = len - bytes_read;
@@ -1710,22 +1710,22 @@ dosfs_get_file_map(void *_fs, void *_node, off_t pos, size_t len,
vecs[index].length = amt;
index++;
bytes_read += amt;
if (index >= max) {
// we're out of file_io_vecs; let's bail out
result = B_BUFFER_OVERFLOW;
goto bi;
}
}
result = B_OK;
bi:
*_count = index;
if (result != B_OK) {
DPRINTF(0, ("dosfs_get_file_map (%s)\n", strerror(result)));
}
UNLOCK_VOL(vol);
return result;
}
src/add-ons/kernel/file_systems/nfs/nfs_add_on.h
+14 -14
View File
@@ -7,14 +7,14 @@
# include <fs_info.h>
# include <NodeMonitor.h>
typedef dev_t nspace_id;
# define WSTAT_MODE FS_WRITE_STAT_MODE
# define WSTAT_UID FS_WRITE_STAT_UID
# define WSTAT_GID FS_WRITE_STAT_GID
# define WSTAT_SIZE FS_WRITE_STAT_SIZE
# define WSTAT_ATIME FS_WRITE_STAT_ATIME
# define WSTAT_MTIME FS_WRITE_STAT_MTIME
# define WSTAT_CRTIME FS_WRITE_STAT_CRTIME
# define WSTAT_MODE B_STAT_MODE
# define WSTAT_UID B_STAT_UID
# define WSTAT_GID B_STAT_GID
# define WSTAT_SIZE B_STAT_SIZE
# define WSTAT_ATIME B_STAT_ACCESS_TIME
# define WSTAT_MTIME B_STAT_MODIFICATION_TIME
# define WSTAT_CRTIME B_STAT_CREATION_TIME
#else
# include "fsproto.h"
# define publish_vnode new_vnode
@@ -34,7 +34,7 @@ typedef int socklen_t;
struct mount_nfs_params {
unsigned int serverIP;
char *server;
char *_export;
char *_export;
uid_t uid;
gid_t gid;
char *hostname;
@@ -49,24 +49,24 @@ struct fs_node {
struct fs_nspace {
nspace_id nsid;
thread_id tid;
thread_id tid;
bool quit;
int s;
struct RPCPendingCalls pendingCalls;
struct sockaddr_in mountAddr,nfsAddr;
int32 xid;
int32 xid;
ino_t rootid;
sem_id sem;
struct fs_node *first;
struct mount_nfs_params params;
bigtime_t last_rfsstat;
};
void fs_nspaceInit (struct fs_nspace *nspace);
src/add-ons/kernel/file_systems/ntfs/fs_func.c
+430 -430
View File
File diff suppressed because it is too large Load Diff
src/servers/net/Settings.cpp
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -342,8 +342,8 @@ Settings::Update(BMessage* message)
int32 fields;
if (opcode == B_STAT_CHANGED
&& message->FindInt32("fields", &fields) == B_OK
&& (fields & FS_WRITE_STAT_MTIME) == 0) {
// only update when the modified time has changed
&& (fields & (B_STAT_MODIFICATION_TIME | B_STAT_SIZE)) == 0) {
// only update when the modified time or size has changed
return B_OK;
}
src/system/kernel/fs/devfs.cpp
+6 -6
View File
@@ -2499,24 +2499,24 @@ devfs_write_stat(fs_volume _fs, fs_vnode _vnode, const struct stat *stat,
stat));
// we cannot change the size of anything
if (statMask & FS_WRITE_STAT_SIZE)
if (statMask & B_STAT_SIZE)
return B_BAD_VALUE;
RecursiveLocker locker(&fs->lock);
if (statMask & FS_WRITE_STAT_MODE) {
if (statMask & B_STAT_MODE) {
vnode->stream.type = (vnode->stream.type & ~S_IUMSK)
| (stat->st_mode & S_IUMSK);
}
if (statMask & FS_WRITE_STAT_UID)
if (statMask & B_STAT_UID)
vnode->uid = stat->st_uid;
if (statMask & FS_WRITE_STAT_GID)
if (statMask & B_STAT_GID)
vnode->gid = stat->st_gid;
if (statMask & FS_WRITE_STAT_MTIME)
if (statMask & B_STAT_MODIFICATION_TIME)
vnode->modification_time = stat->st_mtime;
if (statMask & FS_WRITE_STAT_CRTIME)
if (statMask & B_STAT_CREATION_TIME)
vnode->creation_time = stat->st_crtime;
notify_stat_changed(fs->id, vnode->id, statMask);
src/system/libroot/posix/sys/chmod.c
+7 -7
View File
@@ -1,10 +1,10 @@
/*
** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
** Distributed under the terms of the Haiku License.
*/
/*
* Copyright 2002-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#include <fs_interface.h>
#include <NodeMonitor.h>
#include <sys/stat.h>
#include <syscalls.h>
@@ -27,7 +27,7 @@ chmod(const char *path, mode_t mode)
stat.st_mode = mode;
status = _kern_write_stat(-1, path, true, &stat, sizeof(struct stat),
FS_WRITE_STAT_MODE);
B_STAT_MODE);
RETURN_AND_SET_ERRNO(status);
}
@@ -41,7 +41,7 @@ fchmod(int fd, mode_t mode)
stat.st_mode = mode;
status = _kern_write_stat(fd, NULL, false, &stat, sizeof(struct stat),
FS_WRITE_STAT_MODE);
B_STAT_MODE);
RETURN_AND_SET_ERRNO(status);
}
src/system/libroot/posix/unistd/chown.c
+8 -8
View File
@@ -1,10 +1,10 @@
/*
** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
** Distributed under the terms of the Haiku License.
*/
/*
* Copyright 2002-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#include <fs_interface.h>
#include <NodeMonitor.h>
#include <unistd.h>
#include <syscalls.h>
@@ -28,7 +28,7 @@ chown(const char *path, uid_t owner, gid_t group)
stat.st_uid = owner;
stat.st_gid = group;
status = _kern_write_stat(-1, path, true, &stat, sizeof(struct stat),
FS_WRITE_STAT_UID | FS_WRITE_STAT_GID);
B_STAT_UID | B_STAT_GID);
RETURN_AND_SET_ERRNO(status);
}
@@ -43,7 +43,7 @@ lchown(const char *path, uid_t owner, gid_t group)
stat.st_uid = owner;
stat.st_gid = group;
status = _kern_write_stat(-1, path, false, &stat, sizeof(struct stat),
FS_WRITE_STAT_UID | FS_WRITE_STAT_GID);
B_STAT_UID | B_STAT_GID);
RETURN_AND_SET_ERRNO(status);
}
@@ -58,7 +58,7 @@ fchown(int fd, uid_t owner, gid_t group)
stat.st_uid = owner;
stat.st_gid = group;
status = _kern_write_stat(fd, NULL, false, &stat, sizeof(struct stat),
FS_WRITE_STAT_UID | FS_WRITE_STAT_GID);
B_STAT_UID | B_STAT_GID);
RETURN_AND_SET_ERRNO(status);
}
src/system/libroot/posix/unistd/truncate.c
+7 -6
View File
@@ -1,10 +1,11 @@
/*
** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
** Distributed under the terms of the Haiku License.
*/
/*
* Copyright 2002-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#include <fs_interface.h>
#include <NodeMonitor.h>
#include <unistd.h>
#include <syscalls.h>
@@ -27,7 +28,7 @@ truncate(const char *path, off_t newSize)
stat.st_size = newSize;
status = _kern_write_stat(-1, path, true, &stat, sizeof(struct stat),
FS_WRITE_STAT_SIZE);
B_STAT_SIZE);
RETURN_AND_SET_ERRNO(status);
}
@@ -41,7 +42,7 @@ ftruncate(int fd, off_t newSize)
stat.st_size = newSize;
status = _kern_write_stat(fd, NULL, false, &stat, sizeof(struct stat),
FS_WRITE_STAT_SIZE);
B_STAT_SIZE);
RETURN_AND_SET_ERRNO(status);
}
src/system/libroot/posix/utime.c
+6 -6
View File
@@ -1,10 +1,10 @@
/*
** Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
** Distributed under the terms of the Haiku License.
*/
/*
* Copyright 2002-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#include <fs_interface.h>
#include <NodeMonitor.h>
#include <utime.h>
#include <time.h>
@@ -33,7 +33,7 @@ utime(const char *path, const struct utimbuf *times)
stat.st_atime = stat.st_mtime = time(NULL);
status = _kern_write_stat(-1, path, true, &stat, sizeof(struct stat),
FS_WRITE_STAT_MTIME | FS_WRITE_STAT_ATIME);
B_STAT_MODIFICATION_TIME | B_STAT_ACCESS_TIME);
RETURN_AND_SET_ERRNO(status);
}
src/tools/fs_shell/fssh.cpp
+7 -6
View File
@@ -24,6 +24,7 @@
#include "fssh_errno.h"
#include "fssh_errors.h"
#include "fssh_module.h"
#include "fssh_node_monitor.h"
#include "fssh_stat.h"
#include "fssh_string.h"
#include "fssh_type_constants.h"
@@ -94,7 +95,7 @@ init_kernel()
return rootDev;
}
// set cwd to "/"
// set cwd to "/"
error = _kern_setcwd(-1, "/");
if (error != FSSH_B_OK) {
fprintf(stderr, "setting cwd failed: %s\n", fssh_strerror(error));
@@ -348,7 +349,7 @@ command_chmod(int argc, const char* const* argv)
}
fssh_status_t error = _kern_write_stat(-1, file, false, &st, sizeof(st),
FSSH_FS_WRITE_STAT_MODE);
FSSH_B_STAT_MODE);
if (error != FSSH_B_OK) {
fprintf(stderr, "Error: Failed to change mode of \"%s\"!\n", file);
return error;
@@ -435,7 +436,7 @@ command_ln(int argc, const char* const* argv)
fprintf(stderr, "Error: Resulting target path is too long.\n");
return FSSH_B_BAD_VALUE;
}
strcpy(targetBuffer, target);
strcat(targetBuffer, "/");
strcat(targetBuffer, leaf);
@@ -777,7 +778,7 @@ command_mkindex(int argc, const char* const* argv)
fssh_dev_t volumeID = get_volume_id();
if (volumeID < 0)
return volumeID;
// create the index
fssh_status_t error =_kern_create_index(volumeID, indexName,
FSSH_B_STRING_TYPE, 0);
@@ -805,7 +806,7 @@ command_query(int argc, const char* const* argv)
fssh_dev_t volumeID = get_volume_id();
if (volumeID < 0)
return volumeID;
// open query
int fd = _kern_open_query(volumeID, query, strlen(query), 0, -1, -1);
if (fd < 0) {
@@ -977,7 +978,7 @@ command_rm(int argc, char **argv)
}
}
}
// check params
if (argi >= argc) {
fprintf(stderr, "Usage: %s [ -r ] <file>...\n", argv[0]);