[PATCH 1/3] xfs/122: decrease the log update done item sizes

linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 1/3] xfs/122: decrease the log update done item sizes
@ 2016-09-29  2:28 Darrick J. Wong
  2016-09-29  2:28 ` [PATCH 2/3] xfs/130: don't modify files after failed mount Darrick J. Wong
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Darrick J. Wong @ 2016-09-29  2:28 UTC (permalink / raw)
  To: david, eguan, darrick.wong; +Cc: linux-xfs, fstests

Redundant fields were removed from the rmap/refcount/bmap update done
log items, so fix the size tests.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/122.out |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


diff --git a/tests/xfs/122.out b/tests/xfs/122.out
index ae84283..67f7698 100644
--- a/tests/xfs/122.out
+++ b/tests/xfs/122.out
@@ -64,10 +64,10 @@ sizeof(struct xfs_btree_block) = 72
 sizeof(struct xfs_btree_block_lhdr) = 64
 sizeof(struct xfs_btree_block_shdr) = 48
 sizeof(struct xfs_bud_log_format) = 16
-sizeof(struct xfs_bui_log_format) = 48
+sizeof(struct xfs_bui_log_format) = 16
 sizeof(struct xfs_clone_args) = 32
 sizeof(struct xfs_cud_log_format) = 16
-sizeof(struct xfs_cui_log_format) = 32
+sizeof(struct xfs_cui_log_format) = 16
 sizeof(struct xfs_da3_blkinfo) = 56
 sizeof(struct xfs_da3_intnode) = 64
 sizeof(struct xfs_da3_node_hdr) = 64
@@ -94,7 +94,7 @@ sizeof(struct xfs_rtrmap_key) = 24
 sizeof(struct xfs_rtrmap_rec) = 32
 sizeof(struct xfs_rtrmap_root) = 4
 sizeof(struct xfs_rud_log_format) = 16
-sizeof(struct xfs_rui_log_format) = 48
+sizeof(struct xfs_rui_log_format) = 16
 sizeof(struct xfs_scrub_metadata) = 64
 sizeof(xfs_agf_t) = 224
 sizeof(xfs_agfl_t) = 36


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/3] xfs/130: don't modify files after failed mount
  2016-09-29  2:28 [PATCH 1/3] xfs/122: decrease the log update done item sizes Darrick J. Wong
@ 2016-09-29  2:28 ` Darrick J. Wong
  2016-09-29  6:27   ` Dave Chinner
  2016-09-29  2:28 ` [PATCH 3/3] xfs/{207,327}: fsxattr no longer has the reflink flag Darrick J. Wong
  2016-09-29  6:26 ` [PATCH 1/3] xfs/122: decrease the log update done item sizes Dave Chinner
  2 siblings, 1 reply; 6+ messages in thread
From: Darrick J. Wong @ 2016-09-29  2:28 UTC (permalink / raw)
  To: david, eguan, darrick.wong; +Cc: linux-xfs, fstests

In xfs/130, we try to mount a filesystem with the expectation that it
will fail.  Therefore, it is inappropriate to try to write to the
mountpoint, since it could otherwise be writable.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/130     |    9 +++------
 tests/xfs/130.out |    1 -
 2 files changed, 3 insertions(+), 7 deletions(-)


diff --git a/tests/xfs/130 b/tests/xfs/130
index 554d078..48f6a84 100755
--- a/tests/xfs/130
+++ b/tests/xfs/130
@@ -79,12 +79,9 @@ seq 0 $((agcount - 1)) | while read ag; do
 done
 
 echo "+ mount image"
-_scratch_mount
-
-echo "+ reflink more"
-_cp_reflink "${SCRATCH_MNT}/file1" "${SCRATCH_MNT}/file4" 2> /dev/null && \
-	_fail "should not be able to reflink with busted refcount btree"
-umount "${SCRATCH_MNT}"
+_scratch_mount >> $seqres.full 2>&1 && \
+	echo "Should not be able to mount with broken refcountbt."
+_scratch_unmount >> $seqres.full 2>&1
 
 echo "+ repair fs"
 _disable_dmesg_check
diff --git a/tests/xfs/130.out b/tests/xfs/130.out
index 58d153b..a0eab98 100644
--- a/tests/xfs/130.out
+++ b/tests/xfs/130.out
@@ -5,7 +5,6 @@ QA output created by 130
 + check fs
 + corrupt image
 + mount image
-+ reflink more
 + repair fs
 + mount image (2)
 + chattr -R -i


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/3] xfs/130: don't modify files after failed mount
  2016-09-29  2:28 ` [PATCH 2/3] xfs/130: don't modify files after failed mount Darrick J. Wong
@ 2016-09-29  6:27   ` Dave Chinner
  0 siblings, 0 replies; 6+ messages in thread
From: Dave Chinner @ 2016-09-29  6:27 UTC (permalink / raw)
  To: Darrick J. Wong; +Cc: eguan, linux-xfs, fstests

On Wed, Sep 28, 2016 at 07:28:34PM -0700, Darrick J. Wong wrote:
> In xfs/130, we try to mount a filesystem with the expectation that it
> will fail.  Therefore, it is inappropriate to try to write to the
> mountpoint, since it could otherwise be writable.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

fixes the failure I've been seeing.

Reviewed-by: Dave Chinner <dchinner@redhat.com>

> ---
>  tests/xfs/130     |    9 +++------
>  tests/xfs/130.out |    1 -
>  2 files changed, 3 insertions(+), 7 deletions(-)
> 
> 
> diff --git a/tests/xfs/130 b/tests/xfs/130
> index 554d078..48f6a84 100755
> --- a/tests/xfs/130
> +++ b/tests/xfs/130
> @@ -79,12 +79,9 @@ seq 0 $((agcount - 1)) | while read ag; do
>  done
>  
>  echo "+ mount image"
> -_scratch_mount
> -
> -echo "+ reflink more"
> -_cp_reflink "${SCRATCH_MNT}/file1" "${SCRATCH_MNT}/file4" 2> /dev/null && \
> -	_fail "should not be able to reflink with busted refcount btree"
> -umount "${SCRATCH_MNT}"
> +_scratch_mount >> $seqres.full 2>&1 && \
> +	echo "Should not be able to mount with broken refcountbt."
> +_scratch_unmount >> $seqres.full 2>&1
>  
>  echo "+ repair fs"
>  _disable_dmesg_check
> diff --git a/tests/xfs/130.out b/tests/xfs/130.out
> index 58d153b..a0eab98 100644
> --- a/tests/xfs/130.out
> +++ b/tests/xfs/130.out
> @@ -5,7 +5,6 @@ QA output created by 130
>  + check fs
>  + corrupt image
>  + mount image
> -+ reflink more
>  + repair fs
>  + mount image (2)
>  + chattr -R -i
> 
> 

-- 
Dave Chinner
david@fromorbit.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 3/3] xfs/{207,327}: fsxattr no longer has the reflink flag
  2016-09-29  2:28 [PATCH 1/3] xfs/122: decrease the log update done item sizes Darrick J. Wong
  2016-09-29  2:28 ` [PATCH 2/3] xfs/130: don't modify files after failed mount Darrick J. Wong
@ 2016-09-29  2:28 ` Darrick J. Wong
  2016-09-29  6:27   ` Dave Chinner
  2016-09-29  6:26 ` [PATCH 1/3] xfs/122: decrease the log update done item sizes Dave Chinner
  2 siblings, 1 reply; 6+ messages in thread
From: Darrick J. Wong @ 2016-09-29  2:28 UTC (permalink / raw)
  To: david, eguan, darrick.wong; +Cc: linux-xfs, fstests

The FS_XFLAG_REFLINK flag was removed from struct fsxattr prior to
the inclusion of reflink in XFS, so remove it from the test outputs.
Note that the inode flag still exists; it's simply not presented
to userspace any more.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/207.out |    4 ++--
 tests/xfs/327.out |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/tests/xfs/207.out b/tests/xfs/207.out
index 434b8d9..f6dc17d 100644
--- a/tests/xfs/207.out
+++ b/tests/xfs/207.out
@@ -11,8 +11,8 @@ Check extsz and cowextsz settings on 1Mbyte file
 [0] SCRATCH_MNT/test-207/file2
 [1048576] SCRATCH_MNT/test-207/file2
 Set cowextsize and check flag
-fsxattr.xflags = 0x20000 [----------------C]
+fsxattr.xflags = 0x10000 [---------------C]
 [1048576] SCRATCH_MNT/test-207/file3
 Unset cowextsize and check flag
-fsxattr.xflags = 0x0 [-----------------]
+fsxattr.xflags = 0x0 [----------------]
 [0] SCRATCH_MNT/test-207/file3
diff --git a/tests/xfs/327.out b/tests/xfs/327.out
index c88d623..5b3cba2 100644
--- a/tests/xfs/327.out
+++ b/tests/xfs/327.out
@@ -3,11 +3,11 @@ Format filesystem
 Create files
 Check files
 8fa14cdd754f91cc6554c9e71929cce7  SCRATCH_MNT/file.0
-[reflink] SCRATCH_MNT/file.0 
+[] SCRATCH_MNT/file.0 
 8fa14cdd754f91cc6554c9e71929cce7  SCRATCH_MNT/file.64
-[reflink] SCRATCH_MNT/file.64 
+[] SCRATCH_MNT/file.64 
 8fa14cdd754f91cc6554c9e71929cce7  SCRATCH_MNT/file.128
-[reflink] SCRATCH_MNT/file.128 
+[] SCRATCH_MNT/file.128 
 CoW all files
 Repair filesystem
 Check files again


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 3/3] xfs/{207,327}: fsxattr no longer has the reflink flag
  2016-09-29  2:28 ` [PATCH 3/3] xfs/{207,327}: fsxattr no longer has the reflink flag Darrick J. Wong
@ 2016-09-29  6:27   ` Dave Chinner
  0 siblings, 0 replies; 6+ messages in thread
From: Dave Chinner @ 2016-09-29  6:27 UTC (permalink / raw)
  To: Darrick J. Wong; +Cc: eguan, linux-xfs, fstests

On Wed, Sep 28, 2016 at 07:28:40PM -0700, Darrick J. Wong wrote:
> The FS_XFLAG_REFLINK flag was removed from struct fsxattr prior to
> the inclusion of reflink in XFS, so remove it from the test outputs.
> Note that the inode flag still exists; it's simply not presented
> to userspace any more.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

Fixes the failures I've seen

Reviewed-by: Dave Chinner <dchinner@redhat.com>

> ---
>  tests/xfs/207.out |    4 ++--
>  tests/xfs/327.out |    6 +++---
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> 
> diff --git a/tests/xfs/207.out b/tests/xfs/207.out
> index 434b8d9..f6dc17d 100644
> --- a/tests/xfs/207.out
> +++ b/tests/xfs/207.out
> @@ -11,8 +11,8 @@ Check extsz and cowextsz settings on 1Mbyte file
>  [0] SCRATCH_MNT/test-207/file2
>  [1048576] SCRATCH_MNT/test-207/file2
>  Set cowextsize and check flag
> -fsxattr.xflags = 0x20000 [----------------C]
> +fsxattr.xflags = 0x10000 [---------------C]
>  [1048576] SCRATCH_MNT/test-207/file3
>  Unset cowextsize and check flag
> -fsxattr.xflags = 0x0 [-----------------]
> +fsxattr.xflags = 0x0 [----------------]
>  [0] SCRATCH_MNT/test-207/file3
> diff --git a/tests/xfs/327.out b/tests/xfs/327.out
> index c88d623..5b3cba2 100644
> --- a/tests/xfs/327.out
> +++ b/tests/xfs/327.out
> @@ -3,11 +3,11 @@ Format filesystem
>  Create files
>  Check files
>  8fa14cdd754f91cc6554c9e71929cce7  SCRATCH_MNT/file.0
> -[reflink] SCRATCH_MNT/file.0 
> +[] SCRATCH_MNT/file.0 
>  8fa14cdd754f91cc6554c9e71929cce7  SCRATCH_MNT/file.64
> -[reflink] SCRATCH_MNT/file.64 
> +[] SCRATCH_MNT/file.64 
>  8fa14cdd754f91cc6554c9e71929cce7  SCRATCH_MNT/file.128
> -[reflink] SCRATCH_MNT/file.128 
> +[] SCRATCH_MNT/file.128 
>  CoW all files
>  Repair filesystem
>  Check files again
> 
> 

-- 
Dave Chinner
david@fromorbit.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/3] xfs/122: decrease the log update done item sizes
  2016-09-29  2:28 [PATCH 1/3] xfs/122: decrease the log update done item sizes Darrick J. Wong
  2016-09-29  2:28 ` [PATCH 2/3] xfs/130: don't modify files after failed mount Darrick J. Wong
  2016-09-29  2:28 ` [PATCH 3/3] xfs/{207,327}: fsxattr no longer has the reflink flag Darrick J. Wong
@ 2016-09-29  6:26 ` Dave Chinner
  2 siblings, 0 replies; 6+ messages in thread
From: Dave Chinner @ 2016-09-29  6:26 UTC (permalink / raw)
  To: Darrick J. Wong; +Cc: eguan, linux-xfs, fstests

On Wed, Sep 28, 2016 at 07:28:27PM -0700, Darrick J. Wong wrote:
> Redundant fields were removed from the rmap/refcount/bmap update done
> log items, so fix the size tests.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

works for me.

Reviewed-by: Dave Chinner <dchinner@redhat.com>

> ---
>  tests/xfs/122.out |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> 
> diff --git a/tests/xfs/122.out b/tests/xfs/122.out
> index ae84283..67f7698 100644
> --- a/tests/xfs/122.out
> +++ b/tests/xfs/122.out
> @@ -64,10 +64,10 @@ sizeof(struct xfs_btree_block) = 72
>  sizeof(struct xfs_btree_block_lhdr) = 64
>  sizeof(struct xfs_btree_block_shdr) = 48
>  sizeof(struct xfs_bud_log_format) = 16
> -sizeof(struct xfs_bui_log_format) = 48
> +sizeof(struct xfs_bui_log_format) = 16
>  sizeof(struct xfs_clone_args) = 32
>  sizeof(struct xfs_cud_log_format) = 16
> -sizeof(struct xfs_cui_log_format) = 32
> +sizeof(struct xfs_cui_log_format) = 16
>  sizeof(struct xfs_da3_blkinfo) = 56
>  sizeof(struct xfs_da3_intnode) = 64
>  sizeof(struct xfs_da3_node_hdr) = 64
> @@ -94,7 +94,7 @@ sizeof(struct xfs_rtrmap_key) = 24
>  sizeof(struct xfs_rtrmap_rec) = 32
>  sizeof(struct xfs_rtrmap_root) = 4
>  sizeof(struct xfs_rud_log_format) = 16
> -sizeof(struct xfs_rui_log_format) = 48
> +sizeof(struct xfs_rui_log_format) = 16
>  sizeof(struct xfs_scrub_metadata) = 64
>  sizeof(xfs_agf_t) = 224
>  sizeof(xfs_agfl_t) = 36
> 
> 

-- 
Dave Chinner
david@fromorbit.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-09-29  6:28 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-29  2:28 [PATCH 1/3] xfs/122: decrease the log update done item sizes Darrick J. Wong
2016-09-29  2:28 ` [PATCH 2/3] xfs/130: don't modify files after failed mount Darrick J. Wong
2016-09-29  6:27   ` Dave Chinner
2016-09-29  2:28 ` [PATCH 3/3] xfs/{207,327}: fsxattr no longer has the reflink flag Darrick J. Wong
2016-09-29  6:27   ` Dave Chinner
2016-09-29  6:26 ` [PATCH 1/3] xfs/122: decrease the log update done item sizes Dave Chinner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).