Page MenuHomeFreeBSD
Files F157114332

D21280.diff
No OneTemporary
Actions

D21280.diff
View Options

Index: head/sys/fs/fuse/fuse_vnops.c
===================================================================
--- head/sys/fs/fuse/fuse_vnops.c
+++ head/sys/fs/fuse/fuse_vnops.c
@@ -2246,9 +2246,7 @@
struct mount *mp = vnode_mount(vp);
struct thread *td = ap->a_td;
struct ucred *cred = ap->a_cred;
- size_t len;
char *prefix;
- char *attr_str;
char *bsd_list = NULL;
char *linux_list;
int bsd_list_len;
@@ -2274,9 +2272,7 @@
else
prefix = EXTATTR_NAMESPACE_USER_STRING;
- len = strlen(prefix) + sizeof(extattr_namespace_separator) + 1;
-
- fdisp_init(&fdi, sizeof(*list_xattr_in) + len);
+ fdisp_init(&fdi, sizeof(*list_xattr_in));
fdisp_make_vp(&fdi, FUSE_LISTXATTR, vp, td, cred);
/*
@@ -2284,8 +2280,6 @@
*/
list_xattr_in = fdi.indata;
list_xattr_in->size = 0;
- attr_str = (char *)fdi.indata + sizeof(*list_xattr_in);
- snprintf(attr_str, len, "%s%c", prefix, extattr_namespace_separator);
err = fdisp_wait_answ(&fdi);
if (err != 0) {
@@ -2310,8 +2304,6 @@
fdisp_refresh_vp(&fdi, FUSE_LISTXATTR, vp, td, cred);
list_xattr_in = fdi.indata;
list_xattr_in->size = linux_list_len + sizeof(*list_xattr_out);
- attr_str = (char *)fdi.indata + sizeof(*list_xattr_in);
- snprintf(attr_str, len, "%s%c", prefix, extattr_namespace_separator);
err = fdisp_wait_answ(&fdi);
if (err != 0)
Index: head/tests/sys/fs/fusefs/mockfs.cc
===================================================================
--- head/tests/sys/fs/fusefs/mockfs.cc
+++ head/tests/sys/fs/fusefs/mockfs.cc
@@ -554,16 +554,13 @@
"Missing request attribute name";
break;
case FUSE_GETXATTR:
- ASSERT_GE(inlen, fih + sizeof(in.body.setxattr)) <<
+ ASSERT_GE(inlen, fih + sizeof(in.body.getxattr)) <<
"Missing request body";
- ASSERT_GT(inlen, fih + sizeof(in.body.setxattr)) <<
+ ASSERT_GT(inlen, fih + sizeof(in.body.getxattr)) <<
"Missing request attribute name";
break;
case FUSE_LISTXATTR:
- ASSERT_GE(inlen, fih + sizeof(in.body.listxattr)) <<
- "Missing request body";
- ASSERT_GT(inlen, fih + sizeof(in.body.listxattr)) <<
- "Missing namespace";
+ ASSERT_EQ(inlen, fih + sizeof(in.body.listxattr));
break;
case FUSE_REMOVEXATTR:
ASSERT_GT(inlen, fih) << "Missing request attribute name";

File Metadata

Mime Type
text/plain
Expires
Tue, May 19, 1:19 PM (10 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33313236
Default Alt Text
D21280.diff (2 KB)

Event Timeline