| To: | xfs@xxxxxxxxxxx |
|---|---|
| Subject: | [PATCH 3/4] xfs: remove put_value from attr ->put_listent context |
| From: | Eric Sandeen <sandeen@xxxxxxxxxxx> |
| Date: | Fri, 11 Mar 2016 16:12:13 -0600 |
| Delivered-to: | xfs@xxxxxxxxxxx |
| In-reply-to: | <56E3425E.40509@xxxxxxxxxx> |
| References: | <56E3425E.40509@xxxxxxxxxx> |
| User-agent: | Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 |
The put_value context member is never set; remove it
and the conditional test in xfs_attr3_leaf_list_int().
Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---
fs/xfs/xfs_attr.h | 1 -
fs/xfs/xfs_attr_list.c | 26 +-------------------------
2 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/fs/xfs/xfs_attr.h b/fs/xfs/xfs_attr.h
index dab4f41..e3da5d4 100644
--- a/fs/xfs/xfs_attr.h
+++ b/fs/xfs/xfs_attr.h
@@ -127,7 +127,6 @@ typedef struct xfs_attr_list_context {
int firstu; /* first used byte in
buffer */
int flags; /* from VOP call */
int resynch; /* T/F: resynch with
cursor */
- int put_value; /* T/F: need value for
listent */
put_listent_func_t put_listent; /* list output fmt
function */
int index; /* index into output
buffer */
} xfs_attr_list_context_t;
diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 1d36d78..900164c 100644
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -435,35 +435,11 @@ xfs_attr3_leaf_list_int(
int valuelen = be32_to_cpu(name_rmt->valuelen);
- if (context->put_value) {
- xfs_da_args_t args;
-
- memset((char *)&args, 0, sizeof(args));
- args.geo = context->dp->i_mount->m_attr_geo;
- args.dp = context->dp;
- args.whichfork = XFS_ATTR_FORK;
- args.valuelen = valuelen;
- args.rmtvaluelen = valuelen;
- args.value = kmem_alloc(valuelen, KM_SLEEP |
KM_NOFS);
- args.rmtblkno = be32_to_cpu(name_rmt->valueblk);
- args.rmtblkcnt = xfs_attr3_rmt_blocks(
- args.dp->i_mount,
valuelen);
- retval = xfs_attr_rmtval_get(&args);
- if (retval)
- return retval;
- retval = context->put_listent(context,
- entry->flags,
- name_rmt->name,
- (int)name_rmt->namelen,
- valuelen);
- kmem_free(args.value);
- } else {
- retval = context->put_listent(context,
+ retval = context->put_listent(context,
entry->flags,
name_rmt->name,
(int)name_rmt->namelen,
valuelen);
- }
if (retval)
return retval;
}
--
1.7.1
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH 2/4] xfs: don't pass value into attr ->put_listent, Eric Sandeen |
|---|---|
| Next by Date: | [PATCH 4/4] xfs: collapse cases in xfs_attr3_leaf_list_int, Eric Sandeen |
| Previous by Thread: | Re: [PATCH 2/4] xfs: don't pass value into attr ->put_listent, Christoph Hellwig |
| Next by Thread: | Re: [PATCH 3/4] xfs: remove put_value from attr ->put_listent context, Christoph Hellwig |
| Indexes: | [Date] [Thread] [Top] [All Lists] |