[PATCH 0/2] xfs: minor cleanups for userspace sanity

[PATCH 0/2] xfs: minor cleanups for userspace sanity

[Dave Chinner]

Hi folks,

These are just a couple of small patches that fix up minor issues to
do with syncing code to userspace. Trivial, no compiled code impact
at all.

Cheers,

Dave.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 1/2] xfs: dtype changed xfs_dir2_sfe_put_ino to xfs_dir3_sfe_put_ino

[Dave Chinner]

From: Dave Chinner <dchinner@redhat.com>

So fix up the export in xfs_dir2.h that is needed by userspace.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 fs/xfs/xfs_dir2.h | 5 +++--
 1 file changed, 3 insertions(+), 2 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);
-- 
1.8.3.2

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 2/2] xfs: XFS_MOUNT_QUOTA_ALL needed by userspace

[Dave Chinner]

From: Dave Chinner <dchinner@redhat.com>

So move it to a header file shared with userspace.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 fs/xfs/xfs_log_format.h | 6 ++++++
 fs/xfs/xfs_quota.h      | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/fs/xfs/xfs_log_format.h b/fs/xfs/xfs_log_format.h
index 5b7ba98..ca7e28a 100644
--- a/fs/xfs/xfs_log_format.h
+++ b/fs/xfs/xfs_log_format.h
@@ -825,6 +825,12 @@ typedef struct xfs_qoff_logformat {
 #define XFS_ALL_QUOTA_CHKD	\
 		(XFS_UQUOTA_CHKD | XFS_GQUOTA_CHKD | XFS_PQUOTA_CHKD)
 
+#define XFS_MOUNT_QUOTA_ALL	(XFS_UQUOTA_ACCT|XFS_UQUOTA_ENFD|\
+				 XFS_UQUOTA_CHKD|XFS_GQUOTA_ACCT|\
+				 XFS_GQUOTA_ENFD|XFS_GQUOTA_CHKD|\
+				 XFS_PQUOTA_ACCT|XFS_PQUOTA_ENFD|\
+				 XFS_PQUOTA_CHKD)
+
 /*
  * Inode create log item structure
  *
diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h
index 66522da..e7d84d2 100644
--- a/fs/xfs/xfs_quota.h
+++ b/fs/xfs/xfs_quota.h
@@ -48,13 +48,6 @@ struct xfs_trans;
 	 (XFS_IS_PQUOTA_ON(mp) && \
 		(mp->m_sb.sb_qflags & XFS_PQUOTA_CHKD) == 0))
 
-#define XFS_MOUNT_QUOTA_ALL	(XFS_UQUOTA_ACCT|XFS_UQUOTA_ENFD|\
-				 XFS_UQUOTA_CHKD|XFS_GQUOTA_ACCT|\
-				 XFS_GQUOTA_ENFD|XFS_GQUOTA_CHKD|\
-				 XFS_PQUOTA_ACCT|XFS_PQUOTA_ENFD|\
-				 XFS_PQUOTA_CHKD)
-
-
 /*
  * The structure kept inside the xfs_trans_t keep track of dquot changes
  * within a transaction and apply them later.
-- 
1.8.3.2

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/2] xfs: dtype changed xfs_dir2_sfe_put_ino to xfs_dir3_sfe_put_ino

[Mark Tinguely]

On 08/30/13 01:21, Dave Chinner wrote:
> From: Dave Chinner<dchinner@redhat.com>
>
> So fix up the export in xfs_dir2.h that is needed by userspace.
>
> Signed-off-by: Dave Chinner<dchinner@redhat.com>
> ---
>   fs/xfs/xfs_dir2.h | 5 +++--
>   1 file changed, 3 insertions(+), 2 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);

Okay xfs_dir2_sfe_put_ino() does not exist. xfs_dir3_sfe_put_ino() is 
remotely used in xfs_repair but not in kernel.

Reviewed-by: Mark Tinguely <tinguely@sgi.com>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/2] xfs: XFS_MOUNT_QUOTA_ALL needed by userspace

[Mark Tinguely]

On 08/30/13 01:21, Dave Chinner wrote:
> From: Dave Chinner<dchinner@redhat.com>
>
> So move it to a header file shared with userspace.
>
> Signed-off-by: Dave Chinner<dchinner@redhat.com>
> ---

xfs_quota.h is kernel only. xfs_format.h is the correct header.

Reviewed-by: Mark Tinguely <tinguely@sgi.com>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH V2] xfs: dtype changed xfs_dir2_sfe_put_ino to xfs_dir3_sfe_put_ino

[Dave Chinner]

On Fri, Aug 30, 2013 at 04:21:20PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> So fix up the export in xfs_dir2.h that is needed by userspace.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>

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@fromorbit.com

xfs: dtype changed xfs_dir2_sfe_put_ino to xfs_dir3_sfe_put_ino

From: Dave Chinner <dchinner@redhat.com>

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>
---
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@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH V2] xfs: dtype changed xfs_dir2_sfe_put_ino to xfs_dir3_sfe_put_ino

[Ben Myers]

Hi Dave,

On Mon, Sep 02, 2013 at 12:15:59PM +1000, Dave Chinner wrote:
> On Fri, Aug 30, 2013 at 04:21:20PM +1000, Dave Chinner wrote:
> > From: Dave Chinner <dchinner@redhat.com>
> > 
> > So fix up the export in xfs_dir2.h that is needed by userspace.
> > 
> > Signed-off-by: Dave Chinner <dchinner@redhat.com>
> 
> 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"

I'll keep an eye out, thanks.

> -- 
> Dave Chinner
> david@fromorbit.com
> 
> xfs: dtype changed xfs_dir2_sfe_put_ino to xfs_dir3_sfe_put_ino
> 
> From: Dave Chinner <dchinner@redhat.com>
> 
> 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>

Ah.. sorry I missed that it's used in your userspace series.  Could you repost
your userspace series soon?

Reviewed-by: Ben Myers <bpm@sgi.com>

Thanks,
	Ben

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 0/2] xfs: minor cleanups for userspace sanity

[Ben Myers]

On Fri, Aug 30, 2013 at 04:21:19PM +1000, Dave Chinner wrote:
> These are just a couple of small patches that fix up minor issues to
> do with syncing code to userspace. Trivial, no compiled code impact
> at all.

Applied these two.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs