|
|
| version 1.12, 2007/08/24 16:15:28 | version 1.13, 2007/09/11 06:12:43 |
|---|---|
| Line 67 xfs_dm_fh_to_inode( | Line 67 xfs_dm_fh_to_inode( |
| bhv_vnode_t *vp = NULL; | bhv_vnode_t *vp = NULL; |
| xfs_mount_t *mp = XFS_M(sb); | xfs_mount_t *mp = XFS_M(sb); |
| int error; | int error; |
| fid_t fid; | struct xfs_fid xfid; |
| /* Returns negative errors to DMAPI */ | /* Returns negative errors to DMAPI */ |
| *ip = NULL; | *ip = NULL; |
| memcpy(&fid, dmfid, sizeof(*dmfid)); | memcpy(&xfid, dmfid, sizeof(*dmfid)); |
| if (fid.fid_len) { /* file object handle */ | if (xfid.fid_len) { /* file object handle */ |
| error = xfs_vget(mp, &vp, &fid); | error = xfs_vget(mp, &vp, &xfid); |
| } | } |
| else { /* filesystem handle */ | else { /* filesystem handle */ |
| error = xfs_root(mp, &vp); | error = xfs_root(mp, &vp); |
| Line 92 xfs_dm_inode_to_fh( | Line 92 xfs_dm_inode_to_fh( |
| { | { |
| xfs_inode_t *ip = XFS_I(inode); | xfs_inode_t *ip = XFS_I(inode); |
| int error; | int error; |
| fid_t fid; | struct xfs_fid xfid; |
| /* Returns negative errors to DMAPI */ | /* Returns negative errors to DMAPI */ |
| if (ip->i_mount->m_fixedfsid == NULL) | if (ip->i_mount->m_fixedfsid == NULL) |
| return -EINVAL; | return -EINVAL; |
| error = xfs_fid2(ip, &fid); | error = xfs_fid2(ip, &xfid); |
| if (error) | if (error) |
| return -error; /* Return negative error to DMAPI */ | return -error; /* Return negative error to DMAPI */ |
| memcpy(dmfid, &fid, sizeof(*dmfid)); | memcpy(dmfid, &xfid, sizeof(*dmfid)); |
| memcpy(dmfsid, ip->i_mount->m_fixedfsid, sizeof(*dmfsid)); | memcpy(dmfsid, ip->i_mount->m_fixedfsid, sizeof(*dmfsid)); |
| return 0; | return 0; |
| } | } |