The patch titled
quota-move-function-macros-from-quotah-to-quotaopsh fix
has been added to the -mm tree. Its filename is
quota-move-function-macros-from-quotah-to-quotaopsh-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: quota-move-function-macros-from-quotah-to-quotaopsh fix
From: Vegard Nossum <vegard.nossum@xxxxxxxxx>
On Wed, Jun 11, 2008 at 8:08 PM, <arjenpool@xxxxxxxxx> wrote:
> Today i`ve tried to compile a linux-2.6.26-rc5-mm2 kernel obtained with the
> Ketchup tool.
>
> It got halfway interupted with the following error messages:
>
> CC [M] fs/xfs/support/debug.o
> CC [M] fs/xfs/support/uuid.o
> LD [M] fs/xfs/xfs.o
> CC fs/quota.o
> fs/quota.c: In function 'quota_sync_sb':
> fs/quota.c:174: error: implicit declaration of function 'sb_dqopt'
It seems that this definition is needed regardless of CONFIG_QUOTA.
I'm attaching a patch that fixes it for me. I'm not 100% it's the right
thing.
Vegard
>From 5fc276129d8a3e2a70980104cc374bdc0d61afa3 Mon Sep 17 00:00:00 2001
Date: Wed, 11 Jun 2008 21:58:32 +0200
Subject: [PATCH] fs: fix build breakage
The patch
| commit 9651a656c9fbf3e8183b5eb21740edc1eb9ca16b
| Author: Jan Kara <jack@xxxxxxx>
| Date: Thu Jun 5 19:53:42 2008 +0000
|
| quota-move-function-macros-from-quotah-to-quotaopsh
|
causes the build to break for CONFIG_QUOTA=n.
Reviewed-by: Arjen Pool <arjenpool@xxxxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/quotaops.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN include/linux/quotaops.h~quota-move-function-macros-from-quotah-to-quotaopsh-fix include/linux/quotaops.h
--- a/include/linux/quotaops.h~quota-move-function-macros-from-quotah-to-quotaopsh-fix
+++ a/include/linux/quotaops.h
@@ -14,6 +14,8 @@
#include <linux/fs.h>
+#define sb_dqopt(sb) (&(sb)->s_dquot)
+
#if defined(CONFIG_QUOTA)
/*
@@ -52,7 +54,6 @@ void vfs_dq_drop(struct inode *inode);
int vfs_dq_transfer(struct inode *inode, struct iattr *iattr);
int vfs_dq_quota_on_remount(struct super_block *sb);
-#define sb_dqopt(sb) (&(sb)->s_dquot)
#define sb_dqinfo(sb, type) (sb_dqopt(sb)->info+(type))
/*
_
Patches currently in -mm which might be from vegard.nossum@xxxxxxxxx are
origin.patch
linux-next.patch
fix-x86_64-splat.patch
arm-fix-header-guards.patch
parisc-fix-incomplete-header-guard.patch
kallsyms-fix-potential-overflow-in-binary-search.patch
cputopology-always-define-cpu-topology-information.patch
cputopology-always-define-cpu-topology-information-cleanup.patch
quota-cleanup-loop-in-sync_dquots.patch
quota-move-function-macros-from-quotah-to-quotaopsh-fix.patch
dma-mapping-add-the-device-argument-to-dma_mapping_error-b34-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
