Skip to contentSkip to conversation

xfsprogs: fix inadvertent mkfs default change for projid32bit

PATCH In review Eric Sandeen 3 participants 4 messages Oct 6, 2013 – Oct 8, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfsprogs: fix inadvertent mkfs default change for projid32bit

This commit:

f3edb66a mkfs.xfs: validate options for CRCs up front.

seems to have inadvertently switched to 32bit project IDs by default:

-       int                     projid32bit;
+       int                     projid16bit;

...
- projid32bit = 0;
+ projid16bit = 0;

Switch back to 16 bit project ID by default, at least until we intentionally make that change.

---

mkfs/xfs_mkfs.c +1 -1
index eafbed3..ebab09d 100644
@@ -965,7 +965,7 @@ main(
 	textdomain(PACKAGE);
 
 	attrversion = 2;
-	projid16bit = 0;
+	projid16bit = 1;
 	blflag = bsflag = slflag = ssflag = lslflag = lssflag = 0;
 	blocklog = blocksize = 0;
 	sectorlog = lsectorlog = XFS_MIN_SECTORSIZE_LOG;

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#1 lore raw
Quoted 23 lines · Eric Sandeen

This commit:

f3edb66a mkfs.xfs: validate options for CRCs up front.

seems to have inadvertently switched to 32bit project IDs by default:

(quoted diff) +2 -2
-       int                     projid32bit;
+       int                     projid16bit;
...
-       projid32bit = 0;
+       projid16bit = 0;

Switch back to 16 bit project ID by default, at least until we intentionally make that change.

---

mkfs/xfs_mkfs.c +0 -0
index eafbed3..ebab09d 100644

mkfs/xfs_mkfs.c main( · line 971

Quoted 8 lines
mkfs/xfs_mkfs.c +1 -1
@@ -965,7 +965,7 @@ main(
 	textdomain(PACKAGE);
 
 	attrversion = 2;
-	projid16bit = 0;
+	projid16bit = 1;
 	blflag = bsflag = slflag = ssflag = lslflag = lssflag = 0;
 	blocklog = blocksize = 0;
 	sectorlog = lsectorlog = XFS_MIN_SECTORSIZE_LOG;

And so:

                /* 32 bit project quota always on */
                /* attr2 always on */
                if (projid16bit == 1) {
                        fprintf(stderr,
_("32 bit Project IDs always enabled on CRC enabled filesytems\n"));
                        usage();
                }

That will prevent mkfs from making a CRC enabled filesystem.

And, realistically, what's the problem with enabling 32 bit project IDs by default for all new filesystems in 3.2.0? I'm of the opinion we should just leave the code as it is because all kernels since 2.6.37 support 32 bit projid and any kernel picking up xfsprogs-3.2.0 when it is released will have a kernel that supports it....

Cheers,

Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#2 lore raw
Quoted 43 lines · Dave Chinner
Quoted 23 lines · Eric Sandeen

This commit:

f3edb66a mkfs.xfs: validate options for CRCs up front.

seems to have inadvertently switched to 32bit project IDs by default:

(quoted diff) +2 -2
-       int                     projid32bit;
+       int                     projid16bit;
...
-       projid32bit = 0;
+       projid16bit = 0;

Switch back to 16 bit project ID by default, at least until we intentionally make that change.

---

mkfs/xfs_mkfs.c +0 -0
index eafbed3..ebab09d 100644

mkfs/xfs_mkfs.c main( · line 971

Quoted 8 lines
mkfs/xfs_mkfs.c +1 -1
@@ -965,7 +965,7 @@ main(
 	textdomain(PACKAGE);
 
 	attrversion = 2;
-	projid16bit = 0;
+	projid16bit = 1;
 	blflag = bsflag = slflag = ssflag = lslflag = lssflag = 0;
 	blocklog = blocksize = 0;
 	sectorlog = lsectorlog = XFS_MIN_SECTORSIZE_LOG;

And so:

                /* 32 bit project quota always on */
                /* attr2 always on */
                if (projid16bit == 1) {
                        fprintf(stderr,
_("32 bit Project IDs always enabled on CRC enabled filesytems\n"));
                        usage();
                }
Quoted 1 line

That will prevent mkfs from making a CRC enabled filesystem.

Well, that's quite fixable.

Quoted 6 lines

And, realistically, what's the problem with enabling 32 bit project IDs by default for all new filesystems in 3.2.0? I'm of the opinion we should just leave the code as it is because all kernels since 2.6.37 support 32 bit projid and any kernel picking up xfsprogs-3.2.0 when it is released will have a kernel that supports it....

Doesn't really bother me -

But please send a man page patch. ;)

And then we need to fix up xfstests... at least one fails as a result of this IIRC, I'll have to go look again.

I don't care if the defaults change but I'd prefer it to not have happened accidentally via

"mkfs.xfs: validate options for CRCs up front" ;)

It wasn't documented & didn't seem intentional, so it needs fixing one way or the other.

-Eric

Quoted 4 lines

Cheers,

Dave.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#3 lore raw
Quoted 55 lines · Eric Sandeen
Quoted 43 lines · Dave Chinner
Quoted 23 lines · Eric Sandeen

This commit:

f3edb66a mkfs.xfs: validate options for CRCs up front.

seems to have inadvertently switched to 32bit project IDs by default:

(quoted diff) +2 -2
-       int                     projid32bit;
+       int                     projid16bit;
...
-       projid32bit = 0;
+       projid16bit = 0;

Switch back to 16 bit project ID by default, at least until we intentionally make that change.

---

mkfs/xfs_mkfs.c +0 -0
index eafbed3..ebab09d 100644

mkfs/xfs_mkfs.c main( · line 971

Quoted 8 lines
mkfs/xfs_mkfs.c +1 -1
@@ -965,7 +965,7 @@ main(
 	textdomain(PACKAGE);
 
 	attrversion = 2;
-	projid16bit = 0;
+	projid16bit = 1;
 	blflag = bsflag = slflag = ssflag = lslflag = lssflag = 0;
 	blocklog = blocksize = 0;
 	sectorlog = lsectorlog = XFS_MIN_SECTORSIZE_LOG;

And so:

                /* 32 bit project quota always on */
                /* attr2 always on */
                if (projid16bit == 1) {
                        fprintf(stderr,
_("32 bit Project IDs always enabled on CRC enabled filesytems\n"));
                        usage();
                }
Quoted 1 line

That will prevent mkfs from making a CRC enabled filesystem.

Well, that's quite fixable.

Quoted 6 lines

And, realistically, what's the problem with enabling 32 bit project IDs by default for all new filesystems in 3.2.0? I'm of the opinion we should just leave the code as it is because all kernels since 2.6.37 support 32 bit projid and any kernel picking up xfsprogs-3.2.0 when it is released will have a kernel that supports it....

Quoted 6 lines

Doesn't really bother me -

But please send a man page patch. ;)

And then we need to fix up xfstests... at least one fails as a result of this IIRC, I'll have to go look again.

See the link in my reply to the xfstests patch....

Quoted 8 lines

I don't care if the defaults change but I'd prefer it to not have happened accidentally via

"mkfs.xfs: validate options for CRCs up front" ;)

It wasn't documented & didn't seem intentional, so it needs fixing one way or the other.

It was intentional (see above), just not documented ;)

Cheers,

Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs