aboutsummaryrefslogtreecommitdiffstats
path: root/fs/orangefs
diff options
context:
space:
mode:
authorMike Marshall <hubcap@omnibond.com>2016-04-06 10:52:38 -0400
committerMike Marshall <hubcap@omnibond.com>2016-04-08 14:08:27 -0400
commit2d09a2ca6a6c66d765458df2653f888c4a481c81 (patch)
treeeccdc3563f78d10fdc043e428f37adc0546fa896 /fs/orangefs
parent9735a22799b9214d17d3c231fe377fc852f042e9 (diff)
Orangefs: xattr.c cleanup
1. It is nonsense to test for negative size_t, suggested by David Binderman <dcb314@hotmail.com> 2. By the time Orangefs gets called, the vfs has ensured that name != NULL, and that buffer and size are sane. Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs')
-rw-r--r--fs/orangefs/xattr.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c
index ef5da7538cd5..90a8ae77d641 100644
--- a/fs/orangefs/xattr.c
+++ b/fs/orangefs/xattr.c
@@ -73,10 +73,6 @@ ssize_t orangefs_inode_getxattr(struct inode *inode, const char *prefix,
73 "%s: prefix %s name %s, buffer_size %zd\n", 73 "%s: prefix %s name %s, buffer_size %zd\n",
74 __func__, prefix, name, size); 74 __func__, prefix, name, size);
75 75
76 if (name == NULL || (size > 0 && buffer == NULL)) {
77 gossip_err("orangefs_inode_getxattr: bogus NULL pointers\n");
78 return -EINVAL;
79 }
80 if ((strlen(name) + strlen(prefix)) >= ORANGEFS_MAX_XATTR_NAMELEN) { 76 if ((strlen(name) + strlen(prefix)) >= ORANGEFS_MAX_XATTR_NAMELEN) {
81 gossip_err("Invalid key length (%d)\n", 77 gossip_err("Invalid key length (%d)\n",
82 (int)(strlen(name) + strlen(prefix))); 78 (int)(strlen(name) + strlen(prefix)));
@@ -239,8 +235,7 @@ int orangefs_inode_setxattr(struct inode *inode, const char *prefix,
239 "%s: prefix %s, name %s, buffer_size %zd\n", 235 "%s: prefix %s, name %s, buffer_size %zd\n",
240 __func__, prefix, name, size); 236 __func__, prefix, name, size);
241 237
242 if (size < 0 || 238 if (size >= ORANGEFS_MAX_XATTR_VALUELEN ||
243 size >= ORANGEFS_MAX_XATTR_VALUELEN ||
244 flags < 0) { 239 flags < 0) {
245 gossip_err("orangefs_inode_setxattr: bogus values of size(%d), flags(%d)\n", 240 gossip_err("orangefs_inode_setxattr: bogus values of size(%d), flags(%d)\n",
246 (int)size, 241 (int)size,
@@ -248,12 +243,6 @@ int orangefs_inode_setxattr(struct inode *inode, const char *prefix,
248 return -EINVAL; 243 return -EINVAL;
249 } 244 }
250 245
251 if (name == NULL ||
252 (size > 0 && value == NULL)) {
253 gossip_err("orangefs_inode_setxattr: bogus NULL pointers!\n");
254 return -EINVAL;
255 }
256
257 internal_flag = convert_to_internal_xattr_flags(flags); 246 internal_flag = convert_to_internal_xattr_flags(flags);
258 247
259 if (prefix) { 248 if (prefix) {
@@ -353,10 +342,6 @@ ssize_t orangefs_listxattr(struct dentry *dentry, char *buffer, size_t size)
353 gossip_err("%s: bogus NULL pointers\n", __func__); 342 gossip_err("%s: bogus NULL pointers\n", __func__);
354 return -EINVAL; 343 return -EINVAL;
355 } 344 }
356 if (size < 0) {
357 gossip_err("Invalid size (%d)\n", (int)size);
358 return -EINVAL;
359 }
360 345
361 down_read(&orangefs_inode->xattr_sem); 346 down_read(&orangefs_inode->xattr_sem);
362 new_op = op_alloc(ORANGEFS_VFS_OP_LISTXATTR); 347 new_op = op_alloc(ORANGEFS_VFS_OP_LISTXATTR);