[4414] in arla-drinkers
Arla on Linux 2.6.24
daemon@ATHENA.MIT.EDU (=?ISO-8859-1?Q?Bo_Brant=E9n?=)
Mon Sep 29 18:55:54 2008
From arla-drinkers-bounces@stacken.kth.se Mon Sep 29 22:55:54 2008
Return-Path: <arla-drinkers-bounces@stacken.kth.se>
Delivered-To: arla-drinkers-mtg@bloom-picayune.mit.edu
Received: (qmail 14105 invoked from network); 29 Sep 2008 22:55:53 -0000
Received: from mx3.kth.se (130.237.48.97)
by charon.mit.edu with SMTP; 29 Sep 2008 22:55:53 -0000
Received: from localhost (localhost [127.0.0.1])
by mx3.kth.se (Postfix) with ESMTP id C99516A6E6;
Tue, 30 Sep 2008 00:55:51 +0200 (CEST)
X-Virus-Scanned: by amavisd-new at kth.se
Received: from mx3.kth.se ([127.0.0.1])
by localhost (mx3.kth.se [127.0.0.1]) (amavisd-new, port 10024)
with LMTP id XWDWBOesPzL4; Tue, 30 Sep 2008 00:55:47 +0200 (CEST)
Received: from tapas.stacken.kth.se (tapas.stacken.kth.se [130.237.234.140])
by mx3.kth.se (Postfix) with ESMTP id 559166A669;
Tue, 30 Sep 2008 00:55:32 +0200 (CEST)
Received: from tapas.stacken.kth.se (localhost [127.0.0.1])
by tapas.stacken.kth.se (Postfix) with ESMTP id 446B951D5D;
Tue, 30 Sep 2008 00:55:32 +0200 (CEST)
X-Original-To: arla-drinkers@tapas.stacken.kth.se
Delivered-To: arla-drinkers@tapas.stacken.kth.se
Received: from brev.stacken.kth.se (brev.stacken.kth.se [130.237.234.84])
by tapas.stacken.kth.se (Postfix) with ESMTP id 562AB51D5D
for <arla-drinkers@tapas.stacken.kth.se>;
Tue, 30 Sep 2008 00:55:30 +0200 (CEST)
Received: from mx2.kth.se (mx2.kth.se [130.237.48.98])
by brev.stacken.kth.se (8.12.10/8.12.10) with ESMTP id m8TMtTvG020257
for <arla-drinkers@stacken.kth.se>;
Tue, 30 Sep 2008 00:55:29 +0200 (MET DST)
Received: from localhost (localhost [127.0.0.1])
by mx2.kth.se (Postfix) with ESMTP id DF7F81097A4
for <arla-drinkers@stacken.kth.se>;
Tue, 30 Sep 2008 00:55:23 +0200 (CEST)
X-Virus-Scanned: by amavisd-new at kth.se
Received: from mx2.kth.se ([127.0.0.1])
by localhost (mx2.kth.se [127.0.0.1]) (amavisd-new, port 10024)
with LMTP id MqBbFmsNEbYG for <arla-drinkers@stacken.kth.se>;
Tue, 30 Sep 2008 00:55:19 +0200 (CEST)
Received: from mail.acc.umu.se (mail.acc.umu.se [IPv6:2001:6b0:e:2018::156])
by mx2.kth.se (Postfix) with ESMTP id 1CD4B1081BA
for <arla-drinkers@stacken.kth.se>;
Tue, 30 Sep 2008 00:55:18 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
by amavisd-new (Postfix) with ESMTP id D83F05B9
for <arla-drinkers@stacken.kth.se>;
Tue, 30 Sep 2008 00:55:18 +0200 (MEST)
X-Virus-Scanned: amavisd-new at acc.umu.se
Received: from stalin.acc.umu.se (stalin.acc.umu.se [130.239.18.135])
by mail.acc.umu.se (Postfix) with ESMTP id 273F75B8
for <arla-drinkers@stacken.kth.se>;
Tue, 30 Sep 2008 00:55:17 +0200 (MEST)
Received: by stalin.acc.umu.se (Postfix, from userid 10005)
id 0251D2C; Tue, 30 Sep 2008 00:55:16 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
by stalin.acc.umu.se (Postfix) with ESMTP id E37732B
for <arla-drinkers@stacken.kth.se>;
Tue, 30 Sep 2008 00:55:16 +0200 (CEST)
Date: Tue, 30 Sep 2008 00:55:16 +0200 (CEST)
From: =?ISO-8859-1?Q?Bo_Brant=E9n?= <bosse@acc.umu.se>
To: arla-drinkers@stacken.kth.se
Subject: Arla on Linux 2.6.24
In-Reply-To: <Pine.A41.4.64.0809281638260.622842@stalin.acc.umu.se>
Message-ID: <Pine.A41.4.64.0809300045030.471232@stalin.acc.umu.se>
References: <Pine.A41.4.64.0809281638260.622842@stalin.acc.umu.se>
MIME-Version: 1.0
X-BeenThere: arla-drinkers@stacken.kth.se
X-Mailman-Version: 2.1.6
Precedence: list
List-Id: Arla discussions <arla-drinkers.stacken.kth.se>
List-Unsubscribe: <https://lists.stacken.kth.se/mailman/listinfo/arla-drinkers>,
<mailto:arla-drinkers-request@stacken.kth.se?subject=unsubscribe>
List-Archive: <http://lists.stacken.kth.se/pipermail/arla-drinkers>
List-Post: <mailto:arla-drinkers@stacken.kth.se>
List-Help: <mailto:arla-drinkers-request@stacken.kth.se?subject=help>
List-Subscribe: <https://lists.stacken.kth.se/mailman/listinfo/arla-drinkers>,
<mailto:arla-drinkers-request@stacken.kth.se?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: arla-drinkers-bounces@stacken.kth.se
Errors-To: arla-drinkers-bounces@stacken.kth.se
Hello,
I tryed the current CVS version of Arla on Linux 2.6.24 (Ubuntu 8.04 LTS)
and the diff below shows what I needed to change in the kernel module,
after that everything works fine! Is this the patch format you prefere?
bo@ANJA:~/src/arla/nnpfs/linux$ diff -c nnpfs_vfsops.bak
nnpfs_vfsops.c
*** nnpfs_vfsops.bak 2006-12-11 17:43:35.000000000 +0100
--- nnpfs_vfsops.c 2008-09-30 00:03:54.000000000 +0200
***************
*** 352,358 ****
--- 352,366 ----
tmp.f_bavail = 1024*1024*2-50;
tmp.f_files = 1024*1024;
tmp.f_ffree = 1024*1024-100;
+ tmp.f_fsid.val[0] = 0;
+ tmp.f_fsid.val[1] = 0;
tmp.f_namelen = NAME_MAX;
+ tmp.f_frsize = 0;
+ tmp.f_spare[0] = 0;
+ tmp.f_spare[1] = 0;
+ tmp.f_spare[2] = 0;
+ tmp.f_spare[3] = 0;
+ tmp.f_spare[4] = 0;
*buf = tmp;
return 0;
}
bo@ANJA:~/src/arla/nnpfs/linux$ diff -c nnpfs_syscalls-lossage.bak
nnpfs_syscalls-lossage.c
*** nnpfs_syscalls-lossage.bak 2006-12-11 17:31:45.000000000 +0100
--- nnpfs_syscalls-lossage.c 2008-09-30 00:34:55.000000000 +0200
***************
*** 63,68 ****
--- 63,69 ----
unsigned long *offset,
char **modname, char *namebuf);
+ extern rwlock_t tasklist_lock __attribute__((weak));
static void **
get_start_addr(void) {
#ifdef __x86_64__
bo@ANJA:~/src/arla/nnpfs/linux$ diff -c nnpfs_syscalls.bak
nnpfs_syscalls.c
*** nnpfs_syscalls.bak 2007-01-03 15:26:27.000000000 +0100
--- nnpfs_syscalls.c 2008-09-30 00:33:14.000000000 +0200
***************
*** 147,152 ****
--- 147,154 ----
#define SEC2PAG(s) (nnpfs_pag_t)(unsigned long)(s)
#define PAG2SEC(p) (void *)(unsigned long)(p)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+
static int
nnpfs_sec_task_alloc(struct task_struct *p)
{
***************
*** 164,169 ****
--- 166,173 ----
p->security = NULL;
}
+ #endif
+
static nnpfs_pag_t
nnpfs_get_pag_sec(void)
{
***************
*** 188,198 ****
--- 192,204 ----
return 0;
}
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
static struct security_operations nnpfs_sec_ops = {
.task_alloc_security = nnpfs_sec_task_alloc,
.task_free_security = nnpfs_sec_task_free,
// .task_reparent_to_init = nnpfs_sec_reparent_to_init,
};
+ #endif
#endif /* CONFIG_SECURITY */
***************
*** 840,851 ****
--- 846,859 ----
install_afs_syscall(void)
{
#ifdef CONFIG_SECURITY
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
if (register_security(&nnpfs_sec_ops))
NNPFSDEB(XDEBSYS,
("install_afs_syscall: nnpfs_init_sec failed\n"));
else
nnpfs_sec_registered = 1;
#endif
+ #endif
nnpfs_init_procfs();
***************
*** 888,896 ****
--- 896,906 ----
#endif /* SYSCALLHACK */
#ifdef CONFIG_SECURITY
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
if (nnpfs_sec_registered)
if (unregister_security(&nnpfs_sec_ops))
printk(KERN_EMERG "nnpfs_exit_sec: couldn't unregister\n");
+ #endif
#endif /* !CONFIG_SECURITY */
#ifdef GROUPPAGS
bo@ANJA:~/src/arla/nnpfs/linux$
_______________________________________________
Arla-drinkers mailing list
Arla-drinkers@stacken.kth.se
https://lists.stacken.kth.se/mailman/listinfo/arla-drinkers
