Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50fc5f7a authored Sep 02, 2013 by Dave Chinner Committed by Ben Myers Sep 03, 2013

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 98f7462c ("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>

parent 914ed44b

fs/xfs/xfs_dir2.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -70,8 +70,9 @@ extern void xfs_dir2_sf_put_parent_ino(struct xfs_dir2_sf_hdr *sfp,
	xfs_ino_t ino);		xfs_ino_t ino);
	extern xfs_ino_t xfs_dir3_sfe_get_ino(struct xfs_mount *mp,		extern xfs_ino_t xfs_dir3_sfe_get_ino(struct xfs_mount *mp,
	struct xfs_dir2_sf_hdr sfp, struct xfs_dir2_sf_entry sfep);		struct xfs_dir2_sf_hdr sfp, struct xfs_dir2_sf_entry sfep);
	extern void xfs_dir2_sfe_put_ino( struct xfs_dir2_sf_hdr *,		extern void xfs_dir3_sfe_put_ino(struct xfs_mount *mp,
	struct xfs_dir2_sf_entry *sfep, xfs_ino_t ino);		struct xfs_dir2_sf_hdr hdr, struct xfs_dir2_sf_entry sfep,
			xfs_ino_t ino);

	extern int xfs_dir2_isblock(struct xfs_trans tp, struct xfs_inode dp, int *r);		extern int xfs_dir2_isblock(struct xfs_trans tp, struct xfs_inode dp, int *r);
	extern int xfs_dir2_isleaf(struct xfs_trans tp, struct xfs_inode dp, int *r);		extern int xfs_dir2_isleaf(struct xfs_trans tp, struct xfs_inode dp, int *r);

fs/xfs/xfs_dir2_sf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -129,7 +129,7 @@ xfs_dir3_sfe_get_ino(
	return xfs_dir2_sf_get_ino(hdr, xfs_dir3_sfe_inop(mp, sfep));		return xfs_dir2_sf_get_ino(hdr, xfs_dir3_sfe_inop(mp, sfep));
	}		}

	static void		void
	xfs_dir3_sfe_put_ino(		xfs_dir3_sfe_put_ino(
	struct xfs_mount *mp,		struct xfs_mount *mp,
	struct xfs_dir2_sf_hdr *hdr,		struct xfs_dir2_sf_hdr *hdr,