diff options
author | Dave Chinner <david@fromorbit.com> | 2013-09-01 22:15:59 -0400 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2013-09-03 15:51:16 -0400 |
commit | 50fc5f7accfeaaaa1bba07725f26945cf8033bb7 (patch) | |
tree | 5a5ff188d64e106c43e5f85710e2e00d083d53b6 /fs/xfs | |
parent | 914ed44b17dc30ce0d783e8e23fce58a1a92412c (diff) |
xfs: dtype changed xfs_dir2_sfe_put_ino to xfs_dir3_sfe_put_ino
So fix up the export in xfs_dir2.h that is needed by userspace.
<sigh>
Now xfs_dir3_sfe_put_ino has been made static. Revert 98f7462 ("xfs:
xfs_dir3_sfe_put_ino can be static") to being non static so that the
code shared with userspace is identical again.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_dir2.h | 5 | ||||
-rw-r--r-- | fs/xfs/xfs_dir2_sf.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/xfs/xfs_dir2.h b/fs/xfs/xfs_dir2.h index 768ddad41b84..9910401327d4 100644 --- a/fs/xfs/xfs_dir2.h +++ b/fs/xfs/xfs_dir2.h | |||
@@ -70,8 +70,9 @@ extern void xfs_dir2_sf_put_parent_ino(struct xfs_dir2_sf_hdr *sfp, | |||
70 | xfs_ino_t ino); | 70 | xfs_ino_t ino); |
71 | extern xfs_ino_t xfs_dir3_sfe_get_ino(struct xfs_mount *mp, | 71 | extern xfs_ino_t xfs_dir3_sfe_get_ino(struct xfs_mount *mp, |
72 | struct xfs_dir2_sf_hdr *sfp, struct xfs_dir2_sf_entry *sfep); | 72 | struct xfs_dir2_sf_hdr *sfp, struct xfs_dir2_sf_entry *sfep); |
73 | extern void xfs_dir2_sfe_put_ino( struct xfs_dir2_sf_hdr *, | 73 | extern void xfs_dir3_sfe_put_ino(struct xfs_mount *mp, |
74 | struct xfs_dir2_sf_entry *sfep, xfs_ino_t ino); | 74 | struct xfs_dir2_sf_hdr *hdr, struct xfs_dir2_sf_entry *sfep, |
75 | xfs_ino_t ino); | ||
75 | 76 | ||
76 | extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *r); | 77 | extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *r); |
77 | extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *r); | 78 | extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *r); |
diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c index 579b56b1dcd2..bb6e2848f473 100644 --- a/fs/xfs/xfs_dir2_sf.c +++ b/fs/xfs/xfs_dir2_sf.c | |||
@@ -129,7 +129,7 @@ xfs_dir3_sfe_get_ino( | |||
129 | return xfs_dir2_sf_get_ino(hdr, xfs_dir3_sfe_inop(mp, sfep)); | 129 | return xfs_dir2_sf_get_ino(hdr, xfs_dir3_sfe_inop(mp, sfep)); |
130 | } | 130 | } |
131 | 131 | ||
132 | static void | 132 | void |
133 | xfs_dir3_sfe_put_ino( | 133 | xfs_dir3_sfe_put_ino( |
134 | struct xfs_mount *mp, | 134 | struct xfs_mount *mp, |
135 | struct xfs_dir2_sf_hdr *hdr, | 135 | struct xfs_dir2_sf_hdr *hdr, |