On Fri, Aug 30, 2013 at 04:21:20PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> So fix up the export in xfs_dir2.h that is needed by userspace.
>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
Well, this patch now causes a compilation failure. Why?
xfs_dir3_sfe_put_ino() got marked as static because it didn't have a
matching export.
Perhaps we should be a little less hasty in merging auto-generated
patches from random build-farms? The patch was wrong - fixing the
prototype like in v1 of this patch was the correct thing to do....
So, the updated patch below adds the revert.
Cheers,
Dave.
PS: Ben, when you merge a patch from a reply in an email thread,
can you please pull the commit subject line from the patch, not the
title of the email thread? One of the recent commits got it wrong.
i.e. commit 3780437
"XFS: Assertion failed: first <= last && last < BBTOB(bp->b_length), file:"
should have had the title
"xfs: fix calculation of the number of node entries in a dir3 node"
--
Dave Chinner
david@xxxxxxxxxxxxx
xfs: dtype changed xfs_dir2_sfe_put_ino to xfs_dir3_sfe_put_ino
From: Dave Chinner <dchinner@xxxxxxxxxx>
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@xxxxxxxxxx>
---
V2: revert 98f7462 so that xfs_dir3_sfe_put_ino is exported again to
match what userspace needs.
fs/xfs/xfs_dir2.h | 5 +++--
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 768ddad..9910401 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 579b56b..bb6e284 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,
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
