* Re: [PATCH] xfstests: test dump/restore of 32-bit projids
@ 2012-08-27 9:52 Boris Ranto
2012-08-27 17:24 ` Eric Sandeen
0 siblings, 1 reply; 3+ messages in thread
From: Boris Ranto @ 2012-08-27 9:52 UTC (permalink / raw)
To: Eric Sandeen; +Cc: Bill Kendall, xfs-oss
[-- Attachment #1.1: Type: text/plain, Size: 3517 bytes --]
On Sun, 2012-08-26 at 22:27 -0500, Eric Sandeen wrote:
>Test that xfsdump/xfsrestore properly restores more than the
> bottom 16 bits of a 32-bit projid.
>
> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
> ---
>
> diff --git a/285 b/285
> new file mode 100755
> index 0000000..2804e5d
> --- /dev/null
> +++ b/285
> @@ -0,0 +1,81 @@
> +#! /bin/bash
> +# FS QA Test No. 285
> +#
> +# Test projid32: persist 32 bit projids thorugh dump/restore
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (c) 2012 Eric Sandeen. All Rights Reserved.
> +#
> +# This program is free software; you can redistribute it and/or
> +# modify it under the terms of the GNU General Public License as
> +# published by the Free Software Foundation.
> +#
> +# This program is distributed in the hope that it would be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write the Free Software Foundation,
> +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> +#-----------------------------------------------------------------------
> +#
> +# creator
> +owner=sandeen@sandeen.net
> +
> +seq=`basename $0`
> +echo "QA output created by $seq"
> +
> +here=`pwd`
> +tmp=/tmp/$$
> +status=1 # failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> + cd /
> + rm -f $tmp.*
> +}
> +
> +# get standard environment, filters and checks
> +. ./common.rc
> +. ./common.filter
> +. ./common.dump
> +. ./common.quota
> +
> +_require_scratch
> +_require_xfs_quota
> +
> +# real QA test starts here
> +
> +_supported_fs xfs
> +_supported_os IRIX Linux
> +
> +_scratch_mkfs_xfs -i projid32bit=1 >> $seq.full || _fail "mkfs failed"
> +
> +export MOUNT_OPTIONS="-opquota"
> +_qmount
> +_require_prjquota $SCRATCH_DEV
> +
> +# > 16 bit project ID
> +PROJID=2123456789
> +
> +# Put a project quota on a dir
> +mkdir $SCRATCH_MNT/dir
> +xfs_quota -x -c "project -s -p $SCRATCH_MNT/dir $PROJID" $SCRATCH_MNT >>
$seq.full || _fail "dir pquota failed"
> +
> +# Dump it then restore it to a fresh fs, and check the projid
> +rm -f $tmp.dumpfile
> +xfsdump -L label -M media -f $tmp.dumpfile $SCRATCH_MNT >> $seq.full ||
_fail "dump failed"
> +umount $SCRATCH_DEV
> +
> +_scratch_mkfs_xfs -i projid32bit=1 >> $seq.full || _fail "re-mkfs failed"
> +_qmount
> +xfsrestore -f $tmp.dumpfile $SCRATCH_MNT >> $seq.full || _fail "restore
failed"
> +
> +# check (-c) that we got the correct project ID back post-restore
> +xfs_quota -x -c "project -s -c -p $SCRATCH_MNT/dir $PROJID" $SCRATCH_MNT
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/285.out b/285.out
> new file mode 100644
> index 0000000..daf4e4c
> --- /dev/null
> +++ b/285.out
> @@ -0,0 +1,3 @@
> +QA output created by 285
> +Checking project 2123456790 (path /mnt/scratch/dir)...
> +Processed 1 (/etc/projects and cmdline) paths for project 2123456790
with recursion depth infinite (-1).
> diff --git a/group b/group
> index 104ed35..bbc74fe 100644
> --- a/group
> +++ b/group
> @@ -403,3 +403,4 @@ deprecated
> 282 dump ioctl auto quick
> 283 dump ioctl auto quick
> 284 auto
> +285 auto dump quota
>
>
I've been working on a xfstests projid32bit test case, too. It covers this
area + few others. I'll post that one, soon.
[-- Attachment #1.2: Type: text/html, Size: 4473 bytes --]
[-- Attachment #2: Type: text/plain, Size: 121 bytes --]
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] xfstests: test dump/restore of 32-bit projids
2012-08-27 9:52 [PATCH] xfstests: test dump/restore of 32-bit projids Boris Ranto
@ 2012-08-27 17:24 ` Eric Sandeen
0 siblings, 0 replies; 3+ messages in thread
From: Eric Sandeen @ 2012-08-27 17:24 UTC (permalink / raw)
To: Boris Ranto; +Cc: Bill Kendall, xfs-oss
On 8/27/12 4:52 AM, Boris Ranto wrote:
> On Sun, 2012-08-26 at 22:27 -0500, Eric Sandeen wrote:
>>Test that xfsdump/xfsrestore properly restores more than the
>> bottom 16 bits of a 32-bit projid.
>>
>> Signed-off-by: Eric Sandeen <sandeen@sandeen.net <mailto:sandeen@sandeen.net>>
>> ---
...
> I've been working on a xfstests projid32bit test case, too. It covers this area + few others. I'll post that one, soon.
Ok, if yours tests more we should just use it when it's ready, I think.
Thanks,
-Eric
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] xfsdump: save & restore 32-bit projids
@ 2012-08-27 0:20 Eric Sandeen
2012-08-27 3:27 ` [PATCH] xfstests: test dump/restore of " Eric Sandeen
0 siblings, 1 reply; 3+ messages in thread
From: Eric Sandeen @ 2012-08-27 0:20 UTC (permalink / raw)
To: xfs-oss; +Cc: =?UTF-8?B?QXJrYWRpdXN6IE1pxZtraWV3aWM=?=, Bill Kendall,
Boris Ranto
Current xfsdump/xfsrestore only recognize the lower 16 bits of the projid.
With this patch, the full 32 bits are dumped & restored.
Reported-by: Boris Ranto <branto@redhat.com>
Cc: Arkadiusz Miśkiewicz <arekm@maven.pl>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
This also adds a definition for bs_forkoff, but I don't think
that is something which should get saved & restored, correct?
TBH I've done very little hacking on xfsdump. I think this
requires a new version, but not sure. This seems to work but
may need sanity checks & fixups. And, of course, an xfstest.
Thanks,
-Eric
diff --git a/common/arch_xlate.c b/common/arch_xlate.c
index c156313..e42abd5 100644
--- a/common/arch_xlate.c
+++ b/common/arch_xlate.c
@@ -376,7 +376,8 @@ xlate_bstat(bstat_t *bs1, bstat_t *bs2, int dir)
IXLATE(bs1, bs2, bs_extsize);
IXLATE(bs1, bs2, bs_extents);
IXLATE(bs1, bs2, bs_gen);
- IXLATE(bs1, bs2, bs_projid);
+ IXLATE(bs1, bs2, bs_projid_lo);
+ IXLATE(bs1, bs2, bs_projid_hi);
IXLATE(bs1, bs2, bs_dmevmask);
IXLATE(bs1, bs2, bs_dmstate);
diff --git a/common/content_inode.h b/common/content_inode.h
index a25b66e..8f0390c 100644
--- a/common/content_inode.h
+++ b/common/content_inode.h
@@ -173,8 +173,10 @@ struct bstat { /* bytes accum */
int32_t bs_extsize; /* extent size 4 50 */
int32_t bs_extents; /* number of extents 4 54 */
u_int32_t bs_gen; /* generation count 4 58 */
- u_int16_t bs_projid; /* project id 2 5a */
- char bs_pad[ 14 ]; /* for expansion e 68 */
+ u_int16_t bs_projid_lo; /* low 16 of project id 2 5a */
+ u_int16_t bs_forkoff; /* inode fork offset 2 5c */
+ u_int16_t bs_projid_hi; /* hi 16 of project id 2 5e */
+ char bs_pad[ 10 ]; /* for expansion e 68 */
u_int32_t bs_dmevmask; /* DMI event mask 4 6c */
u_int16_t bs_dmstate; /* DMI state info 2 6e */
char bs_pad1[ 18 ]; /* for expansion 12 80 */
@@ -184,6 +186,18 @@ struct bstat { /* bytes accum */
typedef struct bstat bstat_t;
+/*
+ * Project quota id helpers (previously projid was 16bit only
+ * and using two 16bit values to hold new 32bit projid was choosen
+ * to retain compatibility with "old" filesystems).
+ */
+static inline __uint32_t
+bstat_projid(struct bstat *bs)
+{
+ return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
+}
+
+
/* extended inode flags that can only be set after all data
* has been restored to a file.
*/
diff --git a/common/global.c b/common/global.c
index 8e49d8b..1793ff4 100644
--- a/common/global.c
+++ b/common/global.c
@@ -281,6 +281,7 @@ global_version_check( u_int32_t version )
case GLOBAL_HDR_VERSION_1:
case GLOBAL_HDR_VERSION_2:
case GLOBAL_HDR_VERSION_3:
+ case GLOBAL_HDR_VERSION_4:
return BOOL_TRUE;
default:
return BOOL_FALSE;
diff --git a/common/global.h b/common/global.h
index 6556a68..5138ed8 100644
--- a/common/global.h
+++ b/common/global.h
@@ -28,13 +28,15 @@
#define GLOBAL_HDR_VERSION_1 1
#define GLOBAL_HDR_VERSION_2 2
#define GLOBAL_HDR_VERSION_3 3
- /* version 3 uses the full 32-bit inode generation number in direnthdr_t.
+#define GLOBAL_HDR_VERSION_4 4
+ /* version 4 adds 32-bit projid (projid_hi)
+ * version 3 uses the full 32-bit inode generation number in direnthdr_t.
* version 2 adds encoding of holes and a change to on-tape inventory format.
* version 1 adds extended file attribute dumping.
* version 0 xfsrestore can't handle media produced
* by version 1 xfsdump.
*/
-#define GLOBAL_HDR_VERSION GLOBAL_HDR_VERSION_3
+#define GLOBAL_HDR_VERSION GLOBAL_HDR_VERSION_4
#define GLOBAL_HDR_STRING_SZ 0x100
#define GLOBAL_HDR_TIME_SZ 4
diff --git a/dump/content.c b/dump/content.c
index 481297a..ec5e954 100644
--- a/dump/content.c
+++ b/dump/content.c
@@ -4927,7 +4927,8 @@ copy_xfs_bstat(bstat_t *dst, xfs_bstat_t *src)
dst->bs_extsize = src->bs_extsize;
dst->bs_extents = src->bs_extents;
dst->bs_gen = src->bs_gen;
- dst->bs_projid = src->bs_projid;
+ dst->bs_projid_lo = src->bs_projid_lo;
+ dst->bs_projid_hi = src->bs_projid_hi;
dst->bs_dmevmask = src->bs_dmevmask;
dst->bs_dmstate = src->bs_dmstate;
}
diff --git a/restore/content.c b/restore/content.c
index 3110cdf..edd00ed 100644
--- a/restore/content.c
+++ b/restore/content.c
@@ -7451,7 +7451,7 @@ restore_reg( drive_t *drivep,
memset((void *)&fsxattr, 0, sizeof( fsxattr ));
fsxattr.fsx_xflags = bstatp->bs_xflags & ~POST_DATA_XFLAGS;
fsxattr.fsx_extsize = (u_int32_t) bstatp->bs_extsize;
- fsxattr.fsx_projid = bstatp->bs_projid;
+ fsxattr.fsx_projid = bstat_projid(bstatp);
rval = ioctl( *fdp, XFS_IOC_FSSETXATTR, (void *)&fsxattr);
if ( rval < 0 ) {
@@ -7702,7 +7702,7 @@ restore_complete_reg(stream_context_t *strcxtp)
memset((void *)&fsxattr, 0, sizeof( fsxattr ));
fsxattr.fsx_xflags = bstatp->bs_xflags;
fsxattr.fsx_extsize = (u_int32_t)bstatp->bs_extsize;
- fsxattr.fsx_projid = bstatp->bs_projid;
+ fsxattr.fsx_projid = bstat_projid(bstatp);
rval = ioctl( fd, XFS_IOC_FSSETXATTR, (void *)&fsxattr );
if ( rval < 0 ) {
diff --git a/restore/dirattr.c b/restore/dirattr.c
index 68d1b49..8a1fb06 100644
--- a/restore/dirattr.c
+++ b/restore/dirattr.c
@@ -434,7 +434,7 @@ dirattr_add( filehdr_t *fhdrp )
dirattr.d_ctime = ( time32_t )fhdrp->fh_stat.bs_ctime.tv_sec;
dirattr.d_xflags = fhdrp->fh_stat.bs_xflags;
dirattr.d_extsize = ( u_int32_t )fhdrp->fh_stat.bs_extsize;
- dirattr.d_projid = fhdrp->fh_stat.bs_projid;
+ dirattr.d_projid = bstat_projid(&(fhdrp->fh_stat));
dirattr.d_dmevmask = fhdrp->fh_stat.bs_dmevmask;
dirattr.d_dmstate = ( u_int32_t )fhdrp->fh_stat.bs_dmstate;
#ifdef DIRATTRCHK
@@ -812,7 +812,7 @@ dirattr_update( dah_t dah, filehdr_t *fhdrp )
dirattr.d_ctime = ( time32_t )fhdrp->fh_stat.bs_ctime.tv_sec;
dirattr.d_xflags = fhdrp->fh_stat.bs_xflags;
dirattr.d_extsize = ( u_int32_t )fhdrp->fh_stat.bs_extsize;
- dirattr.d_projid = fhdrp->fh_stat.bs_projid;
+ dirattr.d_projid = bstat_projid(&(fhdrp->fh_stat));
dirattr.d_dmevmask = fhdrp->fh_stat.bs_dmevmask;
dirattr.d_dmstate = ( u_int32_t )fhdrp->fh_stat.bs_dmstate;
dirattr.d_extattroff = DIRATTR_EXTATTROFFNULL;
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] xfstests: test dump/restore of 32-bit projids
2012-08-27 0:20 [PATCH] xfsdump: save & restore " Eric Sandeen
@ 2012-08-27 3:27 ` Eric Sandeen
0 siblings, 0 replies; 3+ messages in thread
From: Eric Sandeen @ 2012-08-27 3:27 UTC (permalink / raw)
To: Eric Sandeen
Cc: Bill Kendall, =?UTF-8?B?QXJrYWRpdXN6IE1pxZtraWV3aWM=?=,
Boris Ranto, xfs-oss
Test that xfsdump/xfsrestore properly restores more than the
bottom 16 bits of a 32-bit projid.
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
diff --git a/285 b/285
new file mode 100755
index 0000000..2804e5d
--- /dev/null
+++ b/285
@@ -0,0 +1,81 @@
+#! /bin/bash
+# FS QA Test No. 285
+#
+# Test projid32: persist 32 bit projids thorugh dump/restore
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2012 Eric Sandeen. All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#-----------------------------------------------------------------------
+#
+# creator
+owner=sandeen@sandeen.net
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+. ./common.dump
+. ./common.quota
+
+_require_scratch
+_require_xfs_quota
+
+# real QA test starts here
+
+_supported_fs xfs
+_supported_os IRIX Linux
+
+_scratch_mkfs_xfs -i projid32bit=1 >> $seq.full || _fail "mkfs failed"
+
+export MOUNT_OPTIONS="-opquota"
+_qmount
+_require_prjquota $SCRATCH_DEV
+
+# > 16 bit project ID
+PROJID=2123456789
+
+# Put a project quota on a dir
+mkdir $SCRATCH_MNT/dir
+xfs_quota -x -c "project -s -p $SCRATCH_MNT/dir $PROJID" $SCRATCH_MNT >> $seq.full || _fail "dir pquota failed"
+
+# Dump it then restore it to a fresh fs, and check the projid
+rm -f $tmp.dumpfile
+xfsdump -L label -M media -f $tmp.dumpfile $SCRATCH_MNT >> $seq.full || _fail "dump failed"
+umount $SCRATCH_DEV
+
+_scratch_mkfs_xfs -i projid32bit=1 >> $seq.full || _fail "re-mkfs failed"
+_qmount
+xfsrestore -f $tmp.dumpfile $SCRATCH_MNT >> $seq.full || _fail "restore failed"
+
+# check (-c) that we got the correct project ID back post-restore
+xfs_quota -x -c "project -s -c -p $SCRATCH_MNT/dir $PROJID" $SCRATCH_MNT
+
+# success, all done
+status=0
+exit
diff --git a/285.out b/285.out
new file mode 100644
index 0000000..daf4e4c
--- /dev/null
+++ b/285.out
@@ -0,0 +1,3 @@
+QA output created by 285
+Checking project 2123456790 (path /mnt/scratch/dir)...
+Processed 1 (/etc/projects and cmdline) paths for project 2123456790 with recursion depth infinite (-1).
diff --git a/group b/group
index 104ed35..bbc74fe 100644
--- a/group
+++ b/group
@@ -403,3 +403,4 @@ deprecated
282 dump ioctl auto quick
283 dump ioctl auto quick
284 auto
+285 auto dump quota
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-27 17:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-27 9:52 [PATCH] xfstests: test dump/restore of 32-bit projids Boris Ranto
2012-08-27 17:24 ` Eric Sandeen
-- strict thread matches above, loose matches on Subject: below --
2012-08-27 0:20 [PATCH] xfsdump: save & restore " Eric Sandeen
2012-08-27 3:27 ` [PATCH] xfstests: test dump/restore of " Eric Sandeen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox