diff options
Diffstat (limited to 'fs/xfs/xfs_itable.c')
-rw-r--r-- | fs/xfs/xfs_itable.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index 419de15aeb43..cf6754a3c5b3 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c | |||
@@ -59,7 +59,6 @@ xfs_bulkstat_one_iget( | |||
59 | { | 59 | { |
60 | xfs_icdinode_t *dic; /* dinode core info pointer */ | 60 | xfs_icdinode_t *dic; /* dinode core info pointer */ |
61 | xfs_inode_t *ip; /* incore inode pointer */ | 61 | xfs_inode_t *ip; /* incore inode pointer */ |
62 | bhv_vnode_t *vp; | ||
63 | int error; | 62 | int error; |
64 | 63 | ||
65 | error = xfs_iget(mp, NULL, ino, | 64 | error = xfs_iget(mp, NULL, ino, |
@@ -72,7 +71,6 @@ xfs_bulkstat_one_iget( | |||
72 | ASSERT(ip != NULL); | 71 | ASSERT(ip != NULL); |
73 | ASSERT(ip->i_blkno != (xfs_daddr_t)0); | 72 | ASSERT(ip->i_blkno != (xfs_daddr_t)0); |
74 | 73 | ||
75 | vp = XFS_ITOV(ip); | ||
76 | dic = &ip->i_d; | 74 | dic = &ip->i_d; |
77 | 75 | ||
78 | /* xfs_iget returns the following without needing | 76 | /* xfs_iget returns the following without needing |
@@ -85,7 +83,7 @@ xfs_bulkstat_one_iget( | |||
85 | buf->bs_uid = dic->di_uid; | 83 | buf->bs_uid = dic->di_uid; |
86 | buf->bs_gid = dic->di_gid; | 84 | buf->bs_gid = dic->di_gid; |
87 | buf->bs_size = dic->di_size; | 85 | buf->bs_size = dic->di_size; |
88 | vn_atime_to_bstime(vp, &buf->bs_atime); | 86 | vn_atime_to_bstime(VFS_I(ip), &buf->bs_atime); |
89 | buf->bs_mtime.tv_sec = dic->di_mtime.t_sec; | 87 | buf->bs_mtime.tv_sec = dic->di_mtime.t_sec; |
90 | buf->bs_mtime.tv_nsec = dic->di_mtime.t_nsec; | 88 | buf->bs_mtime.tv_nsec = dic->di_mtime.t_nsec; |
91 | buf->bs_ctime.tv_sec = dic->di_ctime.t_sec; | 89 | buf->bs_ctime.tv_sec = dic->di_ctime.t_sec; |
@@ -257,7 +255,7 @@ xfs_bulkstat_one( | |||
257 | *ubused = error; | 255 | *ubused = error; |
258 | 256 | ||
259 | out_free: | 257 | out_free: |
260 | kmem_free(buf, sizeof(*buf)); | 258 | kmem_free(buf); |
261 | return error; | 259 | return error; |
262 | } | 260 | } |
263 | 261 | ||
@@ -708,7 +706,7 @@ xfs_bulkstat( | |||
708 | /* | 706 | /* |
709 | * Done, we're either out of filesystem or space to put the data. | 707 | * Done, we're either out of filesystem or space to put the data. |
710 | */ | 708 | */ |
711 | kmem_free(irbuf, irbsize); | 709 | kmem_free(irbuf); |
712 | *ubcountp = ubelem; | 710 | *ubcountp = ubelem; |
713 | /* | 711 | /* |
714 | * Found some inodes, return them now and return the error next time. | 712 | * Found some inodes, return them now and return the error next time. |
@@ -914,7 +912,7 @@ xfs_inumbers( | |||
914 | } | 912 | } |
915 | *lastino = XFS_AGINO_TO_INO(mp, agno, agino); | 913 | *lastino = XFS_AGINO_TO_INO(mp, agno, agino); |
916 | } | 914 | } |
917 | kmem_free(buffer, bcount * sizeof(*buffer)); | 915 | kmem_free(buffer); |
918 | if (cur) | 916 | if (cur) |
919 | xfs_btree_del_cursor(cur, (error ? XFS_BTREE_ERROR : | 917 | xfs_btree_del_cursor(cur, (error ? XFS_BTREE_ERROR : |
920 | XFS_BTREE_NOERROR)); | 918 | XFS_BTREE_NOERROR)); |