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

Removed next_dev() again - it's implemented in libroot/os/fs_info.c and

Browse Source 
now used from there, sorry Ingo (I forgot to commit the Jamfile that
included fs_info.c).
Minor comment cleanup to make their appearance consistent throughout
the kernel.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10753 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-01-15 14:41:00 +00:00
parent 40174b5c1b
commit cafa4dd931
1 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/fs/vfs.cpp
+42 -46
View File
@@ -4631,13 +4631,6 @@ _kern_next_device(int32 *_cookie)
} }
dev_t
next_dev(int32 *_cookie)
{
return fs_next_device(_cookie);
}
int int
_kern_open_entry_ref(dev_t device, ino_t inode, const char *name, int omode) _kern_open_entry_ref(dev_t device, ino_t inode, const char *name, int omode)
{ {
@@ -4649,19 +4642,20 @@ _kern_open_entry_ref(dev_t device, ino_t inode, const char *name, int omode)
/** \brief Opens a node specified by a FD + path pair. /** \brief Opens a node specified by a FD + path pair.
*
At least one of \a fd and \a path must be specified. * At least one of \a fd and \a path must be specified.
If only \a fd is given, the function opens the node identified by this * If only \a fd is given, the function opens the node identified by this
FD. If only a path is given, this path is opened. If both are given and * FD. If only a path is given, this path is opened. If both are given and
the path is absolute, \a fd is ignored; a relative path is reckoned off * the path is absolute, \a fd is ignored; a relative path is reckoned off
of the directory (!) identified by \a fd. * of the directory (!) identified by \a fd.
*
\param fd The FD. May be < 0. * \param fd The FD. May be < 0.
\param path The absolute or relative path. May be \c NULL. * \param path The absolute or relative path. May be \c NULL.
\param omode The open mode. * \param omode The open mode.
\return A FD referring to the newly opened node, or an error code, * \return A FD referring to the newly opened node, or an error code,
if an error occurs. * if an error occurs.
*/ */
int int
_kern_open(int fd, const char *path, int omode) _kern_open(int fd, const char *path, int omode)
{ {
@@ -4673,23 +4667,24 @@ _kern_open(int fd, const char *path, int omode)
/** \brief Opens a directory specified by entry_ref or node_ref. /** \brief Opens a directory specified by entry_ref or node_ref.
*
The supplied name may be \c NULL, in which case directory identified * The supplied name may be \c NULL, in which case directory identified
by \a device and \a inode will be opened. Otherwise \a device and * by \a device and \a inode will be opened. Otherwise \a device and
\a inode identify the parent directory of the directory to be opened * \a inode identify the parent directory of the directory to be opened
and \a name its entry name. * and \a name its entry name.
*
\param device If \a name is specified the ID of the device the parent * \param device If \a name is specified the ID of the device the parent
directory of the directory to be opened resides on, otherwise * directory of the directory to be opened resides on, otherwise
the device of the directory itself. * the device of the directory itself.
\param inode If \a name is specified the node ID of the parent * \param inode If \a name is specified the node ID of the parent
directory of the directory to be opened, otherwise node ID of the * directory of the directory to be opened, otherwise node ID of the
directory itself. * directory itself.
\param name The entry name of the directory to be opened. If \c NULL, * \param name The entry name of the directory to be opened. If \c NULL,
the \a device + \a inode pair identify the node to be opened. * the \a device + \a inode pair identify the node to be opened.
\return The FD of the newly opened directory or an error code, if * \return The FD of the newly opened directory or an error code, if
something went wrong. * something went wrong.
*/ */
int int
_kern_open_dir_entry_ref(dev_t device, ino_t inode, const char *name) _kern_open_dir_entry_ref(dev_t device, ino_t inode, const char *name)
{ {
@@ -4698,18 +4693,19 @@ _kern_open_dir_entry_ref(dev_t device, ino_t inode, const char *name)
/** \brief Opens a directory specified by a FD + path pair. /** \brief Opens a directory specified by a FD + path pair.
*
At least one of \a fd and \a path must be specified. * At least one of \a fd and \a path must be specified.
If only \a fd is given, the function opens the directory identified by this * If only \a fd is given, the function opens the directory identified by this
FD. If only a path is given, this path is opened. If both are given and * FD. If only a path is given, this path is opened. If both are given and
the path is absolute, \a fd is ignored; a relative path is reckoned off * the path is absolute, \a fd is ignored; a relative path is reckoned off
of the directory (!) identified by \a fd. * of the directory (!) identified by \a fd.
*
\param fd The FD. May be < 0. * \param fd The FD. May be < 0.
\param path The absolute or relative path. May be \c NULL. * \param path The absolute or relative path. May be \c NULL.
\return A FD referring to the newly opened directory, or an error code, * \return A FD referring to the newly opened directory, or an error code,
if an error occurs. * if an error occurs.
*/ */
int int
_kern_open_dir(int fd, const char *path) _kern_open_dir(int fd, const char *path)
{ {