Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

This commit is contained in:
Brian Behlendorf 2008-12-17 12:48:56 -08:00
parent a6528180c7 cbb1f7f4a9
commit abde09798e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/zcommon/zfs_prop.c
View File

@ -372,15 +372,15 @@ zfs_prop_user(const char *name)
* (strings) and internal representation (uint64_t). * (strings) and internal representation (uint64_t).
*/ */
int int
zfs_prop_string_to_index(zfs_prop_t prop, const char *string, uint64_t *index) zfs_prop_string_to_index(zfs_prop_t prop, const char *string, uint64_t *idx)
{ {
return (zprop_string_to_index(prop, string, index, ZFS_TYPE_DATASET)); return (zprop_string_to_index(prop, string, idx, ZFS_TYPE_DATASET));
} }
int int
zfs_prop_index_to_string(zfs_prop_t prop, uint64_t index, const char **string) zfs_prop_index_to_string(zfs_prop_t prop, uint64_t idx, const char **string)
{ {
return (zprop_index_to_string(prop, index, string, ZFS_TYPE_DATASET)); return (zprop_index_to_string(prop, idx, string, ZFS_TYPE_DATASET));
} }
/* /*

5
module/zfs/include/sys/zfs_znode.h
View File

@ -114,9 +114,12 @@ extern "C" {
/* /*
* Convert mode bits (zp_mode) to BSD-style DT_* values for storing in * Convert mode bits (zp_mode) to BSD-style DT_* values for storing in
* the directory entries. * the directory entries. On Linux systems this value is already
* defined correctly as part of the /usr/include/dirent.h header file.
*/ */
#ifndef IFTODT
#define IFTODT(mode) (((mode) & S_IFMT) >> 12) #define IFTODT(mode) (((mode) & S_IFMT) >> 12)
#endif
/* /*
* The directory entry has the type (currently unused on Solaris) in the * The directory entry has the type (currently unused on Solaris) in the