Re: [PATCH] aufs: Do not refer to AUFS_NAME in pr_fmt
sf...@users.sourceforge.net dixit:
This is the last version of my approach (documentations are omitted).
This doesn’t really differ from what I sent last,
does it?
Would you try on your m68k when you have time?
You _are_ aware that a kernel compile takes over a day, right?
Why don’t you use the patch from:
http://lists.debian.org/debian-kernel/2012/01/msg0.html
+# sparse requires the full pathname
+ccflags-y += -include ${srctree}/include/linux/aufs_name.h
If that is so, (whatever sparse is – the build succeeded with
my patch), change this in my patch too.
+#ifdef __KERNEL__
Hrm. Is this needed?
+#define pr_fmt(fmt) AUFS_NAME %s:%d:%s[%d]: fmt,\
+ __func__, __LINE__, current-comm, current-pid
You need to #undef it first. It’s always defined, to just fmt.
+#include linux/aufs_name.h
You include aufs_name.h twice now, once in the Makefile,
once in the header. Shouldn’t one be enough?
bye,
//mirabilos
--
“Having a smoking section in a restaurant is like having
a peeing section in a swimming pool.”
-- Edward Burr
--
To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/pine.bsm.4.64l.1201021027220@herc.mirbsd.org
Bug#654206: linux-image-3.0.0-2-amd64: max_batch_time doesn't seem to work
Package: linux-2.6 Version: 3.0.0-6 Severity: normal According to mount(*) the max_batch_time parameter for mounting an ext4 filesystem has a default value of 15000. When I try using it with values of 1 and 2 it appears to not work: # mount -o loop,max_batch_time=1 test /mnt/tmp # grep tmp /proc/mounts /dev/loop0 /mnt/tmp ext4 rw,relatime,user_xattr,max_batch_time=0,barrier=1,data=ordered 0 0 The above example is for an attempt to use a max_batch_time of 1, I get the same result (max_batch_time=0 reported) when I mount with the value 2. I don't know whether the filesystem is actually mounted with the parameter I requested, it could be mis-reported or it could be that the mount process isn't doing what I desire. I have repeated this bug with kernel 3.1.0-1-amd64 with the complete Unstable user-space. I have also repeated it with kernel 2.6.32-5-686 on a stock Squeeze installation with the latest updates applied. -- Package-specific info: ** Version: Linux version 3.0.0-2-amd64 (Debian 3.0.0-6) (b...@decadent.org.uk) (gcc version 4.5.3 (Debian 4.5.3-9) ) #1 SMP Wed Nov 2 04:50:05 UTC 2011 ** Command line: BOOT_IMAGE=/vmlinuz-3.0.0-2-amd64 root=/dev/mapper/xev-root ro selinux=1 ** Tainted: W (512) * Taint on warning. ** Kernel log: [5073163.102922] usb 2-3.1.1: Product: Ultra Fast Media Reader [5073163.102927] usb 2-3.1.1: Manufacturer: Generic [5073163.102930] usb 2-3.1.1: SerialNumber: 00264001 [5073163.103570] scsi215 : usb-storage 2-3.1.1:1.0 [5073164.105411] scsi 215:0:0:0: Direct-Access Generic Ultra HS-SD/MMC 1.91 PQ: 0 ANSI: 0 [5073164.124569] sd 215:0:0:0: Attached scsi generic sg1 type 0 [5073164.133528] sd 215:0:0:0: [sdb] Attached SCSI removable disk [5076875.831457] usb 2-3: USB disconnect, device number 64 [5076875.831465] usb 2-3.1: USB disconnect, device number 65 [5076875.831469] usb 2-3.1.1: USB disconnect, device number 66 [5077433.208045] usb 2-3: new high speed USB device number 67 using ehci_hcd [5077433.340335] usb 2-3: New USB device found, idVendor=0424, idProduct=2514 [5077433.340341] usb 2-3: New USB device strings: Mfr=0, Product=0, SerialNumber=0 [5077433.341057] hub 2-3:1.0: USB hub found [5077433.341207] hub 2-3:1.0: 3 ports detected [5077433.612080] usb 2-3.1: new high speed USB device number 68 using ehci_hcd [5077433.704449] usb 2-3.1: New USB device found, idVendor=0424, idProduct=2640 [5077433.704457] usb 2-3.1: New USB device strings: Mfr=0, Product=0, SerialNumber=0 [5077433.704920] hub 2-3.1:1.0: USB hub found [5077433.705068] hub 2-3.1:1.0: 3 ports detected [5077433.976207] usb 2-3.1.1: new high speed USB device number 69 using ehci_hcd [5077434.106560] usb 2-3.1.1: New USB device found, idVendor=0424, idProduct=4063 [5077434.106568] usb 2-3.1.1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [5077434.106574] usb 2-3.1.1: Product: Ultra Fast Media Reader [5077434.106578] usb 2-3.1.1: Manufacturer: Generic [5077434.106582] usb 2-3.1.1: SerialNumber: 00264001 [5077434.107213] scsi216 : usb-storage 2-3.1.1:1.0 [5077435.109430] scsi 216:0:0:0: Direct-Access Generic Ultra HS-SD/MMC 1.91 PQ: 0 ANSI: 0 [5077435.124675] sd 216:0:0:0: Attached scsi generic sg1 type 0 [5077435.132558] sd 216:0:0:0: [sdb] Attached SCSI removable disk [5081583.648026] usb 8-2: new low speed USB device number 10 using uhci_hcd [5081583.824029] usb 8-2: New USB device found, idVendor=1050, idProduct=0010 [5081583.824037] usb 8-2: New USB device strings: Mfr=1, Product=2, SerialNumber=0 [5081583.824042] usb 8-2: Product: Yubico Yubikey Touch [5081583.824046] usb 8-2: Manufacturer: Yubico [5081583.850186] input: Yubico Yubico Yubikey Touch as /devices/pci:00/:00:1d.2/usb8/8-2/8-2:1.0/input/input16 [5081583.850453] generic-usb 0003:1050:0010.000D: input,hidraw3: USB HID v1.11 Keyboard [Yubico Yubico Yubikey Touch] on usb-:00:1d.2-2/input0 [5081589.344080] usb 8-2: USB disconnect, device number 10 [5082053.161135] usb 2-3: USB disconnect, device number 67 [5082053.161142] usb 2-3.1: USB disconnect, device number 68 [5082053.161147] usb 2-3.1.1: USB disconnect, device number 69 [5083283.344024] usb 2-3: new high speed USB device number 71 using ehci_hcd [5083283.476422] usb 2-3: New USB device found, idVendor=0424, idProduct=2514 [5083283.476430] usb 2-3: New USB device strings: Mfr=0, Product=0, SerialNumber=0 [5083283.477130] hub 2-3:1.0: USB hub found [5083283.477290] hub 2-3:1.0: 3 ports detected [5083283.748158] usb 2-3.1: new high speed USB device number 72 using ehci_hcd [5083283.840407] usb 2-3.1: New USB device found, idVendor=0424, idProduct=2640 [5083283.840414] usb 2-3.1: New USB device strings: Mfr=0, Product=0, SerialNumber=0 [5083283.840870] hub 2-3.1:1.0: USB hub found [5083283.841026] hub 2-3.1:1.0: 3 ports detected [5083284.112148] usb 2-3.1.1: new high speed USB device number 73 using ehci_hcd [5083284.242887] usb 2-3.1.1: New USB device found, idVendor=0424, idProduct=4063 [5083284.242894] usb
Processed: found 654206 in 3.1.6-1, found 654206 in 2.6.32-39
Processing commands for cont...@bugs.debian.org: found 654206 3.1.6-1 Bug #654206 [linux-2.6] linux-image-3.0.0-2-amd64: max_batch_time doesn't seem to work There is no source info for the package 'linux-2.6' at version '3.1.6-1' with architecture '' Unable to make a source version for version '3.1.6-1' Bug Marked as found in versions 3.1.6-1. found 654206 2.6.32-39 Bug #654206 [linux-2.6] linux-image-3.0.0-2-amd64: max_batch_time doesn't seem to work There is no source info for the package 'linux-2.6' at version '2.6.32-39' with architecture '' Unable to make a source version for version '2.6.32-39' Bug Marked as found in versions 2.6.32-39. thanks Stopping processing here. Please contact me if you need assistance. -- 654206: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654206 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.13255105691675.transcr...@bugs.debian.org
Re: [PATCH] aufs: Do not refer to AUFS_NAME in pr_fmt
Thorsten Glaser: This doesn=E2=80=99t really differ from what I sent last, does it? I am afraid you may not understand the important parts. - the order of the definition and sched.h. - no undef. +#ifdef __KERNEL__ Hrm. Is this needed? Indeed necessary since aufs_name.h is exported to userspace. +#define pr_fmt(fmt)=09AUFS_NAME %s:%d:%s[%d]: fmt,\ +=09=09__func__, __LINE__, current-comm, current-pid You need to #undef it first. It=E2=80=99s always defined, to just fmt. No, I don't think undef is a good approach. The purpose of my patch, or the difference from yours is to define pr_fmt first before all headers including sched.h. +#include linux/aufs_name.h You include aufs_name.h twice now, once in the Makefile, once in the header. Shouldn=E2=80=99t one be enough? No, because aufs_type.h is exported to userspace. J. R. Okajima -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/5487.1325510133@jrobl
Re: [PATCH] aufs: Do not refer to AUFS_NAME in pr_fmt
sf...@users.sourceforge.net dixit: You include aufs_name.h twice now, once in the Makefile, once in the header. Shouldn=E2=80=99t one be enough? No, because aufs_type.h is exported to userspace. Then, why include it in the Makefile at all? (Or, why include aufs_name.h from aufs_type.h?) bye, //mirabilos -- “Having a smoking section in a restaurant is like having a peeing section in a swimming pool.” -- Edward Burr -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/pine.bsm.4.64l.1201021328500.13...@herc.mirbsd.org
Bug#654206: linux-image-3.0.0-2-amd64: max_batch_time doesn't seem to work
On Mon, 2012-01-02 at 23:41 +1100, Russell Coker wrote:
Package: linux-2.6
Version: 3.0.0-6
Severity: normal
According to mount(*) the max_batch_time parameter for mounting an ext4
filesystem has a default value of 15000. When I try using it with values
of 1 and 2 it appears to not work:
# mount -o loop,max_batch_time=1 test /mnt/tmp
# grep tmp /proc/mounts
/dev/loop0 /mnt/tmp ext4
rw,relatime,user_xattr,max_batch_time=0,barrier=1,data=ordered 0 0
The above example is for an attempt to use a max_batch_time of 1, I get
the same result (max_batch_time=0 reported) when I mount with the value
2.
I don't know whether the filesystem is actually mounted with the parameter I
requested, it could be mis-reported or it could be that the mount process
isn't
doing what I desire.
[...]
It's misreported:
if (sbi-s_max_batch_time != EXT4_DEF_MAX_BATCH_TIME) {
seq_printf(seq, ,max_batch_time=%u,
(unsigned) sbi-s_min_batch_time);
}
However, the fact that you see it in the options at all shows that it
has been changed from the default.
Ben.
--
Ben Hutchings
All the simple programs have been written, and all the good names taken.
signature.asc
Description: This is a digitally signed message part
Bug#654206: [PATCH] ext4: Report max_batch_time option correctly
Currently the value reported for max_batch_time is really the
value of min_batch_time.
Reported-by: Russell Coker russ...@coker.com.au
Signed-off-by: Ben Hutchings b...@decadent.org.uk
---
fs/ext4/super.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 3e1329e..410e993 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1096,7 +1096,7 @@ static int ext4_show_options(struct seq_file *seq, struct
vfsmount *vfs)
}
if (sbi-s_max_batch_time != EXT4_DEF_MAX_BATCH_TIME) {
seq_printf(seq, ,max_batch_time=%u,
- (unsigned) sbi-s_min_batch_time);
+ (unsigned) sbi-s_max_batch_time);
}
/*
--
1.7.7.3
signature.asc
Description: This is a digitally signed message part
Re: [Fwd: Patch Upstream: drm/radeon/kms: bail on BTC parts if MC ucode is missing]
On Mon, 2012-01-02 at 00:41 +, Ben Hutchings wrote: As I suggested a while back, radeon really doesn't work without firmware on some chips. [...] This (commit 77e00f2ea94abee1ad13bdfde19cf7aa25992b0e) is changing behaviour for the BTC chips (codenames Barts, Turks and Caicos; model numbers HD 68xx, 65xx and 63xx; DCE5 generation). However, we had many reports that DCE3 generation chips don't work properly without firmware: RV620 in #607194, RV635 in #637392 and #637943, RV710 in #627497, RV770 in #610851. There is also the hang-on-resume issue (#607471), though that is generically fixed (or rather worked-around) by: commit a144c6a6c924aa1da04dd77fb84b89927354fdff Author: Rafael J. Wysocki r...@sisk.pl Date: Fri May 6 20:09:42 2011 +0200 PM: Print a warning if firmware is requested when tasks are frozen commit caca9510ff4e5d842c0589110243d60927836222 Author: Linus Torvalds torva...@linux-foundation.org Date: Wed Aug 24 15:55:30 2011 -0700 firmware loader: allow builtin firmware load even if usermodehelper is disabled Ben. -- Ben Hutchings All the simple programs have been written, and all the good names taken. signature.asc Description: This is a digitally signed message part
Re: [PATCH] aufs: Do not refer to AUFS_NAME in pr_fmt
sf...@users.sourceforge.net dixit: - AUFS_NAME is necessary for both of kernel-space and user-space. - from userspace, users include aufs_type.h. to keep the consistency, aufs_type.h should include aufs_name.h. - for kernelspace, to put aufs_name.h _before_ all other headers. Hrm, okay. I’ll try your patch then, once we get that register_cpu issue solved too. I’ll get back to you with test results. Do I make myself clear with my poor English? I have the same problem ;-) it’s only my third natural language. bye, //mirabilos -- 08:05⎜XTaran:#grml mika: Does grml have an tool to read Apple ⎜System Log (asl) files? :) 08:08⎜ft:#grml yeah. /bin/rm. ;) 08:09⎜mrud:#grml hexdump -C 08:31⎜XTaran:#grml ft, mrud: *g* -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/pine.bsm.4.64l.1201021613370.29...@herc.mirbsd.org
[bts-link] source package linux-2.6
# # bts-link upstream status pull for source package linux-2.6 # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # user bts-link-upstr...@lists.alioth.debian.org # remote status report for #652708 (http://bugs.debian.org/652708) # Bug title: linux-image-2.6-openvz-amd64: Cannot mount Windows share # * http://bugzilla.openvz.org/show_bug.cgi?id=2121 # * remote status changed: (?) - NEW usertags 652708 + status-NEW # remote status report for #653292 (http://bugs.debian.org/653292) # Bug title: nfs exclusive lock does not work anymore after openvz kernel version : 2.6.32-35squeeze1 # * http://bugzilla.openvz.org/show_bug.cgi?id=2122 # * remote status changed: (?) - NEW usertags 653292 + status-NEW # remote status report for #627372 (http://bugs.debian.org/627372) # Bug title: linux-image-2.6.38-2-686: Console turns black during boot # * https://bugs.freedesktop.org/show_bug.cgi?id=44156 # * remote status changed: (?) - REOPENED usertags 627372 + status-REOPENED thanks -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120102164045.19437.78508.btsl...@busoni.debian.org
Re: [PATCH] aufs: Do not refer to AUFS_NAME in pr_fmt
Thorsten Glaser: Hrm, okay. I=E2=80=99ll try your patch then, once we get that register_cpu issue solved too. I=E2=80=99ll get back to you with test results. Hold it please. I am going to make more changes. So it is better to git-pull and test the aufs GIT repository. It will be released in the first in this year. I have the same problem ;-) it=E2=80=99s only my third natural language. I wonder your first or second language is my mother tangue. :-) J. R. Okajima -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/17563.1325523211@jrobl
Re: [PATCH] aufs: Do not refer to AUFS_NAME in pr_fmt
sf...@users.sourceforge.net dixit: Hold it please. OK. I am going to make more changes. So it is better to git-pull and test the aufs GIT repository. Please send patches that _should_ apply against what’s in Debian. I don’t have time to play the merge game at the moment. I have the same problem ;-) it=E2=80=99s only my third natural language. I wonder your first or second language is my mother tangue. :-) Probably not (German and Latin). bye, //mirabilos -- 17:57 jtsn Der 25C3 ist lustig. Deutsche Vortragende brechen sich vor deutschen Zuhörern auf Englisch einen ab. ;-) 18:01 jtsn Adolfs Werk war sehr nachhaltig. ;-)18:01 jtsn Das gab's nichtmal in der DDR, das Deutsche mit Deutschen auf Russisch reden. ;-) (10x cnuke@) -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/pine.bsm.4.64l.1201021735430.29...@herc.mirbsd.org
Bug#644174: ACPI I/O resource conflicts with ACPI region SMBI
On Wed, Dec 28, 2011 at 06:11:14PM +0100, Mathieu Malaterre wrote: On Thu, Dec 22, 2011 at 8:52 PM, Sarah Sharp sarah.a.sh...@linux.intel.com wrote: On Thu, Dec 22, 2011 at 04:18:56PM +0100, Mathieu Malaterre wrote: On Fri, Dec 16, 2011 at 11:27 AM, Jonathan Nieder jrnie...@gmail.com wrote: System: Dell System Vostro 3750 / Portable Computer Ok. So I am running: 3.2.0-rc4-amd64 from debian experimental. No mouse plugged to USB 2.0/3.0 interface: boot is fine Mouse plugged to USB 2.0 interface: boot is fine Mouse plugged to USB 3.0 interface: boot simply stops Does the boot stop when you have a non-HID USB device plugged into the USB 3.0 port (e.g. hub or flash drive or USB speaker)? It could be an issue with a buggy BIOS trying to use the mouse and keyboard (HID devices) attached to the USB 3.0 host. Perhaps it changes the ACPI tables when it tries to use the USB 3.0 host controller, and accidentally overlaps the regions? But if your keyboard and mouse were under USB 2.0, maybe it will only map in the USB 2.0 host controller. I tried booting kernel 3.0.2 (debian/unstable 3.2.0-rc4-amd64) with a USB key plugged into USB 3.0 and was stuck again. So I can confirm that with a normal USB key (non-HID) plugged in USB 3.0 port, makes the kernel refuse to boot. Please try a USB hub as well. It's possible the BIOS is trying to read from the flash drive (which is what I assume you mean by USB key). As suggested by Jonathan N. [1] here is what I did next: $ cat /etc/modprobe.d/mm-blacklist-xhci.conf blacklist xhci_hcd $ update-initramfs -u -k all $ sudo reboot Were you blacklisting xhci only because of the xhci_hcd :03:00.0: WARN: Stalled endpoint messages? Because those messages are harmless, and don't mean anything is *wrong* with the host controller. I simply blindly follow the suggestion. Yeah, don't try to blacklist xhci-hcd. It's not useful. Even if there's no xHCI driver loaded, it seems that ACPI is noticing the conflict between the PCI registers and another region. So unloading the xHCI driver won't help your system boot. You'd need to get a fix into the ACPI subsystem to work around the conflict. I don't think any xHCI driver modification can help here. Is there a way to check if bug is related to ACPI or rather USB 3.0 ? The log messages seem to indicate that it's either an ACPI or a BIOS issue. I really can't suggest any other tests without some input from the ACPI folks. The best solution I can suggest is not boot with a USB device plugged into your USB 3.0 port. Sarah Sharp -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120102181430.GA8562@xanatos
Bug#644174: ACPI I/O resource conflicts with ACPI region SMBI
Quick side question: Sarah Sharp wrote: Yeah, don't try to blacklist xhci-hcd. It's not useful. How else do you suggest that people figure out whether symptoms are produced by the xhci-hcd driver or something else? However, I agree that it's not useful _any more_, since Mathieu tried that test already. [...] The log messages seem to indicate that it's either an ACPI or a BIOS issue. I really can't suggest any other tests without some input from the ACPI folks. The best solution I can suggest is not boot with a USB device plugged into your USB 3.0 port. Hm. Mathieu, is it possible to suspend-to-disk (echo disk /sys/power/state) and resume with a USB device plugged into the USB 3.0 port? Please also attach output from acpidump after a successful boot. Can you reproduce this when booting in recovery mode with i915.modeset=0 appended to the kernel command line? Thanks, Jonathan -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120102191158.gc30...@elie.hsd1.il.comcast.net
Processed: block 651092 with 588200
Processing commands for cont...@bugs.debian.org: block 651092 with 588200 Bug #651092 [god] god: Process events not working due to missing kernel features Was not blocked by any bugs. Added blocking bug(s) of 651092: 588200 thanks Stopping processing here. Please contact me if you need assistance. -- 651092: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651092 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.132553422023629.transcr...@bugs.debian.org
[PATCH 2/2] aufs: headers 2/2, simply refined
From: J. R. Okajima hooano...@yahoo.co.jp
By the previous commit,
8dc5387 2012-01-03 aufs: bugfix, headers 1/2, where the pr_fmt macro definition
several header file inclusion in other files became unnecessary.
Signed-off-by: J. R. Okajima hooano...@yahoo.co.jp
---
fs/aufs/branch.c |1 -
fs/aufs/branch.h |2 --
fs/aufs/cpup.c|2 --
fs/aufs/cpup.h|4
fs/aufs/dbgaufs.h |3 ---
fs/aufs/dcsub.h |1 -
fs/aufs/debug.c |1 -
fs/aufs/debug.h |8
fs/aufs/dentry.h |1 -
fs/aufs/dir.c |1 -
fs/aufs/dir.h |1 -
fs/aufs/dynop.h |4
fs/aufs/export.c |1 -
fs/aufs/f_op.c|2 --
fs/aufs/f_op_sp.c |1 -
fs/aufs/file.c|3 ---
fs/aufs/file.h|1 -
fs/aufs/finfo.c |1 -
fs/aufs/fstype.h |1 -
fs/aufs/hfsplus.c |1 -
fs/aufs/i_op.c|2 --
fs/aufs/inode.h |2 --
fs/aufs/ioctl.c |1 -
fs/aufs/opts.c|2 --
fs/aufs/opts.h|3 ---
fs/aufs/rdu.c |2 --
fs/aufs/rwsem.h |1 -
fs/aufs/sbinfo.c |1 -
fs/aufs/spl.h |4
fs/aufs/super.c |3 +--
fs/aufs/super.h |1 -
fs/aufs/sysaufs.c |2 --
fs/aufs/sysaufs.h |2 --
fs/aufs/sysfs.c |3 ---
fs/aufs/sysrq.c |3 ---
fs/aufs/vdir.c|1 -
fs/aufs/vfsub.c |2 --
fs/aufs/whout.c |1 -
fs/aufs/whout.h |1 -
fs/aufs/wkq.h |4
fs/aufs/xino.c|2 --
41 files changed, 1 insertions(+), 82 deletions(-)
diff --git a/fs/aufs/branch.c b/fs/aufs/branch.c
index 49b32de..a8bb316 100644
--- a/fs/aufs/branch.c
+++ b/fs/aufs/branch.c
@@ -21,7 +21,6 @@
*/
#include linux/compat.h
-#include linux/file.h
#include linux/statfs.h
#include aufs.h
diff --git a/fs/aufs/branch.h b/fs/aufs/branch.h
index 1f39ad6..80b5084 100644
--- a/fs/aufs/branch.h
+++ b/fs/aufs/branch.h
@@ -25,9 +25,7 @@
#ifdef __KERNEL__
-#include linux/fs.h
#include linux/mount.h
-#include linux/aufs_type.h
#include dynop.h
#include rwsem.h
#include super.h
diff --git a/fs/aufs/cpup.c b/fs/aufs/cpup.c
index 05cb4e0..70116ba 100644
--- a/fs/aufs/cpup.c
+++ b/fs/aufs/cpup.c
@@ -20,10 +20,8 @@
* copy-up functions, see wbr_policy.c for copy-down
*/
-#include linux/file.h
#include linux/fs_stack.h
#include linux/mm.h
-#include linux/uaccess.h
#include aufs.h
void au_cpup_attr_flags(struct inode *dst, struct inode *src)
diff --git a/fs/aufs/cpup.h b/fs/aufs/cpup.h
index 8e0aa59..8493770 100644
--- a/fs/aufs/cpup.h
+++ b/fs/aufs/cpup.h
@@ -25,10 +25,6 @@
#ifdef __KERNEL__
-#include linux/path.h
-#include linux/time.h
-#include linux/aufs_type.h
-
struct inode;
struct file;
diff --git a/fs/aufs/dbgaufs.h b/fs/aufs/dbgaufs.h
index 2eaa3f0..a4065d1 100644
--- a/fs/aufs/dbgaufs.h
+++ b/fs/aufs/dbgaufs.h
@@ -25,9 +25,6 @@
#ifdef __KERNEL__
-#include linux/init.h
-#include linux/aufs_type.h
-
struct super_block;
struct au_sbinfo;
diff --git a/fs/aufs/dcsub.h b/fs/aufs/dcsub.h
index 1211304..439459c 100644
--- a/fs/aufs/dcsub.h
+++ b/fs/aufs/dcsub.h
@@ -27,7 +27,6 @@
#include linux/dcache.h
#include linux/fs.h
-#include linux/types.h
struct dentry;
diff --git a/fs/aufs/debug.c b/fs/aufs/debug.c
index 9fad1c3..83e7c57 100644
--- a/fs/aufs/debug.c
+++ b/fs/aufs/debug.c
@@ -20,7 +20,6 @@
* debug print functions
*/
-#include linux/module.h
#include linux/vt_kern.h
#include aufs.h
diff --git a/fs/aufs/debug.h b/fs/aufs/debug.h
index 7140934..1bcc88c 100644
--- a/fs/aufs/debug.h
+++ b/fs/aufs/debug.h
@@ -26,17 +26,9 @@
#ifdef __KERNEL__
#include asm/system.h
-#include linux/bug.h
-/* #include linux/err.h */
-#include linux/init.h
#include linux/module.h
#include linux/kallsyms.h
-/* #include linux/kernel.h */
-#include linux/delay.h
-/* #include linux/kd.h */
-#include linux/vt_kern.h
#include linux/sysrq.h
-#include linux/aufs_type.h
#ifdef CONFIG_AUFS_DEBUG
#define AuDebugOn(a) BUG_ON(a)
diff --git a/fs/aufs/dentry.h b/fs/aufs/dentry.h
index 4f08275..802635f 100644
--- a/fs/aufs/dentry.h
+++ b/fs/aufs/dentry.h
@@ -26,7 +26,6 @@
#ifdef __KERNEL__
#include linux/dcache.h
-#include linux/aufs_type.h
#include rwsem.h
struct au_hdentry {
diff --git a/fs/aufs/dir.c b/fs/aufs/dir.c
index 6c45d1a..1e0a771 100644
--- a/fs/aufs/dir.c
+++ b/fs/aufs/dir.c
@@ -20,7 +20,6 @@
* directory operations
*/
-#include linux/file.h
#include linux/fs_stack.h
#include aufs.h
diff --git a/fs/aufs/dir.h b/fs/aufs/dir.h
index 2d0d8d2..99e973a 100644
--- a/fs/aufs/dir.h
+++ b/fs/aufs/dir.h
@@ -26,7 +26,6 @@
#ifdef __KERNEL__
#include linux/fs.h
-#include linux/aufs_type.h
/* -- */
diff --git a/fs/aufs/dynop.h b/fs/aufs/dynop.h
index c3217d4..3ddebe7 100644
--- a/fs/aufs/dynop.h
+++ b/fs/aufs/dynop.h
@@ -25,10 +25,6 @@
#ifdef __KERNEL__
-#include linux/fs.h
-#include linux/mm.h
-#include linux/rcupdate.h
-#include linux/aufs_type.h
[PATCH 1/2] aufs: headers 1/2, bugfix, where the pr_fmt macro definition
From: J. R. Okajima hooano...@yahoo.co.jp
The pr_fmt macro is defined in fs/aufs/Makefile and it refers to the
AUFS_NAME macro, which caused a compilation error in m68k architecture.
Also it refers to the current macro which will be a problem too.
See-also: http://sourceforge.net/mailarchive/message.php?msg_id=28608043
Reported-by: Ben Hutchings b...@decadent.org.uk
Suggested-by: Thorsten Glaser t...@mirbsd.de
Signed-off-by: J. R. Okajima hooano...@yahoo.co.jp
---
fs/aufs/Makefile |4 ++--
include/linux/aufs_type.h | 20 ++--
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/fs/aufs/Makefile b/fs/aufs/Makefile
index 0aadd21..dc8fd36 100644
--- a/fs/aufs/Makefile
+++ b/fs/aufs/Makefile
@@ -4,8 +4,8 @@ include ${srctree}/${src}/magic.mk
# cf. include/linux/kernel.h
# enable pr_debug
ccflags-y += -DDEBUG
-# sparse doesn't allow spaces
-ccflags-y +=
-D'pr_fmt(fmt)=AUFS_NAME\040%s:%d:%s[%d]:\040fmt,__func__,__LINE__,current-comm,current-pid'
+# sparse requires the full pathname
+ccflags-y += -include ${srctree}/include/linux/aufs_type.h
obj-$(CONFIG_AUFS_FS) += aufs.o
aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \
diff --git a/include/linux/aufs_type.h b/include/linux/aufs_type.h
index 60b52b0..25cdc06 100644
--- a/include/linux/aufs_type.h
+++ b/include/linux/aufs_type.h
@@ -19,15 +19,24 @@
#ifndef __AUFS_TYPE_H__
#define __AUFS_TYPE_H__
-#include linux/ioctl.h
-#include linux/kernel.h
-#include linux/limits.h
+#define AUFS_NAME aufs
+
#ifdef __KERNEL__
-#include linux/types.h
+/*
+ * define it before including all other headers.
+ * sched.h may use pr_* macros before defining current, so define the
+ * no-current version first, and re-define later.
+ */
+#define pr_fmt(fmt)AUFS_NAME %s:%d: fmt, __func__, __LINE__
+#include linux/sched.h
+#undef pr_fmt
+#define pr_fmt(fmt)AUFS_NAME %s:%d:%s[%d]: fmt, \
+ __func__, __LINE__, current-comm, current-pid
#else
+#include linux/limits.h
#include stdint.h
#include sys/types.h
-#endif
+#endif /* __KERNEL__ */
#define AUFS_VERSION 2.2-35
@@ -58,7 +67,6 @@ typedef int16_t aufs_bindex_t;
/* -- */
-#define AUFS_NAME aufs
#define AUFS_FSTYPEAUFS_NAME
#define AUFS_ROOT_INO 2
--
1.7.2.5
--
To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/1325568082-25540-2-git-send-email-sf...@users.sourceforge.net
[PATCH 0/2] aufs: headers (Re: [PATCH] aufs: Do not refer to AUFS_NAME in pr_fmt)
From: J. R. Okajima hooano...@yahoo.co.jp Thorsten Glaser: Please send patches that _should_ apply against what=E2=80=99s in Debian. I don=E2=80=99t have time to play the merge game at the moment. Which version of debian? As you might know, the aufs module in the debian stable squeeze is out of my control. Anyway, this patch series is against the aufs2.2-35 branch in aufs2-standalone.git. J. R. Okajima (2): aufs: headers 1/2, bugfix, where the pr_fmt macro definition aufs: headers 2/2, simply refined fs/aufs/Makefile |4 ++-- fs/aufs/branch.c |1 - fs/aufs/branch.h |2 -- fs/aufs/cpup.c|2 -- fs/aufs/cpup.h|4 fs/aufs/dbgaufs.h |3 --- fs/aufs/dcsub.h |1 - fs/aufs/debug.c |1 - fs/aufs/debug.h |8 fs/aufs/dentry.h |1 - fs/aufs/dir.c |1 - fs/aufs/dir.h |1 - fs/aufs/dynop.h |4 fs/aufs/export.c |1 - fs/aufs/f_op.c|2 -- fs/aufs/f_op_sp.c |1 - fs/aufs/file.c|3 --- fs/aufs/file.h|1 - fs/aufs/finfo.c |1 - fs/aufs/fstype.h |1 - fs/aufs/hfsplus.c |1 - fs/aufs/i_op.c|2 -- fs/aufs/inode.h |2 -- fs/aufs/ioctl.c |1 - fs/aufs/opts.c|2 -- fs/aufs/opts.h|3 --- fs/aufs/rdu.c |2 -- fs/aufs/rwsem.h |1 - fs/aufs/sbinfo.c |1 - fs/aufs/spl.h |4 fs/aufs/super.c |3 +-- fs/aufs/super.h |1 - fs/aufs/sysaufs.c |2 -- fs/aufs/sysaufs.h |2 -- fs/aufs/sysfs.c |3 --- fs/aufs/sysrq.c |3 --- fs/aufs/vdir.c|1 - fs/aufs/vfsub.c |2 -- fs/aufs/whout.c |1 - fs/aufs/whout.h |1 - fs/aufs/wkq.h |4 fs/aufs/xino.c|2 -- include/linux/aufs_type.h | 20 ++-- 43 files changed, 17 insertions(+), 90 deletions(-) -- 1.7.2.5 -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1325568082-25540-1-git-send-email-sf...@users.sourceforge.net
