On Fri, Apr 18, 2014 at 08:58:26AM +0800, Jeff Liu wrote: > From: Jie Liu <jeff.liu@xxxxxxxxxx> > > To fetch the file system number tables, we currently just ignore the > errors and proceed to loop over the next AG or bump agino to the next > chunk in case of btree operations failed, that is not properly because > those errors might hint us potential file system problems. > > This patch rework xfs_inumbers() to handle the btree operation errors > as well as the loop conditions. Also, add pre-checkups for the given > inode, we can save alloc/free the format buffer once against an invalid > inode number. The patch looks mostly good to me, but I really think it should be split into two patches: one to do the formatting changes and code consolidation, and then one that does the actual logic changes for better error handling. It's not easy to understand and verify with these two different changes combined. > xfs_inumbers_fmt( > void __user *ubuffer, /* buffer to write to */ > - const xfs_inogrp_t *buffer, /* buffer to read from */ > + const struct xfs_inogrp *buffer, /* buffer to read from */ > long count, /* # of elements to read */ > long *written) /* # of bytes written */ > { > if (copy_to_user(ubuffer, buffer, count * sizeof(*buffer))) > - return -EFAULT; > + return XFS_ERROR(EFAULT); xfs_inumbers_fmt_compat will need the same treatment. > *count = 0; > + if (agno >= mp->m_sb.sb_agcount || > + *lastino != XFS_AGINO_TO_INO(mp, agno, agino)) > + return 0; Where is the lastino check coming from? > buffer = kmem_alloc(bcount * sizeof(*buffer), KM_SLEEP); > + bufidx = error = 0; Why not initialize bufidx and error at declaration time? > + error = xfs_inobt_get_rec(cur, &r, &stat); > + if (error || !stat) > + break; The old code moved on to the next AG here, why has this changed? _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs