From: Dave Chinner <david@fromorbit.com>
Date: Mon, 2 Sep 2013 02:15:59 +0000 (+1000)
Subject: xfs: dtype changed xfs_dir2_sfe_put_ino to xfs_dir3_sfe_put_ino
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=50fc5f7accfeaaaa1bba07725f26945cf8033bb7;p=linux-beck.git

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>
---

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,
 		xfs_ino_t ino);
 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);
-extern void xfs_dir2_sfe_put_ino( struct xfs_dir2_sf_hdr *,
-		struct xfs_dir2_sf_entry *sfep, xfs_ino_t ino);
+extern void xfs_dir3_sfe_put_ino(struct xfs_mount *mp,
+		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_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(
 	return xfs_dir2_sf_get_ino(hdr, xfs_dir3_sfe_inop(mp, sfep));
 }
 
-static void
+void
 xfs_dir3_sfe_put_ino(
 	struct xfs_mount	*mp,
 	struct xfs_dir2_sf_hdr	*hdr,