Page MenuHomeFreeBSD
Files F145154488

D13359.id36517.diff
No OneTemporary
Actions

D13359.id36517.diff
View Options

Index: head/sys/fs/ext2fs/ext2_extattr.c
===================================================================
--- head/sys/fs/ext2fs/ext2_extattr.c
+++ head/sys/fs/ext2fs/ext2_extattr.c
@@ -220,9 +220,10 @@
return (ENOTSUP);
}
- if (uio == NULL)
+ if (size != NULL)
*size += name_len + 1;
- else {
+
+ if (uio != NULL) {
char *name = malloc(name_len + 1, M_TEMP, M_WAITOK);
name[0] = name_len;
memcpy(&name[1], attr_name, name_len);
@@ -286,9 +287,10 @@
return (ENOTSUP);
}
- if (uio == NULL)
+ if (size != NULL)
*size += name_len + 1;
- else {
+
+ if (uio != NULL) {
char *name = malloc(name_len + 1, M_TEMP, M_WAITOK);
name[0] = name_len;
memcpy(&name[1], attr_name, name_len);
@@ -361,12 +363,12 @@
if (strlen(name) == name_len &&
0 == strncmp(attr_name, name, name_len)) {
- if (uio == NULL)
+ if (size != NULL)
*size += entry->e_value_size;
- else {
+
+ if (uio != NULL)
error = uiomove(((char *)EXT2_IFIRST(header)) +
entry->e_value_offs, entry->e_value_size, uio);
- }
brelse(bp);
return (error);
@@ -428,12 +430,12 @@
if (strlen(name) == name_len &&
0 == strncmp(attr_name, name, name_len)) {
- if (uio == NULL)
+ if (size != NULL)
*size += entry->e_value_size;
- else {
+
+ if (uio != NULL)
error = uiomove(bp->b_data + entry->e_value_offs,
entry->e_value_size, uio);
- }
brelse(bp);
return (error);

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 17, 1:26 PM (12 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28814202
Default Alt Text
D13359.id36517.diff (1 KB)

Event Timeline