From 98adbf829493089ac7c9554e4109c3bb54226b95 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 31 Oct 2005 12:38:48 -0800 Subject: [PATCH] Add XFS_QUOTA fix for modular XFS build, fwd from Adrian Bunk. --- queue/series | 1 + queue/xfs-modular-quota-build-fix.patch | 47 +++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 queue/xfs-modular-quota-build-fix.patch diff --git a/queue/series b/queue/series index 58b7404c699..a2716414560 100644 --- a/queue/series +++ b/queue/series @@ -1 +1,2 @@ prism54_frame_size.patch +xfs-modular-quota-build-fix.patch diff --git a/queue/xfs-modular-quota-build-fix.patch b/queue/xfs-modular-quota-build-fix.patch new file mode 100644 index 00000000000..ebf4f140523 --- /dev/null +++ b/queue/xfs-modular-quota-build-fix.patch @@ -0,0 +1,47 @@ +From stable-bounces@linux.kernel.org Fri Oct 28 13:33:36 2005 +Date: Fri, 28 Oct 2005 22:33:25 +0200 +From: Adrian Bunk +To: Andrew Morton , stable@kernel.org +Cc: linux-xfs@oss.sgi.com, xfs-masters@oss.sgi.com, + Dimitri Puzin , nathans@sgi.com, + linux-kernel@vger.kernel.org +Subject: [PATCH] fix XFS_QUOTA for modular XFS + +From: Dimitri Puzin + +This patch by Dimitri Puzin submitted through kernel Bugzilla #5514 +fixes the following issue: + +Cannot build XFS filesystem support as module with quota support. It +works only when the XFS filesystem support is compiled into the kernel. +Menuconfig prevents from setting CONFIG_XFS_FS=m and CONFIG_XFS_QUOTA=y. + +How to reproduce: configure the XFS filesystem with quota support as +module. The resulting kernel won't have quota support compiled into +xfs.ko. + +Fix: Changing the fs/xfs/Kconfig file from tristate to bool lets you +configure the quota support to be compiled into the XFS module. The +Makefile-linux-2.6 checks only for CONFIG_XFS_QUOTA=y. + +Signed-off-by: Adrian Bunk +Signed-off-by: Nathan Scott +Signed-off-by: Chris Wright +--- + + fs/xfs/Kconfig | 2 +- + 1 files changed, 1 insertion(+), 1 deletion(-) + +Index: linux-2.6.14.y/fs/xfs/Kconfig +=================================================================== +--- linux-2.6.14.y.orig/fs/xfs/Kconfig ++++ linux-2.6.14.y/fs/xfs/Kconfig +@@ -24,7 +24,7 @@ config XFS_EXPORT + default y + + config XFS_QUOTA +- tristate "XFS Quota support" ++ bool "XFS Quota support" + depends on XFS_FS + help + If you say Y here, you will be able to set limits for disk usage on -- 2.47.3