Should have been part of r24552 (replaced FS_WRITE_STAT_* constants with

the B_STAT_* constants as found in NodeMonitor.h).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24553 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-03-24 12:06:28 +00:00
parent 5e2ef462ec
commit 04a969c8cf
@@ -1,18 +1,18 @@
// kernel_interface.cpp // kernel_interface.cpp
// //
// Copyright (c) 2003, Axel Dörfler ([email protected]) // Copyright (c) 2003-2008, Axel Dörfler ([email protected])
// Copyright (c) 2003, Ingo Weinhold ([email protected]) // Copyright (c) 2003, Ingo Weinhold ([email protected])
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or // the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// This program is distributed in the hope that it will be useful, // This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -79,7 +79,7 @@ notify_if_stat_changed(Volume *volume, Node *node)
// ramfs_mount // ramfs_mount
static status_t static status_t
ramfs_mount(dev_t nsid, const char* /*device*/, uint32 flags, ramfs_mount(dev_t nsid, const char* /*device*/, uint32 flags,
const char* /*args*/, fs_volume* _volume, ino_t* rootID) const char* /*args*/, fs_volume* _volume, ino_t* rootID)
{ {
FUNCTION_START(); FUNCTION_START();
@@ -700,25 +700,25 @@ ramfs_write_stat(fs_volume fs, fs_vnode _node, const struct stat *st,
// check permissions // check permissions
error = node->CheckPermissions(ACCESS_W); error = node->CheckPermissions(ACCESS_W);
// size // size
if (error == B_OK && (mask & FS_WRITE_STAT_SIZE)) if (error == B_OK && (mask & B_STAT_SIZE))
error = node->SetSize(st->st_size); error = node->SetSize(st->st_size);
if (error == B_OK) { if (error == B_OK) {
// permissions // permissions
if (mask & FS_WRITE_STAT_MODE) { if (mask & B_STAT_MODE) {
node->SetMode(node->GetMode() & ~S_IUMSK node->SetMode(node->GetMode() & ~S_IUMSK
| st->st_mode & S_IUMSK); | st->st_mode & S_IUMSK);
} }
// UID // UID
if (mask & FS_WRITE_STAT_UID) if (mask & B_STAT_UID)
node->SetUID(st->st_uid); node->SetUID(st->st_uid);
// GID // GID
if (mask & FS_WRITE_STAT_GID) if (mask & B_STAT_GID)
node->SetGID(st->st_gid); node->SetGID(st->st_gid);
// mtime // mtime
if (mask & FS_WRITE_STAT_MTIME) if (mask & B_STAT_MODIFICATION_TIME)
node->SetMTime(st->st_mtime); node->SetMTime(st->st_mtime);
// crtime // crtime
if (mask & FS_WRITE_STAT_CRTIME) if (mask & B_STAT_CREATION_TIME)
node->SetCrTime(st->st_crtime); node->SetCrTime(st->st_crtime);
} }
// notify listeners // notify listeners
@@ -1214,7 +1214,7 @@ ramfs_close_dir(fs_volume /*fs*/, fs_vnode DARG(_node), fs_cookie _cookie)
FUNCTION_START(); FUNCTION_START();
FUNCTION(("dir: (%Lu)\n", ((Node*)_node)->GetID())); FUNCTION(("dir: (%Lu)\n", ((Node*)_node)->GetID()));
// No locking needed, since the Directory is guaranteed to live at this // No locking needed, since the Directory is guaranteed to live at this
// time and for iterators there is a separate locking. // time and for iterators there is a separate locking.
DirectoryCookie *cookie = (DirectoryCookie*)_cookie; DirectoryCookie *cookie = (DirectoryCookie*)_cookie;
cookie->Unset(); cookie->Unset();
return B_OK; return B_OK;
@@ -1278,7 +1278,7 @@ ramfs_rewind_dir(fs_volume /*fs*/, fs_vnode /*_node*/, fs_cookie _cookie)
{ {
FUNCTION_START(); FUNCTION_START();
// No locking needed, since the Directory is guaranteed to live at this // No locking needed, since the Directory is guaranteed to live at this
// time and for iterators there is a separate locking. // time and for iterators there is a separate locking.
DirectoryCookie *cookie = (DirectoryCookie*)_cookie; DirectoryCookie *cookie = (DirectoryCookie*)_cookie;
// no need to Resume(), iterator remains suspended // no need to Resume(), iterator remains suspended
status_t error = cookie->Rewind(); status_t error = cookie->Rewind();
@@ -1325,7 +1325,7 @@ ramfs_close_attr_dir(fs_volume /*fs*/, fs_vnode /*_node*/, fs_cookie cookie)
{ {
FUNCTION_START(); FUNCTION_START();
// No locking needed, since the Node is guaranteed to live at this time // No locking needed, since the Node is guaranteed to live at this time
// and for iterators there is a separate locking. // and for iterators there is a separate locking.
AttributeIterator *iterator = (AttributeIterator*)cookie; AttributeIterator *iterator = (AttributeIterator*)cookie;
iterator->Unset(); iterator->Unset();
return B_OK; return B_OK;
@@ -1338,7 +1338,7 @@ ramfs_free_attr_dir_cookie(fs_volume /*fs*/, fs_vnode /*_node*/,
{ {
FUNCTION_START(); FUNCTION_START();
// No locking needed, since the Node is guaranteed to live at this time // No locking needed, since the Node is guaranteed to live at this time
// and for iterators there is a separate locking. // and for iterators there is a separate locking.
AttributeIterator *iterator = (AttributeIterator*)cookie; AttributeIterator *iterator = (AttributeIterator*)cookie;
delete iterator; delete iterator;
return B_OK; return B_OK;
@@ -1389,7 +1389,7 @@ ramfs_rewind_attr_dir(fs_volume /*fs*/, fs_vnode /*_node*/, fs_cookie cookie)
{ {
FUNCTION_START(); FUNCTION_START();
// No locking needed, since the Node is guaranteed to live at this time // No locking needed, since the Node is guaranteed to live at this time
// and for iterators there is a separate locking. // and for iterators there is a separate locking.
AttributeIterator *iterator = (AttributeIterator*)cookie; AttributeIterator *iterator = (AttributeIterator*)cookie;
// no need to Resume(), iterator remains suspended // no need to Resume(), iterator remains suspended
status_t error = iterator->Rewind(); status_t error = iterator->Rewind();
@@ -2131,7 +2131,7 @@ static file_system_module_info sRamFSModuleInfo = {
&ramfs_free_dir_cookie, &ramfs_free_dir_cookie,
&ramfs_read_dir, &ramfs_read_dir,
&ramfs_rewind_dir, &ramfs_rewind_dir,
/* attribute directory operations */ /* attribute directory operations */
&ramfs_open_attr_dir, &ramfs_open_attr_dir,
&ramfs_close_attr_dir, &ramfs_close_attr_dir,