aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log_cil.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-12-06 16:58:09 -0500
committerBen Myers <bpm@sgi.com>2011-12-08 14:53:30 -0500
commitb39342134a6ec72778ffc2ddbd3c0faa10c64676 (patch)
treefc95ebf3b6ef32c80b907d7ea9af6112b4e520ff /fs/xfs/xfs_log_cil.c
parent0244b9603df38bf19155b761689e1a816fc50b0a (diff)
xfs: remove the lid_size field in struct log_item_desc
Outside the now removed nodelaylog code this field is only used for asserts and can be safely removed now. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_log_cil.c')
-rw-r--r--fs/xfs/xfs_log_cil.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index 68812d3ab14d..26db6b13f1f9 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -179,23 +179,24 @@ xlog_cil_prepare_log_vecs(
179 void *ptr; 179 void *ptr;
180 int index; 180 int index;
181 int len = 0; 181 int len = 0;
182 uint niovecs;
182 183
183 /* Skip items which aren't dirty in this transaction. */ 184 /* Skip items which aren't dirty in this transaction. */
184 if (!(lidp->lid_flags & XFS_LID_DIRTY)) 185 if (!(lidp->lid_flags & XFS_LID_DIRTY))
185 continue; 186 continue;
186 187
187 /* Skip items that do not have any vectors for writing */ 188 /* Skip items that do not have any vectors for writing */
188 lidp->lid_size = IOP_SIZE(lidp->lid_item); 189 niovecs = IOP_SIZE(lidp->lid_item);
189 if (!lidp->lid_size) 190 if (!niovecs)
190 continue; 191 continue;
191 192
192 new_lv = kmem_zalloc(sizeof(*new_lv) + 193 new_lv = kmem_zalloc(sizeof(*new_lv) +
193 lidp->lid_size * sizeof(struct xfs_log_iovec), 194 niovecs * sizeof(struct xfs_log_iovec),
194 KM_SLEEP); 195 KM_SLEEP);
195 196
196 /* The allocated iovec region lies beyond the log vector. */ 197 /* The allocated iovec region lies beyond the log vector. */
197 new_lv->lv_iovecp = (struct xfs_log_iovec *)&new_lv[1]; 198 new_lv->lv_iovecp = (struct xfs_log_iovec *)&new_lv[1];
198 new_lv->lv_niovecs = lidp->lid_size; 199 new_lv->lv_niovecs = niovecs;
199 new_lv->lv_item = lidp->lid_item; 200 new_lv->lv_item = lidp->lid_item;
200 201
201 /* build the vector array and calculate it's length */ 202 /* build the vector array and calculate it's length */