Skip to contentSkip to conversation

GFS2 Filesystem [13/16]

PATCH Steven Whitehouse 3 participants 5 messages Feb 24, 2006 – Feb 27, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

[PATCH 13/16] GFS2:

This hooks GFS2 into the kernel's build system. It also adds some documentation. Note that the dlm has been moved to be under fs/dlm as per Ingo Molnar's suggestion. This patch series doesn't include the dlm however as its already in both -mm and the git tree containing GFS2 at kernel.org.

 Documentation/filesystems/gfs2.txt |   44 +++++++++++++++++++++++++++++++++++
 fs/Kconfig                         |    6 ++--
 fs/Makefile                        |    2 +
 fs/gfs2/Kconfig                    |   46 +++++++++++++++++++++++++++++++++++++
 fs/gfs2/Makefile                   |   42 +++++++++++++++++++++++++++++++++
 5 files changed, 137 insertions(+), 3 deletions(-)
fs/Kconfig +3 -3
@@ -323,6 +323,7 @@ config FS_POSIX_ACL
 	default n
 
 source "fs/xfs/Kconfig"
+source "fs/gfs2/Kconfig"
 
 config OCFS2_FS
 	tristate "OCFS2 file system support (EXPERIMENTAL)"
@@ -883,8 +884,6 @@ config CONFIGFS_FS
 	  Both sysfs and configfs can and should exist together on the
 	  same system. One is not a replacement for the other.
 
-	  If unsure, say N.
-
 endmenu
 
 menu "Miscellaneous filesystems"
@@ -1327,7 +1326,7 @@ config UFS_FS
 
 config UFS_FS_WRITE
 	bool "UFS file system write support (DANGEROUS)"
-	depends on UFS_FS && EXPERIMENTAL
+	depends on UFS_FS && EXPERIMENTAL && BROKEN
 	help
 	  Say Y here if you want to try writing to UFS partitions. This is
 	  experimental, so you should back up your UFS partitions beforehand.
@@ -1830,6 +1829,7 @@ source "fs/partitions/Kconfig"
 endmenu
 
 source "fs/nls/Kconfig"
+source "fs/dlm/Kconfig"
 
 endmenu
 
fs/Makefile +2 -0
@@ -48,6 +48,7 @@ obj-$(CONFIG_SYSFS)		+= sysfs/
 obj-y				+= devpts/
 
 obj-$(CONFIG_PROFILING)		+= dcookies.o
+obj-$(CONFIG_DLM)		+= dlm/
  
 # Do not add any filesystems before this line
 obj-$(CONFIG_REISERFS_FS)	+= reiserfs/
@@ -103,3 +104,4 @@ obj-$(CONFIG_HPPFS)		+= hppfs/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
 obj-$(CONFIG_CONFIGFS_FS)	+= configfs/
 obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
+obj-$(CONFIG_GFS2_FS)           += gfs2/
fs/gfs2/Makefile new file +42 -0

42 lines not on this page · raw message

fs/gfs2/Kconfig new file +46 -0

46 lines not on this page · raw message

Documentation/filesystems/gfs2.txt new file +44 -0

44 lines not on this page · raw message

#1 lore raw

Hi!

Quoted 10 lines
 Documentation/filesystems/gfs2.txt |   44 +++++++++++++++++++++++++++++++++++
 fs/Kconfig                         |    6 ++--
 fs/Makefile                        |    2 +
 fs/gfs2/Kconfig                    |   46 +++++++++++++++++++++++++++++++++++++
 fs/gfs2/Makefile                   |   42 +++++++++++++++++++++++++++++++++
 5 files changed, 137 insertions(+), 3 deletions(-)

fs/Kconfig config CONFIGFS_FS · line 887

Quoted 5 lines
fs/Kconfig +0 -2
@@ -883,8 +884,6 @@ config CONFIGFS_FS
 	  Both sysfs and configfs can and should exist together on the
 	  same system. One is not a replacement for the other.
 
-	  If unsure, say N.
-

Why? Most users probably still want configfs_fs=N.

fs/Kconfig config UFS_FS · line 1330

Quoted 7 lines
fs/Kconfig +1 -1
@@ -1327,7 +1326,7 @@ config UFS_FS
 
 config UFS_FS_WRITE
 	bool "UFS file system write support (DANGEROUS)"
-	depends on UFS_FS && EXPERIMENTAL
+	depends on UFS_FS && EXPERIMENTAL && BROKEN
 	help

Well, maybe, but I thought this is gfs2 patch...

fs/Kconfig config UFS_FS

Quoted 10 lines
fs/Kconfig +10 -0
+To use gfs as a local file system, no external clustering systems are
+needed, simply:
+
+  $ mkfs -t gfs2 -p lock_nolock -j 1 /dev/block_device
+  $ mount -t gfs2 /dev/block_device /dir
+
+GFS2 is not on-disk compatible with previous versions of GFS.
+
+The following man pages can be found at the URL above:
+  gfs2_mkfs	to make a filesystem

I thought conventional name would be mkfs.gfs2 ... could you use that variant?

Pavel

Signature · 1 line
Thanks, Sharp!
#2 lore raw
Quoted 10 lines · Pavel Machek

fs/Kconfig config CONFIGFS_FS · line 887

Quoted 8 lines
fs/Kconfig +0 -2
@@ -883,8 +884,6 @@ config CONFIGFS_FS
 	  Both sysfs and configfs can and should exist together on the
 	  same system. One is not a replacement for the other.
 
-	  If unsure, say N.
-

Why? Most users probably still want configfs_fs=N.

What version is this patch against? This line was removed from
mainline a while ago.
As to why it was removed, the discussion happened back then.
Basically, if something requires CONFIGFS_FS (eg, OCFS2) and is a module, then a user is asked whether they want configfs as a module or built-in. Text saying "say N" is completely incorrect there.

Joel

Signature · 9 lines
"If the human brain were so simple we could understand it, we would
 be so simple that we could not."
	- W. A. Clouston

Joel Becker
Principal Software Developer
Oracle
E-mail: [email protected]
Phone: (650) 506-8127
#3 lore raw

Hi,

Quoted 12 lines · Joel Becker
Quoted 10 lines · Pavel Machek

fs/Kconfig config CONFIGFS_FS · line 887

Quoted 8 lines
fs/Kconfig +0 -2
@@ -883,8 +884,6 @@ config CONFIGFS_FS
 	  Both sysfs and configfs can and should exist together on the
 	  same system. One is not a replacement for the other.
 
-	  If unsure, say N.
-

Why? Most users probably still want configfs_fs=N.

Quoted 9 lines

What version is this patch against? This line was removed from
mainline a while ago.
As to why it was removed, the discussion happened back then.
Basically, if something requires CONFIGFS_FS (eg, OCFS2) and is a module, then a user is asked whether they want configfs as a module or built-in. Text saying "say N" is completely incorrect there.

Joel

Checking the gfs2 git tree and Linus' tree again reveals that its not something that we changed. I think I must have fed the wrong command to git to produce the diff as the change is quite clearly there, exactly same in both trees,

Steve.

#4 lore raw
In reply to Pavel Machek

Hi,

Quoted 15 lines · Pavel Machek

Hi!

Quoted 13 lines
 Documentation/filesystems/gfs2.txt |   44 +++++++++++++++++++++++++++++++++++
 fs/Kconfig                         |    6 ++--
 fs/Makefile                        |    2 +
 fs/gfs2/Kconfig                    |   46 +++++++++++++++++++++++++++++++++++++
 fs/gfs2/Makefile                   |   42 +++++++++++++++++++++++++++++++++
 5 files changed, 137 insertions(+), 3 deletions(-)
fs/Kconfig +0 -0
@@ -883,8 +884,6 @@ config CONFIGFS_FS
 	  Both sysfs and configfs can and should exist together on the
 	  same system. One is not a replacement for the other.
 
Quoted 5 lines

fs/Kconfig config CONFIGFS_FS · line 887

Quoted 2 lines
fs/Kconfig +0 -2
-	  If unsure, say N.
-

Why? Most users probably still want configfs_fs=N.

Yes, this one has crept in by mistake I think. I'll fix that right away.

Quoted 10 lines

fs/Kconfig config UFS_FS · line 1330

Quoted 7 lines
fs/Kconfig +1 -1
@@ -1327,7 +1326,7 @@ config UFS_FS
 
 config UFS_FS_WRITE
 	bool "UFS file system write support (DANGEROUS)"
-	depends on UFS_FS && EXPERIMENTAL
+	depends on UFS_FS && EXPERIMENTAL && BROKEN
 	help

Well, maybe, but I thought this is gfs2 patch...

Indeed. This even does not feature in any of the gfs2 patches in the git tree. For some reason the command I used to create the diff has picked up this change as well. I'm not entirely sure why as its in both the gfs2 tree and the origin tree (Linus' tree).

Quoted 15 lines

fs/Kconfig config UFS_FS

Quoted 11 lines
fs/Kconfig +10 -0
+To use gfs as a local file system, no external clustering systems are
+needed, simply:
+
+  $ mkfs -t gfs2 -p lock_nolock -j 1 /dev/block_device
+  $ mount -t gfs2 /dev/block_device /dir
+
+GFS2 is not on-disk compatible with previous versions of GFS.
+
+The following man pages can be found at the URL above:
+  gfs2_mkfs	to make a filesystem

I thought conventional name would be mkfs.gfs2 ... could you use that variant?

Quoted 1 line

Pavel

Yes, you can. I just always tend to run it through the mkfs front end rather than directly. It installs itself under mkfs.gfs2 of course and we need up update the man page (GFS1 used to call its mkfs gfs_mkfs but I saw no reason not to make the change to a more conventional name).

Steve.