diff options
author | Christoph Hellwig <hch@infradead.org> | 2007-12-18 00:26:55 -0500 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-07 02:20:11 -0500 |
commit | f71354bc3a96c657a70e36dcf980cbad6c9fc63f (patch) | |
tree | 1f32c9281e224fd067ff78ebc6dc0b763824bd98 /fs/xfs/xfs_vnodeops.c | |
parent | edd319dc527733e61eec5bdc9ce20c94634b6482 (diff) |
[XFS] Cleanup various fid related bits:
- merge xfs_fid2 into it's only caller xfs_dm_inode_to_fh.
- remove xfs_vget and opencode it in the two callers, simplifying
both of them by avoiding the awkward calling convetion.
- assign directly to the dm_fid_t members in various places in the
dmapi code instead of casting them to xfs_fid_t first (which
is identical to dm_fid_t)
SGI-PV: 974747
SGI-Modid: xfs-linux-melb:xfs-kern:30258a
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Vlad Apostolov <vapo@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 7f380e885a6f..6b71d9f763c7 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -3457,27 +3457,6 @@ std_return: | |||
3457 | goto std_return; | 3457 | goto std_return; |
3458 | } | 3458 | } |
3459 | 3459 | ||
3460 | |||
3461 | int | ||
3462 | xfs_fid2( | ||
3463 | xfs_inode_t *ip, | ||
3464 | xfs_fid_t *xfid) | ||
3465 | { | ||
3466 | xfs_itrace_entry(ip); | ||
3467 | |||
3468 | xfid->fid_len = sizeof(xfs_fid_t) - sizeof(xfid->fid_len); | ||
3469 | xfid->fid_pad = 0; | ||
3470 | /* | ||
3471 | * use memcpy because the inode is a long long and there's no | ||
3472 | * assurance that xfid->fid_ino is properly aligned. | ||
3473 | */ | ||
3474 | memcpy(&xfid->fid_ino, &ip->i_ino, sizeof(xfid->fid_ino)); | ||
3475 | xfid->fid_gen = ip->i_d.di_gen; | ||
3476 | |||
3477 | return 0; | ||
3478 | } | ||
3479 | |||
3480 | |||
3481 | int | 3460 | int |
3482 | xfs_rwlock( | 3461 | xfs_rwlock( |
3483 | xfs_inode_t *ip, | 3462 | xfs_inode_t *ip, |