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
Remove inconsistent use of EOPNOTSUPP
[zfs.git]
/
module
/
zfs
/
sa.c
diff --git
a/module/zfs/sa.c
b/module/zfs/sa.c
index
4e71c40
..
ee1140f
100644
(file)
--- a/
module/zfs/sa.c
+++ b/
module/zfs/sa.c
@@
-642,7
+642,7
@@
sa_build_layouts(sa_handle_t *hdl, sa_bulk_attr_t *attr_desc, int attr_count,
int buf_space;
sa_attr_type_t *attrs, *attrs_start;
int i, lot_count;
int buf_space;
sa_attr_type_t *attrs, *attrs_start;
int i, lot_count;
- int hdrsize, spillhdrsize;
+ int hdrsize, spillhdrsize
= 0
;
int used;
dmu_object_type_t bonustype;
sa_lot_t *lot;
int used;
dmu_object_type_t bonustype;
sa_lot_t *lot;
@@
-813,7
+813,7
@@
sa_attr_table_setup(objset_t *os, sa_attr_reg_t *reg_attrs, int count)
{
sa_os_t *sa = os->os_sa;
uint64_t sa_attr_count = 0;
{
sa_os_t *sa = os->os_sa;
uint64_t sa_attr_count = 0;
- uint64_t sa_reg_count;
+ uint64_t sa_reg_count
= 0
;
int error = 0;
uint64_t attr_value;
sa_attr_table_t *tb;
int error = 0;
uint64_t attr_value;
sa_attr_table_t *tb;
@@
-1436,6
+1436,7
@@
sa_lookup(sa_handle_t *hdl, sa_attr_type_t attr, void *buf, uint32_t buflen)
int
sa_lookup_uio(sa_handle_t *hdl, sa_attr_type_t attr, uio_t *uio)
{
int
sa_lookup_uio(sa_handle_t *hdl, sa_attr_type_t attr, uio_t *uio)
{
+#ifdef HAVE_ZPL
int error;
sa_bulk_attr_t bulk;
int error;
sa_bulk_attr_t bulk;
@@
-1452,7
+1453,9
@@
sa_lookup_uio(sa_handle_t *hdl, sa_attr_type_t attr, uio_t *uio)
}
mutex_exit(&hdl->sa_lock);
return (error);
}
mutex_exit(&hdl->sa_lock);
return (error);
-
+#else
+ return ENOSYS;
+#endif /* HAVE_ZPL */
}
#endif
}
#endif
@@
-1619,7
+1622,7
@@
sa_modify_attrs(sa_handle_t *hdl, sa_attr_type_t newattr,
sa_bulk_attr_t *attr_desc;
void *old_data[2];
int bonus_attr_count = 0;
sa_bulk_attr_t *attr_desc;
void *old_data[2];
int bonus_attr_count = 0;
- int bonus_data_size
, spill_data_size
;
+ int bonus_data_size
= 0, spill_data_size = 0
;
int spill_attr_count = 0;
int error;
uint16_t length;
int spill_attr_count = 0;
int error;
uint16_t length;