diff options
| author | Brian Behlendorf <[email protected]> | 2010-08-26 11:54:51 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-08-31 13:41:59 -0700 |
| commit | 054bc00b4c0c257f6baf6d7145b270c7283fe51e (patch) | |
| tree | 633060a0972e6ccbbe2f02ad6e4c4c5ab500220f | |
| parent | 7b89a549965e50f4f80e41b804bfbc3c09bbddca (diff) | |
Add linux compatibility
Resolve minor Linux compatibility issues.
Signed-off-by: Brian Behlendorf <[email protected]>
| -rw-r--r-- | lib/libzfs/libzfs_diff.c | 4 | ||||
| -rw-r--r-- | module/zfs/include/sys/zfs_znode.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/libzfs/libzfs_diff.c b/lib/libzfs/libzfs_diff.c index 31e18aad2..8140a703a 100644 --- a/lib/libzfs/libzfs_diff.c +++ b/lib/libzfs/libzfs_diff.c @@ -160,18 +160,22 @@ print_what(FILE *fp, mode_t what) case S_IFDIR: symbol = '/'; break; +#ifdef S_IFDOOR case S_IFDOOR: symbol = '>'; break; +#endif case S_IFIFO: symbol = '|'; break; case S_IFLNK: symbol = '@'; break; +#ifdef S_IFPORT case S_IFPORT: symbol = 'P'; break; +#endif case S_IFSOCK: symbol = '='; break; diff --git a/module/zfs/include/sys/zfs_znode.h b/module/zfs/include/sys/zfs_znode.h index b2477eddb..aa1f449ac 100644 --- a/module/zfs/include/sys/zfs_znode.h +++ b/module/zfs/include/sys/zfs_znode.h @@ -149,9 +149,12 @@ extern "C" { /* * 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) +#endif /* * The directory entry has the type (currently unused on Solaris) in the |