git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Align closing fi in mount-zfs.sh
[zfs.git]
/
module
/
zfs
/
zfs_fuid.c
diff --git
a/module/zfs/zfs_fuid.c
b/module/zfs/zfs_fuid.c
index
f1e071f
..
debb5f8
100644
(file)
--- a/
module/zfs/zfs_fuid.c
+++ b/
module/zfs/zfs_fuid.c
@@
-415,10
+415,10
@@
zfs_fuid_map_id(zfs_sb_t *zsb, uint64_t fuid,
}
return (id);
#else
}
return (id);
#else
- if(type == ZFS_OWNER || type == ZFS_ACE_USER)
- return (crgetuid(cr));
- else
-
return (crgetgid(cr)
);
+ /*
+ * The Linux port only supports POSIX IDs, use the passed id.
+ */
+
return (fuid
);
#endif /* HAVE_KSID */
}
#endif /* HAVE_KSID */
}
@@
-639,10
+639,10
@@
zfs_fuid_create(zfs_sb_t *zsb, uint64_t id, cred_t *cr,
}
return (FUID_ENCODE(idx, rid));
#else
}
return (FUID_ENCODE(idx, rid));
#else
- if (type == ZFS_OWNER)
- return crgetuid(cr);
- else
-
return crgetgid(cr
);
+ /*
+ * The Linux port only supports POSIX IDs, use the passed id.
+ */
+
return (id
);
#endif
}
#endif
}