diff options
41 files changed, 306 insertions, 334 deletions
diff --git a/Documentation/DocBook/videobook.tmpl b/Documentation/DocBook/videobook.tmpl index 3ec6c875588..fdff984a516 100644 --- a/Documentation/DocBook/videobook.tmpl +++ b/Documentation/DocBook/videobook.tmpl | |||
@@ -229,7 +229,7 @@ int __init myradio_init(struct video_init *v) | |||
229 | 229 | ||
230 | static int users = 0; | 230 | static int users = 0; |
231 | 231 | ||
232 | static int radio_open(stuct video_device *dev, int flags) | 232 | static int radio_open(struct video_device *dev, int flags) |
233 | { | 233 | { |
234 | if(users) | 234 | if(users) |
235 | return -EBUSY; | 235 | return -EBUSY; |
@@ -949,7 +949,7 @@ int __init mycamera_init(struct video_init *v) | |||
949 | 949 | ||
950 | static int users = 0; | 950 | static int users = 0; |
951 | 951 | ||
952 | static int camera_open(stuct video_device *dev, int flags) | 952 | static int camera_open(struct video_device *dev, int flags) |
953 | { | 953 | { |
954 | if(users) | 954 | if(users) |
955 | return -EBUSY; | 955 | return -EBUSY; |
diff --git a/Documentation/cachetlb.txt b/Documentation/cachetlb.txt index 7eb715e07ed..4ae418889b8 100644 --- a/Documentation/cachetlb.txt +++ b/Documentation/cachetlb.txt | |||
@@ -136,7 +136,7 @@ changes occur: | |||
136 | 8) void lazy_mmu_prot_update(pte_t pte) | 136 | 8) void lazy_mmu_prot_update(pte_t pte) |
137 | This interface is called whenever the protection on | 137 | This interface is called whenever the protection on |
138 | any user PTEs change. This interface provides a notification | 138 | any user PTEs change. This interface provides a notification |
139 | to architecture specific code to take appropiate action. | 139 | to architecture specific code to take appropriate action. |
140 | 140 | ||
141 | 141 | ||
142 | Next, we have the cache flushing interfaces. In general, when Linux | 142 | Next, we have the cache flushing interfaces. In general, when Linux |
diff --git a/Documentation/hpet.txt b/Documentation/hpet.txt index e52457581f4..b7a3dc38dd5 100644 --- a/Documentation/hpet.txt +++ b/Documentation/hpet.txt | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | The High Precision Event Timer (HPET) hardware is the future replacement | 3 | The High Precision Event Timer (HPET) hardware is the future replacement |
4 | for the 8254 and Real Time Clock (RTC) periodic timer functionality. | 4 | for the 8254 and Real Time Clock (RTC) periodic timer functionality. |
5 | Each HPET can have up two 32 timers. It is possible to configure the | 5 | Each HPET can have up to 32 timers. It is possible to configure the |
6 | first two timers as legacy replacements for 8254 and RTC periodic timers. | 6 | first two timers as legacy replacements for 8254 and RTC periodic timers. |
7 | A specification done by Intel and Microsoft can be found at | 7 | A specification done by Intel and Microsoft can be found at |
8 | <http://www.intel.com/hardwaredesign/hpetspec.htm>. | 8 | <http://www.intel.com/hardwaredesign/hpetspec.htm>. |
diff --git a/Documentation/input/ff.txt b/Documentation/input/ff.txt index efa7dd6751f..c7e10eaff20 100644 --- a/Documentation/input/ff.txt +++ b/Documentation/input/ff.txt | |||
@@ -120,7 +120,7 @@ to the unique id assigned by the driver. This data is required for performing | |||
120 | some operations (removing an effect, controlling the playback). | 120 | some operations (removing an effect, controlling the playback). |
121 | This if field must be set to -1 by the user in order to tell the driver to | 121 | This if field must be set to -1 by the user in order to tell the driver to |
122 | allocate a new effect. | 122 | allocate a new effect. |
123 | See <linux/input.h> for a description of the ff_effect stuct. You should also | 123 | See <linux/input.h> for a description of the ff_effect struct. You should also |
124 | find help in a few sketches, contained in files shape.fig and interactive.fig. | 124 | find help in a few sketches, contained in files shape.fig and interactive.fig. |
125 | You need xfig to visualize these files. | 125 | You need xfig to visualize these files. |
126 | 126 | ||
diff --git a/Documentation/ioctl/hdio.txt b/Documentation/ioctl/hdio.txt index 9a7aea0636a..11c9be49f37 100644 --- a/Documentation/ioctl/hdio.txt +++ b/Documentation/ioctl/hdio.txt | |||
@@ -946,7 +946,7 @@ HDIO_SCAN_HWIF register and (re)scan interface | |||
946 | 946 | ||
947 | This ioctl initializes the addresses and irq for a disk | 947 | This ioctl initializes the addresses and irq for a disk |
948 | controller, probes for drives, and creates /proc/ide | 948 | controller, probes for drives, and creates /proc/ide |
949 | interfaces as appropiate. | 949 | interfaces as appropriate. |
950 | 950 | ||
951 | 951 | ||
952 | 952 | ||
diff --git a/Documentation/laptop-mode.txt b/Documentation/laptop-mode.txt index f42e4c08935..b18e2167590 100644 --- a/Documentation/laptop-mode.txt +++ b/Documentation/laptop-mode.txt | |||
@@ -357,7 +357,7 @@ MAX_AGE=${MAX_AGE:-'600'} | |||
357 | # Read-ahead, in kilobytes | 357 | # Read-ahead, in kilobytes |
358 | READAHEAD=${READAHEAD:-'4096'} | 358 | READAHEAD=${READAHEAD:-'4096'} |
359 | 359 | ||
360 | # Shall we remount journaled fs. with appropiate commit interval? (1=yes) | 360 | # Shall we remount journaled fs. with appropriate commit interval? (1=yes) |
361 | DO_REMOUNTS=${DO_REMOUNTS:-'1'} | 361 | DO_REMOUNTS=${DO_REMOUNTS:-'1'} |
362 | 362 | ||
363 | # And shall we add the "noatime" option to that as well? (1=yes) | 363 | # And shall we add the "noatime" option to that as well? (1=yes) |
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt index f9d979ee952..7837c53fd5f 100644 --- a/Documentation/networking/sk98lin.txt +++ b/Documentation/networking/sk98lin.txt | |||
@@ -91,7 +91,7 @@ To use the driver as a module, proceed as follows: | |||
91 | with (M) | 91 | with (M) |
92 | 5. Execute the command "make modules". | 92 | 5. Execute the command "make modules". |
93 | 6. Execute the command "make modules_install". | 93 | 6. Execute the command "make modules_install". |
94 | The appropiate modules will be installed. | 94 | The appropriate modules will be installed. |
95 | 7. Reboot your system. | 95 | 7. Reboot your system. |
96 | 96 | ||
97 | 97 | ||
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl index 4963d83d151..e651ed8d1e6 100644 --- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | |||
@@ -5577,7 +5577,7 @@ struct _snd_pcm_runtime { | |||
5577 | <informalexample> | 5577 | <informalexample> |
5578 | <programlisting> | 5578 | <programlisting> |
5579 | <![CDATA[ | 5579 | <![CDATA[ |
5580 | static int mychip_suspend(strut pci_dev *pci, pm_message_t state) | 5580 | static int mychip_suspend(struct pci_dev *pci, pm_message_t state) |
5581 | { | 5581 | { |
5582 | /* (1) */ | 5582 | /* (1) */ |
5583 | struct snd_card *card = pci_get_drvdata(pci); | 5583 | struct snd_card *card = pci_get_drvdata(pci); |
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index 72ab9b99b22..9c5fc15d03d 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt | |||
@@ -198,6 +198,6 @@ Debugging | |||
198 | 198 | ||
199 | Misc | 199 | Misc |
200 | 200 | ||
201 | noreplacement Don't replace instructions with more appropiate ones | 201 | noreplacement Don't replace instructions with more appropriate ones |
202 | for the CPU. This may be useful on asymmetric MP systems | 202 | for the CPU. This may be useful on asymmetric MP systems |
203 | where some CPU have less capabilities than the others. | 203 | where some CPU have less capabilities than the others. |
diff --git a/MAINTAINERS b/MAINTAINERS index ce3c8f52c91..6d1b048c62a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -549,6 +549,7 @@ S: Maintained | |||
549 | COMMON INTERNET FILE SYSTEM (CIFS) | 549 | COMMON INTERNET FILE SYSTEM (CIFS) |
550 | P: Steve French | 550 | P: Steve French |
551 | M: sfrench@samba.org | 551 | M: sfrench@samba.org |
552 | L: linux-cifs-client@lists.samba.org | ||
552 | L: samba-technical@lists.samba.org | 553 | L: samba-technical@lists.samba.org |
553 | W: http://us1.samba.org/samba/Linux_CIFS_client.html | 554 | W: http://us1.samba.org/samba/Linux_CIFS_client.html |
554 | T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git | 555 | T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git |
@@ -2059,7 +2060,7 @@ S: Maintained | |||
2059 | POSIX CLOCKS and TIMERS | 2060 | POSIX CLOCKS and TIMERS |
2060 | P: George Anzinger | 2061 | P: George Anzinger |
2061 | M: george@mvista.com | 2062 | M: george@mvista.com |
2062 | L: netdev@vger.kernel.org | 2063 | L: linux-kernel@vger.kernel.org |
2063 | S: Supported | 2064 | S: Supported |
2064 | 2065 | ||
2065 | POWERPC 4xx EMAC DRIVER | 2066 | POWERPC 4xx EMAC DRIVER |
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c index 0c90ae54ddf..f51c894a7da 100644 --- a/arch/i386/kernel/vm86.c +++ b/arch/i386/kernel/vm86.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Copyright (C) 1994 Linus Torvalds | 4 | * Copyright (C) 1994 Linus Torvalds |
5 | * | 5 | * |
6 | * 29 dec 2001 - Fixed oopses caused by unchecked access to the vm86 | 6 | * 29 dec 2001 - Fixed oopses caused by unchecked access to the vm86 |
7 | * stack - Manfred Spraul <manfreds@colorfullife.com> | 7 | * stack - Manfred Spraul <manfred@colorfullife.com> |
8 | * | 8 | * |
9 | * 22 mar 2002 - Manfred detected the stackfaults, but didn't handle | 9 | * 22 mar 2002 - Manfred detected the stackfaults, but didn't handle |
10 | * them correctly. Now the emulation will be in a | 10 | * them correctly. Now the emulation will be in a |
diff --git a/arch/um/include/sysdep-i386/checksum.h b/arch/um/include/sysdep-i386/checksum.h index 764ba4db478..7d3d202d7ff 100644 --- a/arch/um/include/sysdep-i386/checksum.h +++ b/arch/um/include/sysdep-i386/checksum.h | |||
@@ -36,7 +36,7 @@ unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char * | |||
36 | int len, int sum) | 36 | int len, int sum) |
37 | { | 37 | { |
38 | memcpy(dst, src, len); | 38 | memcpy(dst, src, len); |
39 | return(csum_partial(dst, len, sum)); | 39 | return csum_partial(dst, len, sum); |
40 | } | 40 | } |
41 | 41 | ||
42 | /* | 42 | /* |
@@ -104,7 +104,7 @@ static inline unsigned short ip_fast_csum(unsigned char * iph, | |||
104 | : "=r" (sum), "=r" (iph), "=r" (ihl) | 104 | : "=r" (sum), "=r" (iph), "=r" (ihl) |
105 | : "1" (iph), "2" (ihl) | 105 | : "1" (iph), "2" (ihl) |
106 | : "memory"); | 106 | : "memory"); |
107 | return(sum); | 107 | return sum; |
108 | } | 108 | } |
109 | 109 | ||
110 | /* | 110 | /* |
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 374621a512e..d23b54332d7 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -242,7 +242,6 @@ static int allowed_drive_mask = 0x33; | |||
242 | 242 | ||
243 | static int irqdma_allocated; | 243 | static int irqdma_allocated; |
244 | 244 | ||
245 | #define LOCAL_END_REQUEST | ||
246 | #define DEVICE_NAME "floppy" | 245 | #define DEVICE_NAME "floppy" |
247 | 246 | ||
248 | #include <linux/blkdev.h> | 247 | #include <linux/blkdev.h> |
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index d6fcd0a36f9..4135d8c5bca 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -881,16 +881,6 @@ config FTAPE | |||
881 | module. To compile this driver as a module, choose M here: the | 881 | module. To compile this driver as a module, choose M here: the |
882 | module will be called ftape. | 882 | module will be called ftape. |
883 | 883 | ||
884 | Note that the Ftape-HOWTO is out of date (sorry) and documents the | ||
885 | older version 2.08 of this software but still contains useful | ||
886 | information. There is a web page with more recent documentation at | ||
887 | <http://www.instmath.rwth-aachen.de/~heine/ftape/>. This page | ||
888 | always contains the latest release of the ftape driver and useful | ||
889 | information (backup software, ftape related patches and | ||
890 | documentation, FAQ). Note that the file system interface has | ||
891 | changed quite a bit compared to previous versions of ftape. Please | ||
892 | read <file:Documentation/ftape.txt>. | ||
893 | |||
894 | source "drivers/char/ftape/Kconfig" | 884 | source "drivers/char/ftape/Kconfig" |
895 | 885 | ||
896 | endmenu | 886 | endmenu |
diff --git a/drivers/char/ftape/Kconfig b/drivers/char/ftape/Kconfig index 7d3ecb56a1b..0d65189a7ae 100644 --- a/drivers/char/ftape/Kconfig +++ b/drivers/char/ftape/Kconfig | |||
@@ -25,17 +25,7 @@ config ZFTAPE | |||
25 | support", above) then `zft-compressor' will be loaded | 25 | support", above) then `zft-compressor' will be loaded |
26 | automatically by zftape when needed. | 26 | automatically by zftape when needed. |
27 | 27 | ||
28 | Despite its name, zftape does NOT use compression by default. The | 28 | Despite its name, zftape does NOT use compression by default. |
29 | file <file:Documentation/ftape.txt> contains a short description of | ||
30 | the most important changes in the file system interface compared to | ||
31 | previous versions of ftape. The ftape home page | ||
32 | <http://www.instmath.rwth-aachen.de/~heine/ftape/> contains | ||
33 | further information. | ||
34 | |||
35 | IMPORTANT NOTE: zftape can read archives created by previous | ||
36 | versions of ftape and provide file mark support (i.e. fast skipping | ||
37 | between tape archives) but previous version of ftape will lack file | ||
38 | mark support when reading archives produced by zftape. | ||
39 | 29 | ||
40 | config ZFT_DFLT_BLK_SZ | 30 | config ZFT_DFLT_BLK_SZ |
41 | int "Default block size" | 31 | int "Default block size" |
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index 0e20780d4a2..bdaab699210 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c | |||
@@ -738,7 +738,7 @@ static int __init stallion_module_init(void) | |||
738 | stl_init(); | 738 | stl_init(); |
739 | restore_flags(flags); | 739 | restore_flags(flags); |
740 | 740 | ||
741 | return(0); | 741 | return 0; |
742 | } | 742 | } |
743 | 743 | ||
744 | /*****************************************************************************/ | 744 | /*****************************************************************************/ |
@@ -889,7 +889,7 @@ static unsigned long stl_atol(char *str) | |||
889 | } | 889 | } |
890 | val = (val * base) + c; | 890 | val = (val * base) + c; |
891 | } | 891 | } |
892 | return(val); | 892 | return val; |
893 | } | 893 | } |
894 | 894 | ||
895 | /*****************************************************************************/ | 895 | /*****************************************************************************/ |
@@ -908,7 +908,7 @@ static int stl_parsebrd(stlconf_t *confp, char **argp) | |||
908 | #endif | 908 | #endif |
909 | 909 | ||
910 | if ((argp[0] == (char *) NULL) || (*argp[0] == 0)) | 910 | if ((argp[0] == (char *) NULL) || (*argp[0] == 0)) |
911 | return(0); | 911 | return 0; |
912 | 912 | ||
913 | for (sp = argp[0], i = 0; ((*sp != 0) && (i < 25)); sp++, i++) | 913 | for (sp = argp[0], i = 0; ((*sp != 0) && (i < 25)); sp++, i++) |
914 | *sp = TOLOWER(*sp); | 914 | *sp = TOLOWER(*sp); |
@@ -935,7 +935,7 @@ static int stl_parsebrd(stlconf_t *confp, char **argp) | |||
935 | } | 935 | } |
936 | if ((argp[i] != (char *) NULL) && (*argp[i] != 0)) | 936 | if ((argp[i] != (char *) NULL) && (*argp[i] != 0)) |
937 | confp->irq = stl_atol(argp[i]); | 937 | confp->irq = stl_atol(argp[i]); |
938 | return(1); | 938 | return 1; |
939 | } | 939 | } |
940 | 940 | ||
941 | /*****************************************************************************/ | 941 | /*****************************************************************************/ |
@@ -946,7 +946,7 @@ static int stl_parsebrd(stlconf_t *confp, char **argp) | |||
946 | 946 | ||
947 | static void *stl_memalloc(int len) | 947 | static void *stl_memalloc(int len) |
948 | { | 948 | { |
949 | return((void *) kmalloc(len, GFP_KERNEL)); | 949 | return (void *) kmalloc(len, GFP_KERNEL); |
950 | } | 950 | } |
951 | 951 | ||
952 | /*****************************************************************************/ | 952 | /*****************************************************************************/ |
@@ -963,12 +963,12 @@ static stlbrd_t *stl_allocbrd(void) | |||
963 | if (brdp == (stlbrd_t *) NULL) { | 963 | if (brdp == (stlbrd_t *) NULL) { |
964 | printk("STALLION: failed to allocate memory (size=%d)\n", | 964 | printk("STALLION: failed to allocate memory (size=%d)\n", |
965 | sizeof(stlbrd_t)); | 965 | sizeof(stlbrd_t)); |
966 | return((stlbrd_t *) NULL); | 966 | return (stlbrd_t *) NULL; |
967 | } | 967 | } |
968 | 968 | ||
969 | memset(brdp, 0, sizeof(stlbrd_t)); | 969 | memset(brdp, 0, sizeof(stlbrd_t)); |
970 | brdp->magic = STL_BOARDMAGIC; | 970 | brdp->magic = STL_BOARDMAGIC; |
971 | return(brdp); | 971 | return brdp; |
972 | } | 972 | } |
973 | 973 | ||
974 | /*****************************************************************************/ | 974 | /*****************************************************************************/ |
@@ -988,10 +988,10 @@ static int stl_open(struct tty_struct *tty, struct file *filp) | |||
988 | minordev = tty->index; | 988 | minordev = tty->index; |
989 | brdnr = MINOR2BRD(minordev); | 989 | brdnr = MINOR2BRD(minordev); |
990 | if (brdnr >= stl_nrbrds) | 990 | if (brdnr >= stl_nrbrds) |
991 | return(-ENODEV); | 991 | return -ENODEV; |
992 | brdp = stl_brds[brdnr]; | 992 | brdp = stl_brds[brdnr]; |
993 | if (brdp == (stlbrd_t *) NULL) | 993 | if (brdp == (stlbrd_t *) NULL) |
994 | return(-ENODEV); | 994 | return -ENODEV; |
995 | minordev = MINOR2PORT(minordev); | 995 | minordev = MINOR2PORT(minordev); |
996 | for (portnr = -1, panelnr = 0; (panelnr < STL_MAXPANELS); panelnr++) { | 996 | for (portnr = -1, panelnr = 0; (panelnr < STL_MAXPANELS); panelnr++) { |
997 | if (brdp->panels[panelnr] == (stlpanel_t *) NULL) | 997 | if (brdp->panels[panelnr] == (stlpanel_t *) NULL) |
@@ -1003,11 +1003,11 @@ static int stl_open(struct tty_struct *tty, struct file *filp) | |||
1003 | minordev -= brdp->panels[panelnr]->nrports; | 1003 | minordev -= brdp->panels[panelnr]->nrports; |
1004 | } | 1004 | } |
1005 | if (portnr < 0) | 1005 | if (portnr < 0) |
1006 | return(-ENODEV); | 1006 | return -ENODEV; |
1007 | 1007 | ||
1008 | portp = brdp->panels[panelnr]->ports[portnr]; | 1008 | portp = brdp->panels[panelnr]->ports[portnr]; |
1009 | if (portp == (stlport_t *) NULL) | 1009 | if (portp == (stlport_t *) NULL) |
1010 | return(-ENODEV); | 1010 | return -ENODEV; |
1011 | 1011 | ||
1012 | /* | 1012 | /* |
1013 | * On the first open of the device setup the port hardware, and | 1013 | * On the first open of the device setup the port hardware, and |
@@ -1021,7 +1021,7 @@ static int stl_open(struct tty_struct *tty, struct file *filp) | |||
1021 | if (portp->tx.buf == (char *) NULL) { | 1021 | if (portp->tx.buf == (char *) NULL) { |
1022 | portp->tx.buf = (char *) stl_memalloc(STL_TXBUFSIZE); | 1022 | portp->tx.buf = (char *) stl_memalloc(STL_TXBUFSIZE); |
1023 | if (portp->tx.buf == (char *) NULL) | 1023 | if (portp->tx.buf == (char *) NULL) |
1024 | return(-ENOMEM); | 1024 | return -ENOMEM; |
1025 | portp->tx.head = portp->tx.buf; | 1025 | portp->tx.head = portp->tx.buf; |
1026 | portp->tx.tail = portp->tx.buf; | 1026 | portp->tx.tail = portp->tx.buf; |
1027 | } | 1027 | } |
@@ -1043,8 +1043,8 @@ static int stl_open(struct tty_struct *tty, struct file *filp) | |||
1043 | if (portp->flags & ASYNC_CLOSING) { | 1043 | if (portp->flags & ASYNC_CLOSING) { |
1044 | interruptible_sleep_on(&portp->close_wait); | 1044 | interruptible_sleep_on(&portp->close_wait); |
1045 | if (portp->flags & ASYNC_HUP_NOTIFY) | 1045 | if (portp->flags & ASYNC_HUP_NOTIFY) |
1046 | return(-EAGAIN); | 1046 | return -EAGAIN; |
1047 | return(-ERESTARTSYS); | 1047 | return -ERESTARTSYS; |
1048 | } | 1048 | } |
1049 | 1049 | ||
1050 | /* | 1050 | /* |
@@ -1054,11 +1054,11 @@ static int stl_open(struct tty_struct *tty, struct file *filp) | |||
1054 | */ | 1054 | */ |
1055 | if (!(filp->f_flags & O_NONBLOCK)) { | 1055 | if (!(filp->f_flags & O_NONBLOCK)) { |
1056 | if ((rc = stl_waitcarrier(portp, filp)) != 0) | 1056 | if ((rc = stl_waitcarrier(portp, filp)) != 0) |
1057 | return(rc); | 1057 | return rc; |
1058 | } | 1058 | } |
1059 | portp->flags |= ASYNC_NORMAL_ACTIVE; | 1059 | portp->flags |= ASYNC_NORMAL_ACTIVE; |
1060 | 1060 | ||
1061 | return(0); | 1061 | return 0; |
1062 | } | 1062 | } |
1063 | 1063 | ||
1064 | /*****************************************************************************/ | 1064 | /*****************************************************************************/ |
@@ -1115,7 +1115,7 @@ static int stl_waitcarrier(stlport_t *portp, struct file *filp) | |||
1115 | portp->openwaitcnt--; | 1115 | portp->openwaitcnt--; |
1116 | restore_flags(flags); | 1116 | restore_flags(flags); |
1117 | 1117 | ||
1118 | return(rc); | 1118 | return rc; |
1119 | } | 1119 | } |
1120 | 1120 | ||
1121 | /*****************************************************************************/ | 1121 | /*****************************************************************************/ |
@@ -1211,12 +1211,12 @@ static int stl_write(struct tty_struct *tty, const unsigned char *buf, int count | |||
1211 | 1211 | ||
1212 | if ((tty == (struct tty_struct *) NULL) || | 1212 | if ((tty == (struct tty_struct *) NULL) || |
1213 | (stl_tmpwritebuf == (char *) NULL)) | 1213 | (stl_tmpwritebuf == (char *) NULL)) |
1214 | return(0); | 1214 | return 0; |
1215 | portp = tty->driver_data; | 1215 | portp = tty->driver_data; |
1216 | if (portp == (stlport_t *) NULL) | 1216 | if (portp == (stlport_t *) NULL) |
1217 | return(0); | 1217 | return 0; |
1218 | if (portp->tx.buf == (char *) NULL) | 1218 | if (portp->tx.buf == (char *) NULL) |
1219 | return(0); | 1219 | return 0; |
1220 | 1220 | ||
1221 | /* | 1221 | /* |
1222 | * If copying direct from user space we must cater for page faults, | 1222 | * If copying direct from user space we must cater for page faults, |
@@ -1255,7 +1255,7 @@ static int stl_write(struct tty_struct *tty, const unsigned char *buf, int count | |||
1255 | clear_bit(ASYI_TXLOW, &portp->istate); | 1255 | clear_bit(ASYI_TXLOW, &portp->istate); |
1256 | stl_startrxtx(portp, -1, 1); | 1256 | stl_startrxtx(portp, -1, 1); |
1257 | 1257 | ||
1258 | return(count); | 1258 | return count; |
1259 | } | 1259 | } |
1260 | 1260 | ||
1261 | /*****************************************************************************/ | 1261 | /*****************************************************************************/ |
@@ -1336,16 +1336,16 @@ static int stl_writeroom(struct tty_struct *tty) | |||
1336 | #endif | 1336 | #endif |
1337 | 1337 | ||
1338 | if (tty == (struct tty_struct *) NULL) | 1338 | if (tty == (struct tty_struct *) NULL) |
1339 | return(0); | 1339 | return 0; |
1340 | portp = tty->driver_data; | 1340 | portp = tty->driver_data; |
1341 | if (portp == (stlport_t *) NULL) | 1341 | if (portp == (stlport_t *) NULL) |
1342 | return(0); | 1342 | return 0; |
1343 | if (portp->tx.buf == (char *) NULL) | 1343 | if (portp->tx.buf == (char *) NULL) |
1344 | return(0); | 1344 | return 0; |
1345 | 1345 | ||
1346 | head = portp->tx.head; | 1346 | head = portp->tx.head; |
1347 | tail = portp->tx.tail; | 1347 | tail = portp->tx.tail; |
1348 | return((head >= tail) ? (STL_TXBUFSIZE - (head - tail) - 1) : (tail - head - 1)); | 1348 | return ((head >= tail) ? (STL_TXBUFSIZE - (head - tail) - 1) : (tail - head - 1)); |
1349 | } | 1349 | } |
1350 | 1350 | ||
1351 | /*****************************************************************************/ | 1351 | /*****************************************************************************/ |
@@ -1370,19 +1370,19 @@ static int stl_charsinbuffer(struct tty_struct *tty) | |||
1370 | #endif | 1370 | #endif |
1371 | 1371 | ||
1372 | if (tty == (struct tty_struct *) NULL) | 1372 | if (tty == (struct tty_struct *) NULL) |
1373 | return(0); | 1373 | return 0; |
1374 | portp = tty->driver_data; | 1374 | portp = tty->driver_data; |
1375 | if (portp == (stlport_t *) NULL) | 1375 | if (portp == (stlport_t *) NULL) |
1376 | return(0); | 1376 | return 0; |
1377 | if (portp->tx.buf == (char *) NULL) | 1377 | if (portp->tx.buf == (char *) NULL) |
1378 | return(0); | 1378 | return 0; |
1379 | 1379 | ||
1380 | head = portp->tx.head; | 1380 | head = portp->tx.head; |
1381 | tail = portp->tx.tail; | 1381 | tail = portp->tx.tail; |
1382 | size = (head >= tail) ? (head - tail) : (STL_TXBUFSIZE - (tail - head)); | 1382 | size = (head >= tail) ? (head - tail) : (STL_TXBUFSIZE - (tail - head)); |
1383 | if ((size == 0) && test_bit(ASYI_TXBUSY, &portp->istate)) | 1383 | if ((size == 0) && test_bit(ASYI_TXBUSY, &portp->istate)) |
1384 | size = 1; | 1384 | size = 1; |
1385 | return(size); | 1385 | return size; |
1386 | } | 1386 | } |
1387 | 1387 | ||
1388 | /*****************************************************************************/ | 1388 | /*****************************************************************************/ |
@@ -1447,7 +1447,7 @@ static int stl_setserial(stlport_t *portp, struct serial_struct __user *sp) | |||
1447 | (sio.close_delay != portp->close_delay) || | 1447 | (sio.close_delay != portp->close_delay) || |
1448 | ((sio.flags & ~ASYNC_USR_MASK) != | 1448 | ((sio.flags & ~ASYNC_USR_MASK) != |
1449 | (portp->flags & ~ASYNC_USR_MASK))) | 1449 | (portp->flags & ~ASYNC_USR_MASK))) |
1450 | return(-EPERM); | 1450 | return -EPERM; |
1451 | } | 1451 | } |
1452 | 1452 | ||
1453 | portp->flags = (portp->flags & ~ASYNC_USR_MASK) | | 1453 | portp->flags = (portp->flags & ~ASYNC_USR_MASK) | |
@@ -1457,7 +1457,7 @@ static int stl_setserial(stlport_t *portp, struct serial_struct __user *sp) | |||
1457 | portp->closing_wait = sio.closing_wait; | 1457 | portp->closing_wait = sio.closing_wait; |
1458 | portp->custom_divisor = sio.custom_divisor; | 1458 | portp->custom_divisor = sio.custom_divisor; |
1459 | stl_setport(portp, portp->tty->termios); | 1459 | stl_setport(portp, portp->tty->termios); |
1460 | return(0); | 1460 | return 0; |
1461 | } | 1461 | } |
1462 | 1462 | ||
1463 | /*****************************************************************************/ | 1463 | /*****************************************************************************/ |
@@ -1467,12 +1467,12 @@ static int stl_tiocmget(struct tty_struct *tty, struct file *file) | |||
1467 | stlport_t *portp; | 1467 | stlport_t *portp; |
1468 | 1468 | ||
1469 | if (tty == (struct tty_struct *) NULL) | 1469 | if (tty == (struct tty_struct *) NULL) |
1470 | return(-ENODEV); | 1470 | return -ENODEV; |
1471 | portp = tty->driver_data; | 1471 | portp = tty->driver_data; |
1472 | if (portp == (stlport_t *) NULL) | 1472 | if (portp == (stlport_t *) NULL) |
1473 | return(-ENODEV); | 1473 | return -ENODEV; |
1474 | if (tty->flags & (1 << TTY_IO_ERROR)) | 1474 | if (tty->flags & (1 << TTY_IO_ERROR)) |
1475 | return(-EIO); | 1475 | return -EIO; |
1476 | 1476 | ||
1477 | return stl_getsignals(portp); | 1477 | return stl_getsignals(portp); |
1478 | } | 1478 | } |
@@ -1484,12 +1484,12 @@ static int stl_tiocmset(struct tty_struct *tty, struct file *file, | |||
1484 | int rts = -1, dtr = -1; | 1484 | int rts = -1, dtr = -1; |
1485 | 1485 | ||
1486 | if (tty == (struct tty_struct *) NULL) | 1486 | if (tty == (struct tty_struct *) NULL) |
1487 | return(-ENODEV); | 1487 | return -ENODEV; |
1488 | portp = tty->driver_data; | 1488 | portp = tty->driver_data; |
1489 | if (portp == (stlport_t *) NULL) | 1489 | if (portp == (stlport_t *) NULL) |
1490 | return(-ENODEV); | 1490 | return -ENODEV; |
1491 | if (tty->flags & (1 << TTY_IO_ERROR)) | 1491 | if (tty->flags & (1 << TTY_IO_ERROR)) |
1492 | return(-EIO); | 1492 | return -EIO; |
1493 | 1493 | ||
1494 | if (set & TIOCM_RTS) | 1494 | if (set & TIOCM_RTS) |
1495 | rts = 1; | 1495 | rts = 1; |
@@ -1517,15 +1517,15 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd | |||
1517 | #endif | 1517 | #endif |
1518 | 1518 | ||
1519 | if (tty == (struct tty_struct *) NULL) | 1519 | if (tty == (struct tty_struct *) NULL) |
1520 | return(-ENODEV); | 1520 | return -ENODEV; |
1521 | portp = tty->driver_data; | 1521 | portp = tty->driver_data; |
1522 | if (portp == (stlport_t *) NULL) | 1522 | if (portp == (stlport_t *) NULL) |
1523 | return(-ENODEV); | 1523 | return -ENODEV; |
1524 | 1524 | ||
1525 | if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && | 1525 | if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && |
1526 | (cmd != COM_GETPORTSTATS) && (cmd != COM_CLRPORTSTATS)) { | 1526 | (cmd != COM_GETPORTSTATS) && (cmd != COM_CLRPORTSTATS)) { |
1527 | if (tty->flags & (1 << TTY_IO_ERROR)) | 1527 | if (tty->flags & (1 << TTY_IO_ERROR)) |
1528 | return(-EIO); | 1528 | return -EIO; |
1529 | } | 1529 | } |
1530 | 1530 | ||
1531 | rc = 0; | 1531 | rc = 0; |
@@ -1566,7 +1566,7 @@ static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd | |||
1566 | break; | 1566 | break; |
1567 | } | 1567 | } |
1568 | 1568 | ||
1569 | return(rc); | 1569 | return rc; |
1570 | } | 1570 | } |
1571 | 1571 | ||
1572 | /*****************************************************************************/ | 1572 | /*****************************************************************************/ |
@@ -1872,7 +1872,7 @@ static int stl_portinfo(stlport_t *portp, int portnr, char *pos) | |||
1872 | pos[(MAXLINE - 2)] = '+'; | 1872 | pos[(MAXLINE - 2)] = '+'; |
1873 | pos[(MAXLINE - 1)] = '\n'; | 1873 | pos[(MAXLINE - 1)] = '\n'; |
1874 | 1874 | ||
1875 | return(MAXLINE); | 1875 | return MAXLINE; |
1876 | } | 1876 | } |
1877 | 1877 | ||
1878 | /*****************************************************************************/ | 1878 | /*****************************************************************************/ |
@@ -1957,7 +1957,7 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eof | |||
1957 | 1957 | ||
1958 | stl_readdone: | 1958 | stl_readdone: |
1959 | *start = page; | 1959 | *start = page; |
1960 | return(pos - page); | 1960 | return (pos - page); |
1961 | } | 1961 | } |
1962 | 1962 | ||
1963 | /*****************************************************************************/ | 1963 | /*****************************************************************************/ |
@@ -2349,7 +2349,7 @@ static inline int stl_initeio(stlbrd_t *brdp) | |||
2349 | } else { | 2349 | } else { |
2350 | rc = 0; | 2350 | rc = 0; |
2351 | } | 2351 | } |
2352 | return(rc); | 2352 | return rc; |
2353 | } | 2353 | } |
2354 | 2354 | ||
2355 | /*****************************************************************************/ | 2355 | /*****************************************************************************/ |
@@ -3116,7 +3116,7 @@ static int __init stl_init(void) | |||
3116 | return -1; | 3116 | return -1; |
3117 | } | 3117 | } |
3118 | 3118 | ||
3119 | return(0); | 3119 | return 0; |
3120 | } | 3120 | } |
3121 | 3121 | ||
3122 | /*****************************************************************************/ | 3122 | /*****************************************************************************/ |
@@ -3132,7 +3132,7 @@ static int __init stl_init(void) | |||
3132 | static int stl_cd1400getreg(stlport_t *portp, int regnr) | 3132 | static int stl_cd1400getreg(stlport_t *portp, int regnr) |
3133 | { | 3133 | { |
3134 | outb((regnr + portp->uartaddr), portp->ioaddr); | 3134 | outb((regnr + portp->uartaddr), portp->ioaddr); |
3135 | return(inb(portp->ioaddr + EREG_DATA)); | 3135 | return inb(portp->ioaddr + EREG_DATA); |
3136 | } | 3136 | } |
3137 | 3137 | ||
3138 | static void stl_cd1400setreg(stlport_t *portp, int regnr, int value) | 3138 | static void stl_cd1400setreg(stlport_t *portp, int regnr, int value) |
@@ -3146,9 +3146,9 @@ static int stl_cd1400updatereg(stlport_t *portp, int regnr, int value) | |||
3146 | outb((regnr + portp->uartaddr), portp->ioaddr); | 3146 | outb((regnr + portp->uartaddr), portp->ioaddr); |
3147 | if (inb(portp->ioaddr + EREG_DATA) != value) { | 3147 | if (inb(portp->ioaddr + EREG_DATA) != value) { |
3148 | outb(value, portp->ioaddr + EREG_DATA); | 3148 | outb(value, portp->ioaddr + EREG_DATA); |
3149 | return(1); | 3149 | return 1; |
3150 | } | 3150 | } |
3151 | return(0); | 3151 | return 0; |
3152 | } | 3152 | } |
3153 | 3153 | ||
3154 | /*****************************************************************************/ | 3154 | /*****************************************************************************/ |
@@ -3206,7 +3206,7 @@ static int stl_cd1400panelinit(stlbrd_t *brdp, stlpanel_t *panelp) | |||
3206 | } | 3206 | } |
3207 | 3207 | ||
3208 | BRDDISABLE(panelp->brdnr); | 3208 | BRDDISABLE(panelp->brdnr); |
3209 | return(chipmask); | 3209 | return chipmask; |
3210 | } | 3210 | } |
3211 | 3211 | ||
3212 | /*****************************************************************************/ | 3212 | /*****************************************************************************/ |
@@ -3557,7 +3557,7 @@ static int stl_cd1400getsignals(stlport_t *portp) | |||
3557 | #else | 3557 | #else |
3558 | sigs |= TIOCM_DSR; | 3558 | sigs |= TIOCM_DSR; |
3559 | #endif | 3559 | #endif |
3560 | return(sigs); | 3560 | return sigs; |
3561 | } | 3561 | } |
3562 | 3562 | ||
3563 | /*****************************************************************************/ | 3563 | /*****************************************************************************/ |
@@ -3830,9 +3830,9 @@ static int stl_cd1400datastate(stlport_t *portp) | |||
3830 | #endif | 3830 | #endif |
3831 | 3831 | ||
3832 | if (portp == (stlport_t *) NULL) | 3832 | if (portp == (stlport_t *) NULL) |
3833 | return(0); | 3833 | return 0; |
3834 | 3834 | ||
3835 | return(test_bit(ASYI_TXBUSY, &portp->istate) ? 1 : 0); | 3835 | return test_bit(ASYI_TXBUSY, &portp->istate) ? 1 : 0; |
3836 | } | 3836 | } |
3837 | 3837 | ||
3838 | /*****************************************************************************/ | 3838 | /*****************************************************************************/ |
@@ -3912,20 +3912,20 @@ static inline int stl_cd1400breakisr(stlport_t *portp, int ioaddr) | |||
3912 | outb((SRER + portp->uartaddr), ioaddr); | 3912 | outb((SRER + portp->uartaddr), ioaddr); |
3913 | outb((inb(ioaddr + EREG_DATA) & ~(SRER_TXDATA | SRER_TXEMPTY)), | 3913 | outb((inb(ioaddr + EREG_DATA) & ~(SRER_TXDATA | SRER_TXEMPTY)), |
3914 | (ioaddr + EREG_DATA)); | 3914 | (ioaddr + EREG_DATA)); |
3915 | return(1); | 3915 | return 1; |
3916 | } else if (portp->brklen > 1) { | 3916 | } else if (portp->brklen > 1) { |
3917 | outb((TDR + portp->uartaddr), ioaddr); | 3917 | outb((TDR + portp->uartaddr), ioaddr); |
3918 | outb(ETC_CMD, (ioaddr + EREG_DATA)); | 3918 | outb(ETC_CMD, (ioaddr + EREG_DATA)); |
3919 | outb(ETC_STOPBREAK, (ioaddr + EREG_DATA)); | 3919 | outb(ETC_STOPBREAK, (ioaddr + EREG_DATA)); |
3920 | portp->brklen = -1; | 3920 | portp->brklen = -1; |
3921 | return(1); | 3921 | return 1; |
3922 | } else { | 3922 | } else { |
3923 | outb((COR2 + portp->uartaddr), ioaddr); | 3923 | outb((COR2 + portp->uartaddr), ioaddr); |
3924 | outb((inb(ioaddr + EREG_DATA) & ~COR2_ETC), | 3924 | outb((inb(ioaddr + EREG_DATA) & ~COR2_ETC), |
3925 | (ioaddr + EREG_DATA)); | 3925 | (ioaddr + EREG_DATA)); |
3926 | portp->brklen = 0; | 3926 | portp->brklen = 0; |
3927 | } | 3927 | } |
3928 | return(0); | 3928 | return 0; |
3929 | } | 3929 | } |
3930 | 3930 | ||
3931 | /*****************************************************************************/ | 3931 | /*****************************************************************************/ |
@@ -4166,7 +4166,7 @@ static void stl_cd1400mdmisr(stlpanel_t *panelp, int ioaddr) | |||
4166 | static int stl_sc26198getreg(stlport_t *portp, int regnr) | 4166 | static int stl_sc26198getreg(stlport_t *portp, int regnr) |
4167 | { | 4167 | { |
4168 | outb((regnr | portp->uartaddr), (portp->ioaddr + XP_ADDR)); | 4168 | outb((regnr | portp->uartaddr), (portp->ioaddr + XP_ADDR)); |
4169 | return(inb(portp->ioaddr + XP_DATA)); | 4169 | return inb(portp->ioaddr + XP_DATA); |
4170 | } | 4170 | } |
4171 | 4171 | ||
4172 | static void stl_sc26198setreg(stlport_t *portp, int regnr, int value) | 4172 | static void stl_sc26198setreg(stlport_t *portp, int regnr, int value) |
@@ -4180,9 +4180,9 @@ static int stl_sc26198updatereg(stlport_t *portp, int regnr, int value) | |||
4180 | outb((regnr | portp->uartaddr), (portp->ioaddr + XP_ADDR)); | 4180 | outb((regnr | portp->uartaddr), (portp->ioaddr + XP_ADDR)); |
4181 | if (inb(portp->ioaddr + XP_DATA) != value) { | 4181 | if (inb(portp->ioaddr + XP_DATA) != value) { |
4182 | outb(value, (portp->ioaddr + XP_DATA)); | 4182 | outb(value, (portp->ioaddr + XP_DATA)); |
4183 | return(1); | 4183 | return 1; |
4184 | } | 4184 | } |
4185 | return(0); | 4185 | return 0; |
4186 | } | 4186 | } |
4187 | 4187 | ||
4188 | /*****************************************************************************/ | 4188 | /*****************************************************************************/ |
@@ -4194,7 +4194,7 @@ static int stl_sc26198updatereg(stlport_t *portp, int regnr, int value) | |||
4194 | static int stl_sc26198getglobreg(stlport_t *portp, int regnr) | 4194 | static int stl_sc26198getglobreg(stlport_t *portp, int regnr) |
4195 | { | 4195 | { |
4196 | outb(regnr, (portp->ioaddr + XP_ADDR)); | 4196 | outb(regnr, (portp->ioaddr + XP_ADDR)); |
4197 | return(inb(portp->ioaddr + XP_DATA)); | 4197 | return inb(portp->ioaddr + XP_DATA); |
4198 | } | 4198 | } |
4199 | 4199 | ||
4200 | #if 0 | 4200 | #if 0 |
@@ -4252,7 +4252,7 @@ static int stl_sc26198panelinit(stlbrd_t *brdp, stlpanel_t *panelp) | |||
4252 | } | 4252 | } |
4253 | 4253 | ||
4254 | BRDDISABLE(panelp->brdnr); | 4254 | BRDDISABLE(panelp->brdnr); |
4255 | return(chipmask); | 4255 | return chipmask; |
4256 | } | 4256 | } |
4257 | 4257 | ||
4258 | /*****************************************************************************/ | 4258 | /*****************************************************************************/ |
@@ -4546,7 +4546,7 @@ static int stl_sc26198getsignals(stlport_t *portp) | |||
4546 | sigs |= (ipr & IPR_DTR) ? 0: TIOCM_DTR; | 4546 | sigs |= (ipr & IPR_DTR) ? 0: TIOCM_DTR; |
4547 | sigs |= (ipr & IPR_RTS) ? 0: TIOCM_RTS; | 4547 | sigs |= (ipr & IPR_RTS) ? 0: TIOCM_RTS; |
4548 | sigs |= TIOCM_DSR; | 4548 | sigs |= TIOCM_DSR; |
4549 | return(sigs); | 4549 | return sigs; |
4550 | } | 4550 | } |
4551 | 4551 | ||
4552 | /*****************************************************************************/ | 4552 | /*****************************************************************************/ |
@@ -4828,9 +4828,9 @@ static int stl_sc26198datastate(stlport_t *portp) | |||
4828 | #endif | 4828 | #endif |
4829 | 4829 | ||
4830 | if (portp == (stlport_t *) NULL) | 4830 | if (portp == (stlport_t *) NULL) |
4831 | return(0); | 4831 | return 0; |
4832 | if (test_bit(ASYI_TXBUSY, &portp->istate)) | 4832 | if (test_bit(ASYI_TXBUSY, &portp->istate)) |
4833 | return(1); | 4833 | return 1; |
4834 | 4834 | ||
4835 | save_flags(flags); | 4835 | save_flags(flags); |
4836 | cli(); | 4836 | cli(); |
@@ -4839,7 +4839,7 @@ static int stl_sc26198datastate(stlport_t *portp) | |||
4839 | BRDDISABLE(portp->brdnr); | 4839 | BRDDISABLE(portp->brdnr); |
4840 | restore_flags(flags); | 4840 | restore_flags(flags); |
4841 | 4841 | ||
4842 | return((sr & SR_TXEMPTY) ? 0 : 1); | 4842 | return (sr & SR_TXEMPTY) ? 0 : 1; |
4843 | } | 4843 | } |
4844 | 4844 | ||
4845 | /*****************************************************************************/ | 4845 | /*****************************************************************************/ |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 171999e67ee..1421941487c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2676,10 +2676,6 @@ config SHAPER | |||
2676 | Class-Based Queueing (CBQ) scheduling support which you get if you | 2676 | Class-Based Queueing (CBQ) scheduling support which you get if you |
2677 | say Y to "QoS and/or fair queueing" above. | 2677 | say Y to "QoS and/or fair queueing" above. |
2678 | 2678 | ||
2679 | To set up and configure shaper devices, you need the shapecfg | ||
2680 | program, available from <ftp://shadow.cabi.net/pub/Linux/> in the | ||
2681 | shaper package. | ||
2682 | |||
2683 | To compile this driver as a module, choose M here: the module | 2679 | To compile this driver as a module, choose M here: the module |
2684 | will be called shaper. If unsure, say N. | 2680 | will be called shaper. If unsure, say N. |
2685 | 2681 | ||
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 2b948ea397d..40926d77916 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
@@ -641,7 +641,7 @@ static void lmc_watchdog (unsigned long data) /*fold00*/ | |||
641 | spin_lock_irqsave(&sc->lmc_lock, flags); | 641 | spin_lock_irqsave(&sc->lmc_lock, flags); |
642 | 642 | ||
643 | if(sc->check != 0xBEAFCAFE){ | 643 | if(sc->check != 0xBEAFCAFE){ |
644 | printk("LMC: Corrupt net_device stuct, breaking out\n"); | 644 | printk("LMC: Corrupt net_device struct, breaking out\n"); |
645 | spin_unlock_irqrestore(&sc->lmc_lock, flags); | 645 | spin_unlock_irqrestore(&sc->lmc_lock, flags); |
646 | return; | 646 | return; |
647 | } | 647 | } |
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index c1a6e69f790..233a4f60808 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
@@ -24,10 +24,6 @@ config NET_RADIO | |||
24 | the tools from | 24 | the tools from |
25 | <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. | 25 | <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. |
26 | 26 | ||
27 | Some user-level drivers for scarab devices which don't require | ||
28 | special kernel support are available from | ||
29 | <ftp://shadow.cabi.net/pub/Linux/>. | ||
30 | |||
31 | # Note : the cards are obsolete (can't buy them anymore), but the drivers | 27 | # Note : the cards are obsolete (can't buy them anymore), but the drivers |
32 | # are not, as people are still using them... | 28 | # are not, as people are still using them... |
33 | comment "Obsolete Wireless cards support (pre-802.11)" | 29 | comment "Obsolete Wireless cards support (pre-802.11)" |
@@ -160,7 +156,7 @@ config IPW2100 | |||
160 | <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. | 156 | <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. |
161 | 157 | ||
162 | If you want to compile the driver as a module ( = code which can be | 158 | If you want to compile the driver as a module ( = code which can be |
163 | inserted in and remvoed from the running kernel whenever you want), | 159 | inserted in and removed from the running kernel whenever you want), |
164 | say M here and read <file:Documentation/modules.txt>. The module | 160 | say M here and read <file:Documentation/modules.txt>. The module |
165 | will be called ipw2100.ko. | 161 | will be called ipw2100.ko. |
166 | 162 | ||
@@ -213,7 +209,7 @@ config IPW2200 | |||
213 | <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. | 209 | <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. |
214 | 210 | ||
215 | If you want to compile the driver as a module ( = code which can be | 211 | If you want to compile the driver as a module ( = code which can be |
216 | inserted in and remvoed from the running kernel whenever you want), | 212 | inserted in and removed from the running kernel whenever you want), |
217 | say M here and read <file:Documentation/modules.txt>. The module | 213 | say M here and read <file:Documentation/modules.txt>. The module |
218 | will be called ipw2200.ko. | 214 | will be called ipw2200.ko. |
219 | 215 | ||
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 7bdb00b5aeb..c065cb836c9 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c | |||
@@ -3403,7 +3403,7 @@ zfcp_erp_action_dequeue(struct zfcp_erp_action *erp_action) | |||
3403 | /** | 3403 | /** |
3404 | * zfcp_erp_action_cleanup | 3404 | * zfcp_erp_action_cleanup |
3405 | * | 3405 | * |
3406 | * Register unit with scsi stack if appropiate and fix reference counts. | 3406 | * Register unit with scsi stack if appropriate and fix reference counts. |
3407 | * Note: Temporary units are not registered with scsi stack. | 3407 | * Note: Temporary units are not registered with scsi stack. |
3408 | */ | 3408 | */ |
3409 | static void | 3409 | static void |
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c index 5beed4f6d98..8d64f0bed62 100644 --- a/drivers/scsi/FlashPoint.c +++ b/drivers/scsi/FlashPoint.c | |||
@@ -149,7 +149,7 @@ typedef SCCBMGR_INFO * PSCCBMGR_INFO; | |||
149 | #define PCI_BUS_CARD 0x03 | 149 | #define PCI_BUS_CARD 0x03 |
150 | #define VESA_BUS_CARD 0x04 | 150 | #define VESA_BUS_CARD 0x04 |
151 | 151 | ||
152 | /* SCCB struc used for both SCCB and UCB manager compiles! | 152 | /* SCCB struct used for both SCCB and UCB manager compiles! |
153 | * The UCB Manager treats the SCCB as it's 'native hardware structure' | 153 | * The UCB Manager treats the SCCB as it's 'native hardware structure' |
154 | */ | 154 | */ |
155 | 155 | ||
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index a6deb016584..bd3ffdf6c80 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c | |||
@@ -328,7 +328,7 @@ | |||
328 | * hdr_channel:x x - number of virtual bus for host drives | 328 | * hdr_channel:x x - number of virtual bus for host drives |
329 | * shared_access:Y disable driver reserve/release protocol to | 329 | * shared_access:Y disable driver reserve/release protocol to |
330 | * access a shared resource from several nodes, | 330 | * access a shared resource from several nodes, |
331 | * appropiate controller firmware required | 331 | * appropriate controller firmware required |
332 | * shared_access:N enable driver reserve/release protocol | 332 | * shared_access:N enable driver reserve/release protocol |
333 | * probe_eisa_isa:Y scan for EISA/ISA controllers | 333 | * probe_eisa_isa:Y scan for EISA/ISA controllers |
334 | * probe_eisa_isa:N do not scan for EISA/ISA controllers | 334 | * probe_eisa_isa:N do not scan for EISA/ISA controllers |
diff --git a/fs/efs/super.c b/fs/efs/super.c index d8d5ea9a999..afc4891feb3 100644 --- a/fs/efs/super.c +++ b/fs/efs/super.c | |||
@@ -222,12 +222,13 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) { | |||
222 | sblock); | 222 | sblock); |
223 | #endif | 223 | #endif |
224 | } | 224 | } |
225 | return(sblock); | 225 | return sblock; |
226 | } | 226 | } |
227 | 227 | ||
228 | static int efs_validate_super(struct efs_sb_info *sb, struct efs_super *super) { | 228 | static int efs_validate_super(struct efs_sb_info *sb, struct efs_super *super) { |
229 | 229 | ||
230 | if (!IS_EFS_MAGIC(be32_to_cpu(super->fs_magic))) return -1; | 230 | if (!IS_EFS_MAGIC(be32_to_cpu(super->fs_magic))) |
231 | return -1; | ||
231 | 232 | ||
232 | sb->fs_magic = be32_to_cpu(super->fs_magic); | 233 | sb->fs_magic = be32_to_cpu(super->fs_magic); |
233 | sb->total_blocks = be32_to_cpu(super->fs_size); | 234 | sb->total_blocks = be32_to_cpu(super->fs_size); |
diff --git a/fs/sysv/ChangeLog b/fs/sysv/ChangeLog index 18e3487debd..f403f8b91b8 100644 --- a/fs/sysv/ChangeLog +++ b/fs/sysv/ChangeLog | |||
@@ -54,7 +54,7 @@ Fri Jan 4 2002 Alexander Viro <viro@parcelfarce.linux.theplanet.co.uk> | |||
54 | (sysv_read_super): Likewise. | 54 | (sysv_read_super): Likewise. |
55 | (v7_read_super): Likewise. | 55 | (v7_read_super): Likewise. |
56 | 56 | ||
57 | Sun Dec 30 2001 Manfred Spraul <manfreds@colorfullife.com> | 57 | Sun Dec 30 2001 Manfred Spraul <manfred@colorfullife.com> |
58 | 58 | ||
59 | * dir.c (dir_commit_chunk): Do not set dir->i_version. | 59 | * dir.c (dir_commit_chunk): Do not set dir->i_version. |
60 | (sysv_readdir): Likewise. | 60 | (sysv_readdir): Likewise. |
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 7dcdd0640c3..8d588602010 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c | |||
@@ -497,7 +497,7 @@ xfs_qm_dqflush_all( | |||
497 | int error; | 497 | int error; |
498 | 498 | ||
499 | if (mp->m_quotainfo == NULL) | 499 | if (mp->m_quotainfo == NULL) |
500 | return (0); | 500 | return 0; |
501 | niters = 0; | 501 | niters = 0; |
502 | again: | 502 | again: |
503 | xfs_qm_mplist_lock(mp); | 503 | xfs_qm_mplist_lock(mp); |
@@ -528,7 +528,7 @@ again: | |||
528 | error = xfs_qm_dqflush(dqp, flags); | 528 | error = xfs_qm_dqflush(dqp, flags); |
529 | xfs_dqunlock(dqp); | 529 | xfs_dqunlock(dqp); |
530 | if (error) | 530 | if (error) |
531 | return (error); | 531 | return error; |
532 | 532 | ||
533 | xfs_qm_mplist_lock(mp); | 533 | xfs_qm_mplist_lock(mp); |
534 | if (recl != XFS_QI_MPLRECLAIMS(mp)) { | 534 | if (recl != XFS_QI_MPLRECLAIMS(mp)) { |
@@ -540,7 +540,7 @@ again: | |||
540 | 540 | ||
541 | xfs_qm_mplist_unlock(mp); | 541 | xfs_qm_mplist_unlock(mp); |
542 | /* return ! busy */ | 542 | /* return ! busy */ |
543 | return (0); | 543 | return 0; |
544 | } | 544 | } |
545 | /* | 545 | /* |
546 | * Release the group dquot pointers the user dquots may be | 546 | * Release the group dquot pointers the user dquots may be |
@@ -599,7 +599,7 @@ xfs_qm_dqpurge_int( | |||
599 | int nmisses; | 599 | int nmisses; |
600 | 600 | ||
601 | if (mp->m_quotainfo == NULL) | 601 | if (mp->m_quotainfo == NULL) |
602 | return (0); | 602 | return 0; |
603 | 603 | ||
604 | dqtype = (flags & XFS_QMOPT_UQUOTA) ? XFS_DQ_USER : 0; | 604 | dqtype = (flags & XFS_QMOPT_UQUOTA) ? XFS_DQ_USER : 0; |
605 | dqtype |= (flags & XFS_QMOPT_PQUOTA) ? XFS_DQ_PROJ : 0; | 605 | dqtype |= (flags & XFS_QMOPT_PQUOTA) ? XFS_DQ_PROJ : 0; |
@@ -796,7 +796,7 @@ xfs_qm_dqattach_one( | |||
796 | ASSERT(XFS_DQ_IS_LOCKED(dqp)); | 796 | ASSERT(XFS_DQ_IS_LOCKED(dqp)); |
797 | } | 797 | } |
798 | #endif | 798 | #endif |
799 | return (error); | 799 | return error; |
800 | } | 800 | } |
801 | 801 | ||
802 | 802 | ||
@@ -897,7 +897,7 @@ xfs_qm_dqattach( | |||
897 | (! XFS_NOT_DQATTACHED(mp, ip)) || | 897 | (! XFS_NOT_DQATTACHED(mp, ip)) || |
898 | (ip->i_ino == mp->m_sb.sb_uquotino) || | 898 | (ip->i_ino == mp->m_sb.sb_uquotino) || |
899 | (ip->i_ino == mp->m_sb.sb_gquotino)) | 899 | (ip->i_ino == mp->m_sb.sb_gquotino)) |
900 | return (0); | 900 | return 0; |
901 | 901 | ||
902 | ASSERT((flags & XFS_QMOPT_ILOCKED) == 0 || | 902 | ASSERT((flags & XFS_QMOPT_ILOCKED) == 0 || |
903 | XFS_ISLOCKED_INODE_EXCL(ip)); | 903 | XFS_ISLOCKED_INODE_EXCL(ip)); |
@@ -984,7 +984,7 @@ xfs_qm_dqattach( | |||
984 | else | 984 | else |
985 | ASSERT(XFS_ISLOCKED_INODE_EXCL(ip)); | 985 | ASSERT(XFS_ISLOCKED_INODE_EXCL(ip)); |
986 | #endif | 986 | #endif |
987 | return (error); | 987 | return error; |
988 | } | 988 | } |
989 | 989 | ||
990 | /* | 990 | /* |
@@ -1049,7 +1049,7 @@ xfs_qm_sync( | |||
1049 | */ | 1049 | */ |
1050 | if (! XFS_IS_QUOTA_ON(mp)) { | 1050 | if (! XFS_IS_QUOTA_ON(mp)) { |
1051 | xfs_qm_mplist_unlock(mp); | 1051 | xfs_qm_mplist_unlock(mp); |
1052 | return (0); | 1052 | return 0; |
1053 | } | 1053 | } |
1054 | FOREACH_DQUOT_IN_MP(dqp, mp) { | 1054 | FOREACH_DQUOT_IN_MP(dqp, mp) { |
1055 | /* | 1055 | /* |
@@ -1109,9 +1109,9 @@ xfs_qm_sync( | |||
1109 | error = xfs_qm_dqflush(dqp, flush_flags); | 1109 | error = xfs_qm_dqflush(dqp, flush_flags); |
1110 | xfs_dqunlock(dqp); | 1110 | xfs_dqunlock(dqp); |
1111 | if (error && XFS_FORCED_SHUTDOWN(mp)) | 1111 | if (error && XFS_FORCED_SHUTDOWN(mp)) |
1112 | return(0); /* Need to prevent umount failure */ | 1112 | return 0; /* Need to prevent umount failure */ |
1113 | else if (error) | 1113 | else if (error) |
1114 | return (error); | 1114 | return error; |
1115 | 1115 | ||
1116 | xfs_qm_mplist_lock(mp); | 1116 | xfs_qm_mplist_lock(mp); |
1117 | if (recl != XFS_QI_MPLRECLAIMS(mp)) { | 1117 | if (recl != XFS_QI_MPLRECLAIMS(mp)) { |
@@ -1124,7 +1124,7 @@ xfs_qm_sync( | |||
1124 | } | 1124 | } |
1125 | 1125 | ||
1126 | xfs_qm_mplist_unlock(mp); | 1126 | xfs_qm_mplist_unlock(mp); |
1127 | return (0); | 1127 | return 0; |
1128 | } | 1128 | } |
1129 | 1129 | ||
1130 | 1130 | ||
@@ -1146,7 +1146,7 @@ xfs_qm_init_quotainfo( | |||
1146 | * Tell XQM that we exist as soon as possible. | 1146 | * Tell XQM that we exist as soon as possible. |
1147 | */ | 1147 | */ |
1148 | if ((error = xfs_qm_hold_quotafs_ref(mp))) { | 1148 | if ((error = xfs_qm_hold_quotafs_ref(mp))) { |
1149 | return (error); | 1149 | return error; |
1150 | } | 1150 | } |
1151 | 1151 | ||
1152 | qinf = mp->m_quotainfo = kmem_zalloc(sizeof(xfs_quotainfo_t), KM_SLEEP); | 1152 | qinf = mp->m_quotainfo = kmem_zalloc(sizeof(xfs_quotainfo_t), KM_SLEEP); |
@@ -1158,7 +1158,7 @@ xfs_qm_init_quotainfo( | |||
1158 | if ((error = xfs_qm_init_quotainos(mp))) { | 1158 | if ((error = xfs_qm_init_quotainos(mp))) { |
1159 | kmem_free(qinf, sizeof(xfs_quotainfo_t)); | 1159 | kmem_free(qinf, sizeof(xfs_quotainfo_t)); |
1160 | mp->m_quotainfo = NULL; | 1160 | mp->m_quotainfo = NULL; |
1161 | return (error); | 1161 | return error; |
1162 | } | 1162 | } |
1163 | 1163 | ||
1164 | spinlock_init(&qinf->qi_pinlock, "xfs_qinf_pin"); | 1164 | spinlock_init(&qinf->qi_pinlock, "xfs_qinf_pin"); |
@@ -1232,7 +1232,7 @@ xfs_qm_init_quotainfo( | |||
1232 | qinf->qi_rtbwarnlimit = XFS_QM_RTBWARNLIMIT; | 1232 | qinf->qi_rtbwarnlimit = XFS_QM_RTBWARNLIMIT; |
1233 | } | 1233 | } |
1234 | 1234 | ||
1235 | return (0); | 1235 | return 0; |
1236 | } | 1236 | } |
1237 | 1237 | ||
1238 | 1238 | ||
@@ -1332,7 +1332,7 @@ xfs_qm_dqget_noattach( | |||
1332 | */ | 1332 | */ |
1333 | ASSERT(error != ESRCH); | 1333 | ASSERT(error != ESRCH); |
1334 | ASSERT(error != ENOENT); | 1334 | ASSERT(error != ENOENT); |
1335 | return (error); | 1335 | return error; |
1336 | } | 1336 | } |
1337 | ASSERT(udqp); | 1337 | ASSERT(udqp); |
1338 | } | 1338 | } |
@@ -1355,7 +1355,7 @@ xfs_qm_dqget_noattach( | |||
1355 | xfs_qm_dqrele(udqp); | 1355 | xfs_qm_dqrele(udqp); |
1356 | ASSERT(error != ESRCH); | 1356 | ASSERT(error != ESRCH); |
1357 | ASSERT(error != ENOENT); | 1357 | ASSERT(error != ENOENT); |
1358 | return (error); | 1358 | return error; |
1359 | } | 1359 | } |
1360 | ASSERT(gdqp); | 1360 | ASSERT(gdqp); |
1361 | 1361 | ||
@@ -1376,7 +1376,7 @@ xfs_qm_dqget_noattach( | |||
1376 | if (udqp) ASSERT(XFS_DQ_IS_LOCKED(udqp)); | 1376 | if (udqp) ASSERT(XFS_DQ_IS_LOCKED(udqp)); |
1377 | if (gdqp) ASSERT(XFS_DQ_IS_LOCKED(gdqp)); | 1377 | if (gdqp) ASSERT(XFS_DQ_IS_LOCKED(gdqp)); |
1378 | #endif | 1378 | #endif |
1379 | return (0); | 1379 | return 0; |
1380 | } | 1380 | } |
1381 | 1381 | ||
1382 | /* | 1382 | /* |
@@ -1404,7 +1404,7 @@ xfs_qm_qino_alloc( | |||
1404 | XFS_TRANS_PERM_LOG_RES, | 1404 | XFS_TRANS_PERM_LOG_RES, |
1405 | XFS_CREATE_LOG_COUNT))) { | 1405 | XFS_CREATE_LOG_COUNT))) { |
1406 | xfs_trans_cancel(tp, 0); | 1406 | xfs_trans_cancel(tp, 0); |
1407 | return (error); | 1407 | return error; |
1408 | } | 1408 | } |
1409 | memset(&zerocr, 0, sizeof(zerocr)); | 1409 | memset(&zerocr, 0, sizeof(zerocr)); |
1410 | memset(&zeroino, 0, sizeof(zeroino)); | 1410 | memset(&zeroino, 0, sizeof(zeroino)); |
@@ -1413,7 +1413,7 @@ xfs_qm_qino_alloc( | |||
1413 | &zerocr, 0, 1, ip, &committed))) { | 1413 | &zerocr, 0, 1, ip, &committed))) { |
1414 | xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES | | 1414 | xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES | |
1415 | XFS_TRANS_ABORT); | 1415 | XFS_TRANS_ABORT); |
1416 | return (error); | 1416 | return error; |
1417 | } | 1417 | } |
1418 | 1418 | ||
1419 | /* | 1419 | /* |
@@ -1461,9 +1461,9 @@ xfs_qm_qino_alloc( | |||
1461 | if ((error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, | 1461 | if ((error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, |
1462 | NULL))) { | 1462 | NULL))) { |
1463 | xfs_fs_cmn_err(CE_ALERT, mp, "XFS qino_alloc failed!"); | 1463 | xfs_fs_cmn_err(CE_ALERT, mp, "XFS qino_alloc failed!"); |
1464 | return (error); | 1464 | return error; |
1465 | } | 1465 | } |
1466 | return (0); | 1466 | return 0; |
1467 | } | 1467 | } |
1468 | 1468 | ||
1469 | 1469 | ||
@@ -1508,7 +1508,7 @@ xfs_qm_reset_dqcounts( | |||
1508 | ddq = (xfs_disk_dquot_t *) ((xfs_dqblk_t *)ddq + 1); | 1508 | ddq = (xfs_disk_dquot_t *) ((xfs_dqblk_t *)ddq + 1); |
1509 | } | 1509 | } |
1510 | 1510 | ||
1511 | return (0); | 1511 | return 0; |
1512 | } | 1512 | } |
1513 | 1513 | ||
1514 | STATIC int | 1514 | STATIC int |
@@ -1557,7 +1557,7 @@ xfs_qm_dqiter_bufs( | |||
1557 | bno++; | 1557 | bno++; |
1558 | firstid += XFS_QM_DQPERBLK(mp); | 1558 | firstid += XFS_QM_DQPERBLK(mp); |
1559 | } | 1559 | } |
1560 | return (error); | 1560 | return error; |
1561 | } | 1561 | } |
1562 | 1562 | ||
1563 | /* | 1563 | /* |
@@ -1586,7 +1586,7 @@ xfs_qm_dqiterate( | |||
1586 | * happens only at mount time which is single threaded. | 1586 | * happens only at mount time which is single threaded. |
1587 | */ | 1587 | */ |
1588 | if (qip->i_d.di_nblocks == 0) | 1588 | if (qip->i_d.di_nblocks == 0) |
1589 | return (0); | 1589 | return 0; |
1590 | 1590 | ||
1591 | map = kmem_alloc(XFS_DQITER_MAP_SIZE * sizeof(*map), KM_SLEEP); | 1591 | map = kmem_alloc(XFS_DQITER_MAP_SIZE * sizeof(*map), KM_SLEEP); |
1592 | 1592 | ||
@@ -1655,7 +1655,7 @@ xfs_qm_dqiterate( | |||
1655 | 1655 | ||
1656 | kmem_free(map, XFS_DQITER_MAP_SIZE * sizeof(*map)); | 1656 | kmem_free(map, XFS_DQITER_MAP_SIZE * sizeof(*map)); |
1657 | 1657 | ||
1658 | return (error); | 1658 | return error; |
1659 | } | 1659 | } |
1660 | 1660 | ||
1661 | /* | 1661 | /* |
@@ -1715,7 +1715,7 @@ xfs_qm_get_rtblks( | |||
1715 | ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK); | 1715 | ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK); |
1716 | if (!(ifp->if_flags & XFS_IFEXTENTS)) { | 1716 | if (!(ifp->if_flags & XFS_IFEXTENTS)) { |
1717 | if ((error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK))) | 1717 | if ((error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK))) |
1718 | return (error); | 1718 | return error; |
1719 | } | 1719 | } |
1720 | rtblks = 0; | 1720 | rtblks = 0; |
1721 | nextents = ifp->if_bytes / sizeof(xfs_bmbt_rec_t); | 1721 | nextents = ifp->if_bytes / sizeof(xfs_bmbt_rec_t); |
@@ -1723,7 +1723,7 @@ xfs_qm_get_rtblks( | |||
1723 | for (ep = base; ep < &base[nextents]; ep++) | 1723 | for (ep = base; ep < &base[nextents]; ep++) |
1724 | rtblks += xfs_bmbt_get_blockcount(ep); | 1724 | rtblks += xfs_bmbt_get_blockcount(ep); |
1725 | *O_rtblks = (xfs_qcnt_t)rtblks; | 1725 | *O_rtblks = (xfs_qcnt_t)rtblks; |
1726 | return (0); | 1726 | return 0; |
1727 | } | 1727 | } |
1728 | 1728 | ||
1729 | /* | 1729 | /* |
@@ -1767,7 +1767,7 @@ xfs_qm_dqusage_adjust( | |||
1767 | */ | 1767 | */ |
1768 | if ((error = xfs_iget(mp, NULL, ino, 0, XFS_ILOCK_EXCL, &ip, bno))) { | 1768 | if ((error = xfs_iget(mp, NULL, ino, 0, XFS_ILOCK_EXCL, &ip, bno))) { |
1769 | *res = BULKSTAT_RV_NOTHING; | 1769 | *res = BULKSTAT_RV_NOTHING; |
1770 | return (error); | 1770 | return error; |
1771 | } | 1771 | } |
1772 | 1772 | ||
1773 | if (ip->i_d.di_mode == 0) { | 1773 | if (ip->i_d.di_mode == 0) { |
@@ -1785,7 +1785,7 @@ xfs_qm_dqusage_adjust( | |||
1785 | if ((error = xfs_qm_dqget_noattach(ip, &udqp, &gdqp))) { | 1785 | if ((error = xfs_qm_dqget_noattach(ip, &udqp, &gdqp))) { |
1786 | xfs_iput(ip, XFS_ILOCK_EXCL); | 1786 | xfs_iput(ip, XFS_ILOCK_EXCL); |
1787 | *res = BULKSTAT_RV_GIVEUP; | 1787 | *res = BULKSTAT_RV_GIVEUP; |
1788 | return (error); | 1788 | return error; |
1789 | } | 1789 | } |
1790 | 1790 | ||
1791 | rtblks = 0; | 1791 | rtblks = 0; |
@@ -1802,7 +1802,7 @@ xfs_qm_dqusage_adjust( | |||
1802 | if (gdqp) | 1802 | if (gdqp) |
1803 | xfs_qm_dqput(gdqp); | 1803 | xfs_qm_dqput(gdqp); |
1804 | *res = BULKSTAT_RV_GIVEUP; | 1804 | *res = BULKSTAT_RV_GIVEUP; |
1805 | return (error); | 1805 | return error; |
1806 | } | 1806 | } |
1807 | nblks = (xfs_qcnt_t)ip->i_d.di_nblocks - rtblks; | 1807 | nblks = (xfs_qcnt_t)ip->i_d.di_nblocks - rtblks; |
1808 | } | 1808 | } |
@@ -1847,7 +1847,7 @@ xfs_qm_dqusage_adjust( | |||
1847 | * Goto next inode. | 1847 | * Goto next inode. |
1848 | */ | 1848 | */ |
1849 | *res = BULKSTAT_RV_DIDONE; | 1849 | *res = BULKSTAT_RV_DIDONE; |
1850 | return (0); | 1850 | return 0; |
1851 | } | 1851 | } |
1852 | 1852 | ||
1853 | /* | 1853 | /* |
@@ -2041,7 +2041,7 @@ xfs_qm_init_quotainos( | |||
2041 | XFS_QI_UQIP(mp) = uip; | 2041 | XFS_QI_UQIP(mp) = uip; |
2042 | XFS_QI_GQIP(mp) = gip; | 2042 | XFS_QI_GQIP(mp) = gip; |
2043 | 2043 | ||
2044 | return (0); | 2044 | return 0; |
2045 | } | 2045 | } |
2046 | 2046 | ||
2047 | 2047 | ||
@@ -2062,7 +2062,7 @@ xfs_qm_shake_freelist( | |||
2062 | int nflushes; | 2062 | int nflushes; |
2063 | 2063 | ||
2064 | if (howmany <= 0) | 2064 | if (howmany <= 0) |
2065 | return (0); | 2065 | return 0; |
2066 | 2066 | ||
2067 | nreclaimed = 0; | 2067 | nreclaimed = 0; |
2068 | restarts = 0; | 2068 | restarts = 0; |
@@ -2088,7 +2088,7 @@ xfs_qm_shake_freelist( | |||
2088 | xfs_dqunlock(dqp); | 2088 | xfs_dqunlock(dqp); |
2089 | xfs_qm_freelist_unlock(xfs_Gqm); | 2089 | xfs_qm_freelist_unlock(xfs_Gqm); |
2090 | if (++restarts >= XFS_QM_RECLAIM_MAX_RESTARTS) | 2090 | if (++restarts >= XFS_QM_RECLAIM_MAX_RESTARTS) |
2091 | return (nreclaimed); | 2091 | return nreclaimed; |
2092 | XQM_STATS_INC(xqmstats.xs_qm_dqwants); | 2092 | XQM_STATS_INC(xqmstats.xs_qm_dqwants); |
2093 | goto tryagain; | 2093 | goto tryagain; |
2094 | } | 2094 | } |
@@ -2163,7 +2163,7 @@ xfs_qm_shake_freelist( | |||
2163 | XFS_DQ_HASH_UNLOCK(hash); | 2163 | XFS_DQ_HASH_UNLOCK(hash); |
2164 | xfs_qm_freelist_unlock(xfs_Gqm); | 2164 | xfs_qm_freelist_unlock(xfs_Gqm); |
2165 | if (++restarts >= XFS_QM_RECLAIM_MAX_RESTARTS) | 2165 | if (++restarts >= XFS_QM_RECLAIM_MAX_RESTARTS) |
2166 | return (nreclaimed); | 2166 | return nreclaimed; |
2167 | goto tryagain; | 2167 | goto tryagain; |
2168 | } | 2168 | } |
2169 | xfs_dqtrace_entry(dqp, "DQSHAKE: UNLINKING"); | 2169 | xfs_dqtrace_entry(dqp, "DQSHAKE: UNLINKING"); |
@@ -2188,7 +2188,7 @@ xfs_qm_shake_freelist( | |||
2188 | dqp = nextdqp; | 2188 | dqp = nextdqp; |
2189 | } | 2189 | } |
2190 | xfs_qm_freelist_unlock(xfs_Gqm); | 2190 | xfs_qm_freelist_unlock(xfs_Gqm); |
2191 | return (nreclaimed); | 2191 | return nreclaimed; |
2192 | } | 2192 | } |
2193 | 2193 | ||
2194 | 2194 | ||
@@ -2202,9 +2202,9 @@ xfs_qm_shake(int nr_to_scan, gfp_t gfp_mask) | |||
2202 | int ndqused, nfree, n; | 2202 | int ndqused, nfree, n; |
2203 | 2203 | ||
2204 | if (!kmem_shake_allow(gfp_mask)) | 2204 | if (!kmem_shake_allow(gfp_mask)) |
2205 | return (0); | 2205 | return 0; |
2206 | if (!xfs_Gqm) | 2206 | if (!xfs_Gqm) |
2207 | return (0); | 2207 | return 0; |
2208 | 2208 | ||
2209 | nfree = xfs_Gqm->qm_dqfreelist.qh_nelems; /* free dquots */ | 2209 | nfree = xfs_Gqm->qm_dqfreelist.qh_nelems; /* free dquots */ |
2210 | /* incore dquots in all f/s's */ | 2210 | /* incore dquots in all f/s's */ |
@@ -2213,7 +2213,7 @@ xfs_qm_shake(int nr_to_scan, gfp_t gfp_mask) | |||
2213 | ASSERT(ndqused >= 0); | 2213 | ASSERT(ndqused >= 0); |
2214 | 2214 | ||
2215 | if (nfree <= ndqused && nfree < ndquot) | 2215 | if (nfree <= ndqused && nfree < ndquot) |
2216 | return (0); | 2216 | return 0; |
2217 | 2217 | ||
2218 | ndqused *= xfs_Gqm->qm_dqfree_ratio; /* target # of free dquots */ | 2218 | ndqused *= xfs_Gqm->qm_dqfree_ratio; /* target # of free dquots */ |
2219 | n = nfree - ndqused - ndquot; /* # over target */ | 2219 | n = nfree - ndqused - ndquot; /* # over target */ |
@@ -2257,7 +2257,7 @@ xfs_qm_dqreclaim_one(void) | |||
2257 | xfs_dqunlock(dqp); | 2257 | xfs_dqunlock(dqp); |
2258 | xfs_qm_freelist_unlock(xfs_Gqm); | 2258 | xfs_qm_freelist_unlock(xfs_Gqm); |
2259 | if (++restarts >= XFS_QM_RECLAIM_MAX_RESTARTS) | 2259 | if (++restarts >= XFS_QM_RECLAIM_MAX_RESTARTS) |
2260 | return (NULL); | 2260 | return NULL; |
2261 | XQM_STATS_INC(xqmstats.xs_qm_dqwants); | 2261 | XQM_STATS_INC(xqmstats.xs_qm_dqwants); |
2262 | goto startagain; | 2262 | goto startagain; |
2263 | } | 2263 | } |
@@ -2333,7 +2333,7 @@ xfs_qm_dqreclaim_one(void) | |||
2333 | } | 2333 | } |
2334 | 2334 | ||
2335 | xfs_qm_freelist_unlock(xfs_Gqm); | 2335 | xfs_qm_freelist_unlock(xfs_Gqm); |
2336 | return (dqpout); | 2336 | return dqpout; |
2337 | } | 2337 | } |
2338 | 2338 | ||
2339 | 2339 | ||
@@ -2369,7 +2369,7 @@ xfs_qm_dqalloc_incore( | |||
2369 | */ | 2369 | */ |
2370 | memset(&dqp->q_core, 0, sizeof(dqp->q_core)); | 2370 | memset(&dqp->q_core, 0, sizeof(dqp->q_core)); |
2371 | *O_dqpp = dqp; | 2371 | *O_dqpp = dqp; |
2372 | return (B_FALSE); | 2372 | return B_FALSE; |
2373 | } | 2373 | } |
2374 | XQM_STATS_INC(xqmstats.xs_qm_dqreclaim_misses); | 2374 | XQM_STATS_INC(xqmstats.xs_qm_dqreclaim_misses); |
2375 | } | 2375 | } |
@@ -2382,7 +2382,7 @@ xfs_qm_dqalloc_incore( | |||
2382 | *O_dqpp = kmem_zone_zalloc(xfs_Gqm->qm_dqzone, KM_SLEEP); | 2382 | *O_dqpp = kmem_zone_zalloc(xfs_Gqm->qm_dqzone, KM_SLEEP); |
2383 | atomic_inc(&xfs_Gqm->qm_totaldquots); | 2383 | atomic_inc(&xfs_Gqm->qm_totaldquots); |
2384 | 2384 | ||
2385 | return (B_TRUE); | 2385 | return B_TRUE; |
2386 | } | 2386 | } |
2387 | 2387 | ||
2388 | 2388 | ||
@@ -2407,13 +2407,13 @@ xfs_qm_write_sb_changes( | |||
2407 | 0, | 2407 | 0, |
2408 | XFS_DEFAULT_LOG_COUNT))) { | 2408 | XFS_DEFAULT_LOG_COUNT))) { |
2409 | xfs_trans_cancel(tp, 0); | 2409 | xfs_trans_cancel(tp, 0); |
2410 | return (error); | 2410 | return error; |
2411 | } | 2411 | } |
2412 | 2412 | ||
2413 | xfs_mod_sb(tp, flags); | 2413 | xfs_mod_sb(tp, flags); |
2414 | (void) xfs_trans_commit(tp, 0, NULL); | 2414 | (void) xfs_trans_commit(tp, 0, NULL); |
2415 | 2415 | ||
2416 | return (0); | 2416 | return 0; |
2417 | } | 2417 | } |
2418 | 2418 | ||
2419 | 2419 | ||
@@ -2463,7 +2463,7 @@ xfs_qm_vop_dqalloc( | |||
2463 | if ((error = xfs_qm_dqattach(ip, XFS_QMOPT_DQALLOC | | 2463 | if ((error = xfs_qm_dqattach(ip, XFS_QMOPT_DQALLOC | |
2464 | XFS_QMOPT_ILOCKED))) { | 2464 | XFS_QMOPT_ILOCKED))) { |
2465 | xfs_iunlock(ip, lockflags); | 2465 | xfs_iunlock(ip, lockflags); |
2466 | return (error); | 2466 | return error; |
2467 | } | 2467 | } |
2468 | } | 2468 | } |
2469 | 2469 | ||
@@ -2486,7 +2486,7 @@ xfs_qm_vop_dqalloc( | |||
2486 | XFS_QMOPT_DOWARN, | 2486 | XFS_QMOPT_DOWARN, |
2487 | &uq))) { | 2487 | &uq))) { |
2488 | ASSERT(error != ENOENT); | 2488 | ASSERT(error != ENOENT); |
2489 | return (error); | 2489 | return error; |
2490 | } | 2490 | } |
2491 | /* | 2491 | /* |
2492 | * Get the ilock in the right order. | 2492 | * Get the ilock in the right order. |
@@ -2517,7 +2517,7 @@ xfs_qm_vop_dqalloc( | |||
2517 | if (uq) | 2517 | if (uq) |
2518 | xfs_qm_dqrele(uq); | 2518 | xfs_qm_dqrele(uq); |
2519 | ASSERT(error != ENOENT); | 2519 | ASSERT(error != ENOENT); |
2520 | return (error); | 2520 | return error; |
2521 | } | 2521 | } |
2522 | xfs_dqunlock(gq); | 2522 | xfs_dqunlock(gq); |
2523 | lockflags = XFS_ILOCK_SHARED; | 2523 | lockflags = XFS_ILOCK_SHARED; |
@@ -2565,7 +2565,7 @@ xfs_qm_vop_dqalloc( | |||
2565 | *O_gdqpp = gq; | 2565 | *O_gdqpp = gq; |
2566 | else if (gq) | 2566 | else if (gq) |
2567 | xfs_qm_dqrele(gq); | 2567 | xfs_qm_dqrele(gq); |
2568 | return (0); | 2568 | return 0; |
2569 | } | 2569 | } |
2570 | 2570 | ||
2571 | /* | 2571 | /* |
@@ -2608,7 +2608,7 @@ xfs_qm_vop_chown( | |||
2608 | xfs_dqunlock(newdq); | 2608 | xfs_dqunlock(newdq); |
2609 | *IO_olddq = newdq; | 2609 | *IO_olddq = newdq; |
2610 | 2610 | ||
2611 | return (prevdq); | 2611 | return prevdq; |
2612 | } | 2612 | } |
2613 | 2613 | ||
2614 | /* | 2614 | /* |
@@ -2702,12 +2702,12 @@ xfs_qm_vop_rename_dqattach( | |||
2702 | ip = i_tab[0]; | 2702 | ip = i_tab[0]; |
2703 | 2703 | ||
2704 | if (! XFS_IS_QUOTA_ON(ip->i_mount)) | 2704 | if (! XFS_IS_QUOTA_ON(ip->i_mount)) |
2705 | return (0); | 2705 | return 0; |
2706 | 2706 | ||
2707 | if (XFS_NOT_DQATTACHED(ip->i_mount, ip)) { | 2707 | if (XFS_NOT_DQATTACHED(ip->i_mount, ip)) { |
2708 | error = xfs_qm_dqattach(ip, 0); | 2708 | error = xfs_qm_dqattach(ip, 0); |
2709 | if (error) | 2709 | if (error) |
2710 | return (error); | 2710 | return error; |
2711 | } | 2711 | } |
2712 | for (i = 1; (i < 4 && i_tab[i]); i++) { | 2712 | for (i = 1; (i < 4 && i_tab[i]); i++) { |
2713 | /* | 2713 | /* |
@@ -2717,11 +2717,11 @@ xfs_qm_vop_rename_dqattach( | |||
2717 | if (XFS_NOT_DQATTACHED(ip->i_mount, ip)) { | 2717 | if (XFS_NOT_DQATTACHED(ip->i_mount, ip)) { |
2718 | error = xfs_qm_dqattach(ip, 0); | 2718 | error = xfs_qm_dqattach(ip, 0); |
2719 | if (error) | 2719 | if (error) |
2720 | return (error); | 2720 | return error; |
2721 | } | 2721 | } |
2722 | } | 2722 | } |
2723 | } | 2723 | } |
2724 | return (0); | 2724 | return 0; |
2725 | } | 2725 | } |
2726 | 2726 | ||
2727 | void | 2727 | void |
@@ -2834,7 +2834,7 @@ xfs_qm_dqhashlock_nowait( | |||
2834 | int locked; | 2834 | int locked; |
2835 | 2835 | ||
2836 | locked = mutex_trylock(&((dqp)->q_hash->qh_lock)); | 2836 | locked = mutex_trylock(&((dqp)->q_hash->qh_lock)); |
2837 | return (locked); | 2837 | return locked; |
2838 | } | 2838 | } |
2839 | 2839 | ||
2840 | int | 2840 | int |
@@ -2844,7 +2844,7 @@ xfs_qm_freelist_lock_nowait( | |||
2844 | int locked; | 2844 | int locked; |
2845 | 2845 | ||
2846 | locked = mutex_trylock(&(xqm->qm_dqfreelist.qh_lock)); | 2846 | locked = mutex_trylock(&(xqm->qm_dqfreelist.qh_lock)); |
2847 | return (locked); | 2847 | return locked; |
2848 | } | 2848 | } |
2849 | 2849 | ||
2850 | STATIC int | 2850 | STATIC int |
@@ -2855,5 +2855,5 @@ xfs_qm_mplist_nowait( | |||
2855 | 2855 | ||
2856 | ASSERT(mp->m_quotainfo); | 2856 | ASSERT(mp->m_quotainfo); |
2857 | locked = mutex_trylock(&(XFS_QI_MPLLOCK(mp))); | 2857 | locked = mutex_trylock(&(XFS_QI_MPLLOCK(mp))); |
2858 | return (locked); | 2858 | return locked; |
2859 | } | 2859 | } |
diff --git a/fs/xfs/xfs_dir_leaf.c b/fs/xfs/xfs_dir_leaf.c index 950df31efc4..e83074016ab 100644 --- a/fs/xfs/xfs_dir_leaf.c +++ b/fs/xfs/xfs_dir_leaf.c | |||
@@ -147,7 +147,7 @@ xfs_dir_shortform_create(xfs_da_args_t *args, xfs_ino_t parent) | |||
147 | hdr->count = 0; | 147 | hdr->count = 0; |
148 | dp->i_d.di_size = sizeof(*hdr); | 148 | dp->i_d.di_size = sizeof(*hdr); |
149 | xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA); | 149 | xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA); |
150 | return(0); | 150 | return 0; |
151 | } | 151 | } |
152 | 152 | ||
153 | /* | 153 | /* |
@@ -180,7 +180,7 @@ xfs_dir_shortform_addname(xfs_da_args_t *args) | |||
180 | if (sfe->namelen == args->namelen && | 180 | if (sfe->namelen == args->namelen && |
181 | args->name[0] == sfe->name[0] && | 181 | args->name[0] == sfe->name[0] && |
182 | memcmp(args->name, sfe->name, args->namelen) == 0) | 182 | memcmp(args->name, sfe->name, args->namelen) == 0) |
183 | return(XFS_ERROR(EEXIST)); | 183 | return XFS_ERROR(EEXIST); |
184 | sfe = XFS_DIR_SF_NEXTENTRY(sfe); | 184 | sfe = XFS_DIR_SF_NEXTENTRY(sfe); |
185 | } | 185 | } |
186 | 186 | ||
@@ -198,7 +198,7 @@ xfs_dir_shortform_addname(xfs_da_args_t *args) | |||
198 | dp->i_d.di_size += size; | 198 | dp->i_d.di_size += size; |
199 | xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA); | 199 | xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA); |
200 | 200 | ||
201 | return(0); | 201 | return 0; |
202 | } | 202 | } |
203 | 203 | ||
204 | /* | 204 | /* |
@@ -238,7 +238,7 @@ xfs_dir_shortform_removename(xfs_da_args_t *args) | |||
238 | } | 238 | } |
239 | if (i < 0) { | 239 | if (i < 0) { |
240 | ASSERT(args->oknoent); | 240 | ASSERT(args->oknoent); |
241 | return(XFS_ERROR(ENOENT)); | 241 | return XFS_ERROR(ENOENT); |
242 | } | 242 | } |
243 | 243 | ||
244 | if ((base + size) != dp->i_d.di_size) { | 244 | if ((base + size) != dp->i_d.di_size) { |
@@ -251,7 +251,7 @@ xfs_dir_shortform_removename(xfs_da_args_t *args) | |||
251 | dp->i_d.di_size -= size; | 251 | dp->i_d.di_size -= size; |
252 | xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA); | 252 | xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA); |
253 | 253 | ||
254 | return(0); | 254 | return 0; |
255 | } | 255 | } |
256 | 256 | ||
257 | /* | 257 | /* |
@@ -390,7 +390,7 @@ xfs_dir_shortform_to_leaf(xfs_da_args_t *iargs) | |||
390 | 390 | ||
391 | out: | 391 | out: |
392 | kmem_free(tmpbuffer, size); | 392 | kmem_free(tmpbuffer, size); |
393 | return(retval); | 393 | return retval; |
394 | } | 394 | } |
395 | 395 | ||
396 | STATIC int | 396 | STATIC int |
@@ -596,7 +596,7 @@ xfs_dir_shortform_replace(xfs_da_args_t *args) | |||
596 | /* XXX - replace assert? */ | 596 | /* XXX - replace assert? */ |
597 | XFS_DIR_SF_PUT_DIRINO(&args->inumber, &sf->hdr.parent); | 597 | XFS_DIR_SF_PUT_DIRINO(&args->inumber, &sf->hdr.parent); |
598 | xfs_trans_log_inode(args->trans, dp, XFS_ILOG_DDATA); | 598 | xfs_trans_log_inode(args->trans, dp, XFS_ILOG_DDATA); |
599 | return(0); | 599 | return 0; |
600 | } | 600 | } |
601 | ASSERT(args->namelen != 1 || args->name[0] != '.'); | 601 | ASSERT(args->namelen != 1 || args->name[0] != '.'); |
602 | sfe = &sf->list[0]; | 602 | sfe = &sf->list[0]; |
@@ -608,12 +608,12 @@ xfs_dir_shortform_replace(xfs_da_args_t *args) | |||
608 | (char *)&sfe->inumber, sizeof(xfs_ino_t))); | 608 | (char *)&sfe->inumber, sizeof(xfs_ino_t))); |
609 | XFS_DIR_SF_PUT_DIRINO(&args->inumber, &sfe->inumber); | 609 | XFS_DIR_SF_PUT_DIRINO(&args->inumber, &sfe->inumber); |
610 | xfs_trans_log_inode(args->trans, dp, XFS_ILOG_DDATA); | 610 | xfs_trans_log_inode(args->trans, dp, XFS_ILOG_DDATA); |
611 | return(0); | 611 | return 0; |
612 | } | 612 | } |
613 | sfe = XFS_DIR_SF_NEXTENTRY(sfe); | 613 | sfe = XFS_DIR_SF_NEXTENTRY(sfe); |
614 | } | 614 | } |
615 | ASSERT(args->oknoent); | 615 | ASSERT(args->oknoent); |
616 | return(XFS_ERROR(ENOENT)); | 616 | return XFS_ERROR(ENOENT); |
617 | } | 617 | } |
618 | 618 | ||
619 | /* | 619 | /* |
@@ -695,7 +695,7 @@ xfs_dir_leaf_to_shortform(xfs_da_args_t *iargs) | |||
695 | 695 | ||
696 | out: | 696 | out: |
697 | kmem_free(tmpbuffer, XFS_LBSIZE(dp->i_mount)); | 697 | kmem_free(tmpbuffer, XFS_LBSIZE(dp->i_mount)); |
698 | return(retval); | 698 | return retval; |
699 | } | 699 | } |
700 | 700 | ||
701 | /* | 701 | /* |
@@ -715,17 +715,17 @@ xfs_dir_leaf_to_node(xfs_da_args_t *args) | |||
715 | retval = xfs_da_grow_inode(args, &blkno); | 715 | retval = xfs_da_grow_inode(args, &blkno); |
716 | ASSERT(blkno == 1); | 716 | ASSERT(blkno == 1); |
717 | if (retval) | 717 | if (retval) |
718 | return(retval); | 718 | return retval; |
719 | retval = xfs_da_read_buf(args->trans, args->dp, 0, -1, &bp1, | 719 | retval = xfs_da_read_buf(args->trans, args->dp, 0, -1, &bp1, |
720 | XFS_DATA_FORK); | 720 | XFS_DATA_FORK); |
721 | if (retval) | 721 | if (retval) |
722 | return(retval); | 722 | return retval; |
723 | ASSERT(bp1 != NULL); | 723 | ASSERT(bp1 != NULL); |
724 | retval = xfs_da_get_buf(args->trans, args->dp, 1, -1, &bp2, | 724 | retval = xfs_da_get_buf(args->trans, args->dp, 1, -1, &bp2, |
725 | XFS_DATA_FORK); | 725 | XFS_DATA_FORK); |
726 | if (retval) { | 726 | if (retval) { |
727 | xfs_da_buf_done(bp1); | 727 | xfs_da_buf_done(bp1); |
728 | return(retval); | 728 | return retval; |
729 | } | 729 | } |
730 | ASSERT(bp2 != NULL); | 730 | ASSERT(bp2 != NULL); |
731 | memcpy(bp2->data, bp1->data, XFS_LBSIZE(dp->i_mount)); | 731 | memcpy(bp2->data, bp1->data, XFS_LBSIZE(dp->i_mount)); |
@@ -738,7 +738,7 @@ xfs_dir_leaf_to_node(xfs_da_args_t *args) | |||
738 | retval = xfs_da_node_create(args, 0, 1, &bp1, XFS_DATA_FORK); | 738 | retval = xfs_da_node_create(args, 0, 1, &bp1, XFS_DATA_FORK); |
739 | if (retval) { | 739 | if (retval) { |
740 | xfs_da_buf_done(bp2); | 740 | xfs_da_buf_done(bp2); |
741 | return(retval); | 741 | return retval; |
742 | } | 742 | } |
743 | node = bp1->data; | 743 | node = bp1->data; |
744 | leaf = bp2->data; | 744 | leaf = bp2->data; |
@@ -751,7 +751,7 @@ xfs_dir_leaf_to_node(xfs_da_args_t *args) | |||
751 | XFS_DA_LOGRANGE(node, &node->btree[0], sizeof(node->btree[0]))); | 751 | XFS_DA_LOGRANGE(node, &node->btree[0], sizeof(node->btree[0]))); |
752 | xfs_da_buf_done(bp1); | 752 | xfs_da_buf_done(bp1); |
753 | 753 | ||
754 | return(retval); | 754 | return retval; |
755 | } | 755 | } |
756 | 756 | ||
757 | 757 | ||
@@ -776,7 +776,7 @@ xfs_dir_leaf_create(xfs_da_args_t *args, xfs_dablk_t blkno, xfs_dabuf_t **bpp) | |||
776 | ASSERT(dp != NULL); | 776 | ASSERT(dp != NULL); |
777 | retval = xfs_da_get_buf(args->trans, dp, blkno, -1, &bp, XFS_DATA_FORK); | 777 | retval = xfs_da_get_buf(args->trans, dp, blkno, -1, &bp, XFS_DATA_FORK); |
778 | if (retval) | 778 | if (retval) |
779 | return(retval); | 779 | return retval; |
780 | ASSERT(bp != NULL); | 780 | ASSERT(bp != NULL); |
781 | leaf = bp->data; | 781 | leaf = bp->data; |
782 | memset((char *)leaf, 0, XFS_LBSIZE(dp->i_mount)); | 782 | memset((char *)leaf, 0, XFS_LBSIZE(dp->i_mount)); |
@@ -791,7 +791,7 @@ xfs_dir_leaf_create(xfs_da_args_t *args, xfs_dablk_t blkno, xfs_dabuf_t **bpp) | |||
791 | xfs_da_log_buf(args->trans, bp, 0, XFS_LBSIZE(dp->i_mount) - 1); | 791 | xfs_da_log_buf(args->trans, bp, 0, XFS_LBSIZE(dp->i_mount) - 1); |
792 | 792 | ||
793 | *bpp = bp; | 793 | *bpp = bp; |
794 | return(0); | 794 | return 0; |
795 | } | 795 | } |
796 | 796 | ||
797 | /* | 797 | /* |
@@ -813,10 +813,10 @@ xfs_dir_leaf_split(xfs_da_state_t *state, xfs_da_state_blk_t *oldblk, | |||
813 | ASSERT(oldblk->magic == XFS_DIR_LEAF_MAGIC); | 813 | ASSERT(oldblk->magic == XFS_DIR_LEAF_MAGIC); |
814 | error = xfs_da_grow_inode(args, &blkno); | 814 | error = xfs_da_grow_inode(args, &blkno); |
815 | if (error) | 815 | if (error) |
816 | return(error); | 816 | return error; |
817 | error = xfs_dir_leaf_create(args, blkno, &newblk->bp); | 817 | error = xfs_dir_leaf_create(args, blkno, &newblk->bp); |
818 | if (error) | 818 | if (error) |
819 | return(error); | 819 | return error; |
820 | newblk->blkno = blkno; | 820 | newblk->blkno = blkno; |
821 | newblk->magic = XFS_DIR_LEAF_MAGIC; | 821 | newblk->magic = XFS_DIR_LEAF_MAGIC; |
822 | 822 | ||
@@ -826,7 +826,7 @@ xfs_dir_leaf_split(xfs_da_state_t *state, xfs_da_state_blk_t *oldblk, | |||
826 | xfs_dir_leaf_rebalance(state, oldblk, newblk); | 826 | xfs_dir_leaf_rebalance(state, oldblk, newblk); |
827 | error = xfs_da_blk_link(state, oldblk, newblk); | 827 | error = xfs_da_blk_link(state, oldblk, newblk); |
828 | if (error) | 828 | if (error) |
829 | return(error); | 829 | return error; |
830 | 830 | ||
831 | /* | 831 | /* |
832 | * Insert the new entry in the correct block. | 832 | * Insert the new entry in the correct block. |
@@ -842,7 +842,7 @@ xfs_dir_leaf_split(xfs_da_state_t *state, xfs_da_state_blk_t *oldblk, | |||
842 | */ | 842 | */ |
843 | oldblk->hashval = xfs_dir_leaf_lasthash(oldblk->bp, NULL); | 843 | oldblk->hashval = xfs_dir_leaf_lasthash(oldblk->bp, NULL); |
844 | newblk->hashval = xfs_dir_leaf_lasthash(newblk->bp, NULL); | 844 | newblk->hashval = xfs_dir_leaf_lasthash(newblk->bp, NULL); |
845 | return(error); | 845 | return error; |
846 | } | 846 | } |
847 | 847 | ||
848 | /* | 848 | /* |
@@ -885,7 +885,7 @@ xfs_dir_leaf_add(xfs_dabuf_t *bp, xfs_da_args_t *args, int index) | |||
885 | if (INT_GET(map->size, ARCH_CONVERT) >= tmp) { | 885 | if (INT_GET(map->size, ARCH_CONVERT) >= tmp) { |
886 | if (!args->justcheck) | 886 | if (!args->justcheck) |
887 | xfs_dir_leaf_add_work(bp, args, index, i); | 887 | xfs_dir_leaf_add_work(bp, args, index, i); |
888 | return(0); | 888 | return 0; |
889 | } | 889 | } |
890 | sum += INT_GET(map->size, ARCH_CONVERT); | 890 | sum += INT_GET(map->size, ARCH_CONVERT); |
891 | } | 891 | } |
@@ -896,7 +896,7 @@ xfs_dir_leaf_add(xfs_dabuf_t *bp, xfs_da_args_t *args, int index) | |||
896 | * no good and we should just give up. | 896 | * no good and we should just give up. |
897 | */ | 897 | */ |
898 | if (!hdr->holes && (sum < entsize)) | 898 | if (!hdr->holes && (sum < entsize)) |
899 | return(XFS_ERROR(ENOSPC)); | 899 | return XFS_ERROR(ENOSPC); |
900 | 900 | ||
901 | /* | 901 | /* |
902 | * Compact the entries to coalesce free space. | 902 | * Compact the entries to coalesce free space. |
@@ -909,18 +909,18 @@ xfs_dir_leaf_add(xfs_dabuf_t *bp, xfs_da_args_t *args, int index) | |||
909 | (uint)sizeof(xfs_dir_leaf_entry_t) : 0, | 909 | (uint)sizeof(xfs_dir_leaf_entry_t) : 0, |
910 | args->justcheck); | 910 | args->justcheck); |
911 | if (error) | 911 | if (error) |
912 | return(error); | 912 | return error; |
913 | /* | 913 | /* |
914 | * After compaction, the block is guaranteed to have only one | 914 | * After compaction, the block is guaranteed to have only one |
915 | * free region, in freemap[0]. If it is not big enough, give up. | 915 | * free region, in freemap[0]. If it is not big enough, give up. |
916 | */ | 916 | */ |
917 | if (INT_GET(hdr->freemap[0].size, ARCH_CONVERT) < | 917 | if (INT_GET(hdr->freemap[0].size, ARCH_CONVERT) < |
918 | (entsize + (uint)sizeof(xfs_dir_leaf_entry_t))) | 918 | (entsize + (uint)sizeof(xfs_dir_leaf_entry_t))) |
919 | return(XFS_ERROR(ENOSPC)); | 919 | return XFS_ERROR(ENOSPC); |
920 | 920 | ||
921 | if (!args->justcheck) | 921 | if (!args->justcheck) |
922 | xfs_dir_leaf_add_work(bp, args, index, 0); | 922 | xfs_dir_leaf_add_work(bp, args, index, 0); |
923 | return(0); | 923 | return 0; |
924 | } | 924 | } |
925 | 925 | ||
926 | /* | 926 | /* |
@@ -1072,7 +1072,7 @@ xfs_dir_leaf_compact(xfs_trans_t *trans, xfs_dabuf_t *bp, int musthave, | |||
1072 | kmem_free(tmpbuffer, lbsize); | 1072 | kmem_free(tmpbuffer, lbsize); |
1073 | if (musthave || justcheck) | 1073 | if (musthave || justcheck) |
1074 | kmem_free(tmpbuffer2, lbsize); | 1074 | kmem_free(tmpbuffer2, lbsize); |
1075 | return(rval); | 1075 | return rval; |
1076 | } | 1076 | } |
1077 | 1077 | ||
1078 | /* | 1078 | /* |
@@ -1292,7 +1292,7 @@ xfs_dir_leaf_figure_balance(xfs_da_state_t *state, | |||
1292 | 1292 | ||
1293 | *countarg = count; | 1293 | *countarg = count; |
1294 | *namebytesarg = totallen; | 1294 | *namebytesarg = totallen; |
1295 | return(foundit); | 1295 | return foundit; |
1296 | } | 1296 | } |
1297 | 1297 | ||
1298 | /*======================================================================== | 1298 | /*======================================================================== |
@@ -1334,7 +1334,7 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action) | |||
1334 | INT_GET(leaf->hdr.namebytes, ARCH_CONVERT); | 1334 | INT_GET(leaf->hdr.namebytes, ARCH_CONVERT); |
1335 | if (bytes > (state->blocksize >> 1)) { | 1335 | if (bytes > (state->blocksize >> 1)) { |
1336 | *action = 0; /* blk over 50%, don't try to join */ | 1336 | *action = 0; /* blk over 50%, don't try to join */ |
1337 | return(0); | 1337 | return 0; |
1338 | } | 1338 | } |
1339 | 1339 | ||
1340 | /* | 1340 | /* |
@@ -1353,13 +1353,13 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action) | |||
1353 | error = xfs_da_path_shift(state, &state->altpath, forward, | 1353 | error = xfs_da_path_shift(state, &state->altpath, forward, |
1354 | 0, &retval); | 1354 | 0, &retval); |
1355 | if (error) | 1355 | if (error) |
1356 | return(error); | 1356 | return error; |
1357 | if (retval) { | 1357 | if (retval) { |
1358 | *action = 0; | 1358 | *action = 0; |
1359 | } else { | 1359 | } else { |
1360 | *action = 2; | 1360 | *action = 2; |
1361 | } | 1361 | } |
1362 | return(0); | 1362 | return 0; |
1363 | } | 1363 | } |
1364 | 1364 | ||
1365 | /* | 1365 | /* |
@@ -1381,7 +1381,7 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action) | |||
1381 | blkno, -1, &bp, | 1381 | blkno, -1, &bp, |
1382 | XFS_DATA_FORK); | 1382 | XFS_DATA_FORK); |
1383 | if (error) | 1383 | if (error) |
1384 | return(error); | 1384 | return error; |
1385 | ASSERT(bp != NULL); | 1385 | ASSERT(bp != NULL); |
1386 | 1386 | ||
1387 | leaf = (xfs_dir_leafblock_t *)info; | 1387 | leaf = (xfs_dir_leafblock_t *)info; |
@@ -1402,7 +1402,7 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action) | |||
1402 | } | 1402 | } |
1403 | if (i >= 2) { | 1403 | if (i >= 2) { |
1404 | *action = 0; | 1404 | *action = 0; |
1405 | return(0); | 1405 | return 0; |
1406 | } | 1406 | } |
1407 | xfs_da_buf_done(bp); | 1407 | xfs_da_buf_done(bp); |
1408 | 1408 | ||
@@ -1419,13 +1419,13 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action) | |||
1419 | 0, &retval); | 1419 | 0, &retval); |
1420 | } | 1420 | } |
1421 | if (error) | 1421 | if (error) |
1422 | return(error); | 1422 | return error; |
1423 | if (retval) { | 1423 | if (retval) { |
1424 | *action = 0; | 1424 | *action = 0; |
1425 | } else { | 1425 | } else { |
1426 | *action = 1; | 1426 | *action = 1; |
1427 | } | 1427 | } |
1428 | return(0); | 1428 | return 0; |
1429 | } | 1429 | } |
1430 | 1430 | ||
1431 | /* | 1431 | /* |
@@ -1575,8 +1575,8 @@ xfs_dir_leaf_remove(xfs_trans_t *trans, xfs_dabuf_t *bp, int index) | |||
1575 | tmp += INT_GET(leaf->hdr.count, ARCH_CONVERT) * ((uint)sizeof(xfs_dir_leaf_name_t) - 1); | 1575 | tmp += INT_GET(leaf->hdr.count, ARCH_CONVERT) * ((uint)sizeof(xfs_dir_leaf_name_t) - 1); |
1576 | tmp += INT_GET(leaf->hdr.namebytes, ARCH_CONVERT); | 1576 | tmp += INT_GET(leaf->hdr.namebytes, ARCH_CONVERT); |
1577 | if (tmp < mp->m_dir_magicpct) | 1577 | if (tmp < mp->m_dir_magicpct) |
1578 | return(1); /* leaf is < 37% full */ | 1578 | return 1; /* leaf is < 37% full */ |
1579 | return(0); | 1579 | return 0; |
1580 | } | 1580 | } |
1581 | 1581 | ||
1582 | /* | 1582 | /* |
@@ -1732,7 +1732,7 @@ xfs_dir_leaf_lookup_int(xfs_dabuf_t *bp, xfs_da_args_t *args, int *index) | |||
1732 | if ((probe == INT_GET(leaf->hdr.count, ARCH_CONVERT)) || (INT_GET(entry->hashval, ARCH_CONVERT) != hashval)) { | 1732 | if ((probe == INT_GET(leaf->hdr.count, ARCH_CONVERT)) || (INT_GET(entry->hashval, ARCH_CONVERT) != hashval)) { |
1733 | *index = probe; | 1733 | *index = probe; |
1734 | ASSERT(args->oknoent); | 1734 | ASSERT(args->oknoent); |
1735 | return(XFS_ERROR(ENOENT)); | 1735 | return XFS_ERROR(ENOENT); |
1736 | } | 1736 | } |
1737 | 1737 | ||
1738 | /* | 1738 | /* |
@@ -1745,14 +1745,14 @@ xfs_dir_leaf_lookup_int(xfs_dabuf_t *bp, xfs_da_args_t *args, int *index) | |||
1745 | memcmp(args->name, namest->name, args->namelen) == 0) { | 1745 | memcmp(args->name, namest->name, args->namelen) == 0) { |
1746 | XFS_DIR_SF_GET_DIRINO(&namest->inumber, &args->inumber); | 1746 | XFS_DIR_SF_GET_DIRINO(&namest->inumber, &args->inumber); |
1747 | *index = probe; | 1747 | *index = probe; |
1748 | return(XFS_ERROR(EEXIST)); | 1748 | return XFS_ERROR(EEXIST); |
1749 | } | 1749 | } |
1750 | entry++; | 1750 | entry++; |
1751 | probe++; | 1751 | probe++; |
1752 | } | 1752 | } |
1753 | *index = probe; | 1753 | *index = probe; |
1754 | ASSERT(probe == INT_GET(leaf->hdr.count, ARCH_CONVERT) || args->oknoent); | 1754 | ASSERT(probe == INT_GET(leaf->hdr.count, ARCH_CONVERT) || args->oknoent); |
1755 | return(XFS_ERROR(ENOENT)); | 1755 | return XFS_ERROR(ENOENT); |
1756 | } | 1756 | } |
1757 | 1757 | ||
1758 | /*======================================================================== | 1758 | /*======================================================================== |
@@ -1890,9 +1890,9 @@ xfs_dir_leaf_order(xfs_dabuf_t *leaf1_bp, xfs_dabuf_t *leaf2_bp) | |||
1890 | INT_GET(leaf1->entries[ 0 ].hashval, ARCH_CONVERT)) || | 1890 | INT_GET(leaf1->entries[ 0 ].hashval, ARCH_CONVERT)) || |
1891 | (INT_GET(leaf2->entries[ INT_GET(leaf2->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT) < | 1891 | (INT_GET(leaf2->entries[ INT_GET(leaf2->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT) < |
1892 | INT_GET(leaf1->entries[ INT_GET(leaf1->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT)))) { | 1892 | INT_GET(leaf1->entries[ INT_GET(leaf1->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT)))) { |
1893 | return(1); | 1893 | return 1; |
1894 | } | 1894 | } |
1895 | return(0); | 1895 | return 0; |
1896 | } | 1896 | } |
1897 | 1897 | ||
1898 | /* | 1898 | /* |
@@ -1942,7 +1942,7 @@ xfs_dir_leaf_getdents_int( | |||
1942 | leaf = bp->data; | 1942 | leaf = bp->data; |
1943 | if (INT_GET(leaf->hdr.info.magic, ARCH_CONVERT) != XFS_DIR_LEAF_MAGIC) { | 1943 | if (INT_GET(leaf->hdr.info.magic, ARCH_CONVERT) != XFS_DIR_LEAF_MAGIC) { |
1944 | *eobp = 1; | 1944 | *eobp = 1; |
1945 | return(XFS_ERROR(ENOENT)); /* XXX wrong code */ | 1945 | return XFS_ERROR(ENOENT); /* XXX wrong code */ |
1946 | } | 1946 | } |
1947 | 1947 | ||
1948 | want_entno = XFS_DA_COOKIE_ENTRY(mp, uio->uio_offset); | 1948 | want_entno = XFS_DA_COOKIE_ENTRY(mp, uio->uio_offset); |
@@ -2000,7 +2000,7 @@ xfs_dir_leaf_getdents_int( | |||
2000 | * the node code will be setting uio_offset anyway. | 2000 | * the node code will be setting uio_offset anyway. |
2001 | */ | 2001 | */ |
2002 | *eobp = 0; | 2002 | *eobp = 0; |
2003 | return(0); | 2003 | return 0; |
2004 | } | 2004 | } |
2005 | xfs_dir_trace_g_due("leaf: hash found", dp, uio, entry); | 2005 | xfs_dir_trace_g_due("leaf: hash found", dp, uio, entry); |
2006 | 2006 | ||
@@ -2057,7 +2057,7 @@ xfs_dir_leaf_getdents_int( | |||
2057 | retval = xfs_da_read_buf(dp->i_transp, dp, thishash, | 2057 | retval = xfs_da_read_buf(dp->i_transp, dp, thishash, |
2058 | nextda, &bp2, XFS_DATA_FORK); | 2058 | nextda, &bp2, XFS_DATA_FORK); |
2059 | if (retval) | 2059 | if (retval) |
2060 | return(retval); | 2060 | return retval; |
2061 | 2061 | ||
2062 | ASSERT(bp2 != NULL); | 2062 | ASSERT(bp2 != NULL); |
2063 | 2063 | ||
@@ -2073,7 +2073,7 @@ xfs_dir_leaf_getdents_int( | |||
2073 | leaf2); | 2073 | leaf2); |
2074 | xfs_da_brelse(dp->i_transp, bp2); | 2074 | xfs_da_brelse(dp->i_transp, bp2); |
2075 | 2075 | ||
2076 | return(XFS_ERROR(EFSCORRUPTED)); | 2076 | return XFS_ERROR(EFSCORRUPTED); |
2077 | } | 2077 | } |
2078 | 2078 | ||
2079 | nexthash = INT_GET(leaf2->entries[0].hashval, | 2079 | nexthash = INT_GET(leaf2->entries[0].hashval, |
@@ -2139,7 +2139,7 @@ xfs_dir_leaf_getdents_int( | |||
2139 | 2139 | ||
2140 | xfs_dir_trace_g_du("leaf: E-O-B", dp, uio); | 2140 | xfs_dir_trace_g_du("leaf: E-O-B", dp, uio); |
2141 | 2141 | ||
2142 | return(retval); | 2142 | return retval; |
2143 | } | 2143 | } |
2144 | } | 2144 | } |
2145 | 2145 | ||
@@ -2149,7 +2149,7 @@ xfs_dir_leaf_getdents_int( | |||
2149 | 2149 | ||
2150 | xfs_dir_trace_g_du("leaf: E-O-F", dp, uio); | 2150 | xfs_dir_trace_g_du("leaf: E-O-F", dp, uio); |
2151 | 2151 | ||
2152 | return(0); | 2152 | return 0; |
2153 | } | 2153 | } |
2154 | 2154 | ||
2155 | /* | 2155 | /* |
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index 163031c1e39..b4d971b0158 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c | |||
@@ -501,7 +501,7 @@ xfs_reserve_blocks( | |||
501 | if (inval == (__uint64_t *)NULL) { | 501 | if (inval == (__uint64_t *)NULL) { |
502 | outval->resblks = mp->m_resblks; | 502 | outval->resblks = mp->m_resblks; |
503 | outval->resblks_avail = mp->m_resblks_avail; | 503 | outval->resblks_avail = mp->m_resblks_avail; |
504 | return(0); | 504 | return 0; |
505 | } | 505 | } |
506 | 506 | ||
507 | request = *inval; | 507 | request = *inval; |
@@ -537,7 +537,7 @@ xfs_reserve_blocks( | |||
537 | outval->resblks = mp->m_resblks; | 537 | outval->resblks = mp->m_resblks; |
538 | outval->resblks_avail = mp->m_resblks_avail; | 538 | outval->resblks_avail = mp->m_resblks_avail; |
539 | XFS_SB_UNLOCK(mp, s); | 539 | XFS_SB_UNLOCK(mp, s); |
540 | return(0); | 540 | return 0; |
541 | } | 541 | } |
542 | 542 | ||
543 | void | 543 | void |
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 3d9a36e7736..9176995160e 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
@@ -403,7 +403,7 @@ xfs_log_release_iclog(xfs_mount_t *mp, | |||
403 | 403 | ||
404 | if (xlog_state_release_iclog(log, iclog)) { | 404 | if (xlog_state_release_iclog(log, iclog)) { |
405 | xfs_force_shutdown(mp, XFS_LOG_IO_ERROR); | 405 | xfs_force_shutdown(mp, XFS_LOG_IO_ERROR); |
406 | return(EIO); | 406 | return EIO; |
407 | } | 407 | } |
408 | 408 | ||
409 | return 0; | 409 | return 0; |
@@ -556,7 +556,7 @@ xfs_log_unmount(xfs_mount_t *mp) | |||
556 | 556 | ||
557 | error = xfs_log_unmount_write(mp); | 557 | error = xfs_log_unmount_write(mp); |
558 | xfs_log_unmount_dealloc(mp); | 558 | xfs_log_unmount_dealloc(mp); |
559 | return (error); | 559 | return error; |
560 | } | 560 | } |
561 | 561 | ||
562 | /* | 562 | /* |
@@ -728,7 +728,7 @@ xfs_log_write(xfs_mount_t * mp, | |||
728 | if ((error = xlog_write(mp, reg, nentries, tic, start_lsn, NULL, 0))) { | 728 | if ((error = xlog_write(mp, reg, nentries, tic, start_lsn, NULL, 0))) { |
729 | xfs_force_shutdown(mp, XFS_LOG_IO_ERROR); | 729 | xfs_force_shutdown(mp, XFS_LOG_IO_ERROR); |
730 | } | 730 | } |
731 | return (error); | 731 | return error; |
732 | } /* xfs_log_write */ | 732 | } /* xfs_log_write */ |
733 | 733 | ||
734 | 734 | ||
@@ -836,7 +836,7 @@ xfs_log_need_covered(xfs_mount_t *mp) | |||
836 | needed = 1; | 836 | needed = 1; |
837 | } | 837 | } |
838 | LOG_UNLOCK(log, s); | 838 | LOG_UNLOCK(log, s); |
839 | return(needed); | 839 | return needed; |
840 | } | 840 | } |
841 | 841 | ||
842 | /****************************************************************************** | 842 | /****************************************************************************** |
@@ -1003,7 +1003,7 @@ xlog_bdstrat_cb(struct xfs_buf *bp) | |||
1003 | XFS_BUF_ERROR(bp, EIO); | 1003 | XFS_BUF_ERROR(bp, EIO); |
1004 | XFS_BUF_STALE(bp); | 1004 | XFS_BUF_STALE(bp); |
1005 | xfs_biodone(bp); | 1005 | xfs_biodone(bp); |
1006 | return (XFS_ERROR(EIO)); | 1006 | return XFS_ERROR(EIO); |
1007 | 1007 | ||
1008 | 1008 | ||
1009 | } | 1009 | } |
@@ -1263,7 +1263,7 @@ xlog_commit_record(xfs_mount_t *mp, | |||
1263 | iclog, XLOG_COMMIT_TRANS))) { | 1263 | iclog, XLOG_COMMIT_TRANS))) { |
1264 | xfs_force_shutdown(mp, XFS_LOG_IO_ERROR); | 1264 | xfs_force_shutdown(mp, XFS_LOG_IO_ERROR); |
1265 | } | 1265 | } |
1266 | return (error); | 1266 | return error; |
1267 | } /* xlog_commit_record */ | 1267 | } /* xlog_commit_record */ |
1268 | 1268 | ||
1269 | 1269 | ||
@@ -1460,7 +1460,7 @@ xlog_sync(xlog_t *log, | |||
1460 | if ((error = XFS_bwrite(bp))) { | 1460 | if ((error = XFS_bwrite(bp))) { |
1461 | xfs_ioerror_alert("xlog_sync", log->l_mp, bp, | 1461 | xfs_ioerror_alert("xlog_sync", log->l_mp, bp, |
1462 | XFS_BUF_ADDR(bp)); | 1462 | XFS_BUF_ADDR(bp)); |
1463 | return (error); | 1463 | return error; |
1464 | } | 1464 | } |
1465 | if (split) { | 1465 | if (split) { |
1466 | bp = iclog->ic_log->l_xbuf; | 1466 | bp = iclog->ic_log->l_xbuf; |
@@ -1498,10 +1498,10 @@ xlog_sync(xlog_t *log, | |||
1498 | if ((error = XFS_bwrite(bp))) { | 1498 | if ((error = XFS_bwrite(bp))) { |
1499 | xfs_ioerror_alert("xlog_sync (split)", log->l_mp, | 1499 | xfs_ioerror_alert("xlog_sync (split)", log->l_mp, |
1500 | bp, XFS_BUF_ADDR(bp)); | 1500 | bp, XFS_BUF_ADDR(bp)); |
1501 | return (error); | 1501 | return error; |
1502 | } | 1502 | } |
1503 | } | 1503 | } |
1504 | return (0); | 1504 | return 0; |
1505 | } /* xlog_sync */ | 1505 | } /* xlog_sync */ |
1506 | 1506 | ||
1507 | 1507 | ||
@@ -1798,7 +1798,7 @@ xlog_write(xfs_mount_t * mp, | |||
1798 | for (index = 0; index < nentries; ) { | 1798 | for (index = 0; index < nentries; ) { |
1799 | if ((error = xlog_state_get_iclog_space(log, len, &iclog, ticket, | 1799 | if ((error = xlog_state_get_iclog_space(log, len, &iclog, ticket, |
1800 | &contwr, &log_offset))) | 1800 | &contwr, &log_offset))) |
1801 | return (error); | 1801 | return error; |
1802 | 1802 | ||
1803 | ASSERT(log_offset <= iclog->ic_size - 1); | 1803 | ASSERT(log_offset <= iclog->ic_size - 1); |
1804 | ptr = (__psint_t) ((char *)iclog->ic_datap+log_offset); | 1804 | ptr = (__psint_t) ((char *)iclog->ic_datap+log_offset); |
@@ -1903,7 +1903,7 @@ xlog_write(xfs_mount_t * mp, | |||
1903 | xlog_state_finish_copy(log, iclog, record_cnt, data_cnt); | 1903 | xlog_state_finish_copy(log, iclog, record_cnt, data_cnt); |
1904 | record_cnt = data_cnt = 0; | 1904 | record_cnt = data_cnt = 0; |
1905 | if ((error = xlog_state_release_iclog(log, iclog))) | 1905 | if ((error = xlog_state_release_iclog(log, iclog))) |
1906 | return (error); | 1906 | return error; |
1907 | break; /* don't increment index */ | 1907 | break; /* don't increment index */ |
1908 | } else { /* copied entire region */ | 1908 | } else { /* copied entire region */ |
1909 | index++; | 1909 | index++; |
@@ -1917,7 +1917,7 @@ xlog_write(xfs_mount_t * mp, | |||
1917 | ASSERT(flags & XLOG_COMMIT_TRANS); | 1917 | ASSERT(flags & XLOG_COMMIT_TRANS); |
1918 | *commit_iclog = iclog; | 1918 | *commit_iclog = iclog; |
1919 | } else if ((error = xlog_state_release_iclog(log, iclog))) | 1919 | } else if ((error = xlog_state_release_iclog(log, iclog))) |
1920 | return (error); | 1920 | return error; |
1921 | if (index == nentries) | 1921 | if (index == nentries) |
1922 | return 0; /* we are done */ | 1922 | return 0; /* we are done */ |
1923 | else | 1923 | else |
@@ -1934,7 +1934,7 @@ xlog_write(xfs_mount_t * mp, | |||
1934 | *commit_iclog = iclog; | 1934 | *commit_iclog = iclog; |
1935 | return 0; | 1935 | return 0; |
1936 | } | 1936 | } |
1937 | return (xlog_state_release_iclog(log, iclog)); | 1937 | return xlog_state_release_iclog(log, iclog); |
1938 | } /* xlog_write */ | 1938 | } /* xlog_write */ |
1939 | 1939 | ||
1940 | 1940 | ||
@@ -2050,7 +2050,7 @@ xlog_get_lowest_lsn( | |||
2050 | } | 2050 | } |
2051 | lsn_log = lsn_log->ic_next; | 2051 | lsn_log = lsn_log->ic_next; |
2052 | } while (lsn_log != log->l_iclog); | 2052 | } while (lsn_log != log->l_iclog); |
2053 | return(lowest_lsn); | 2053 | return lowest_lsn; |
2054 | } | 2054 | } |
2055 | 2055 | ||
2056 | 2056 | ||
@@ -2402,7 +2402,7 @@ restart: | |||
2402 | if (iclog->ic_refcnt == 1) { | 2402 | if (iclog->ic_refcnt == 1) { |
2403 | LOG_UNLOCK(log, s); | 2403 | LOG_UNLOCK(log, s); |
2404 | if ((error = xlog_state_release_iclog(log, iclog))) | 2404 | if ((error = xlog_state_release_iclog(log, iclog))) |
2405 | return (error); | 2405 | return error; |
2406 | } else { | 2406 | } else { |
2407 | iclog->ic_refcnt--; | 2407 | iclog->ic_refcnt--; |
2408 | LOG_UNLOCK(log, s); | 2408 | LOG_UNLOCK(log, s); |
@@ -2569,7 +2569,7 @@ xlog_regrant_write_log_space(xlog_t *log, | |||
2569 | XLOG_TIC_RESET_RES(tic); | 2569 | XLOG_TIC_RESET_RES(tic); |
2570 | 2570 | ||
2571 | if (tic->t_cnt > 0) | 2571 | if (tic->t_cnt > 0) |
2572 | return (0); | 2572 | return 0; |
2573 | 2573 | ||
2574 | #ifdef DEBUG | 2574 | #ifdef DEBUG |
2575 | if (log->l_flags & XLOG_ACTIVE_RECOVERY) | 2575 | if (log->l_flags & XLOG_ACTIVE_RECOVERY) |
@@ -2667,7 +2667,7 @@ redo: | |||
2667 | xlog_trace_loggrant(log, tic, "xlog_regrant_write_log_space: exit"); | 2667 | xlog_trace_loggrant(log, tic, "xlog_regrant_write_log_space: exit"); |
2668 | xlog_verify_grant_head(log, 1); | 2668 | xlog_verify_grant_head(log, 1); |
2669 | GRANT_UNLOCK(log, s); | 2669 | GRANT_UNLOCK(log, s); |
2670 | return (0); | 2670 | return 0; |
2671 | 2671 | ||
2672 | 2672 | ||
2673 | error_return: | 2673 | error_return: |
@@ -2837,7 +2837,7 @@ xlog_state_release_iclog(xlog_t *log, | |||
2837 | if (sync) { | 2837 | if (sync) { |
2838 | return xlog_sync(log, iclog); | 2838 | return xlog_sync(log, iclog); |
2839 | } | 2839 | } |
2840 | return (0); | 2840 | return 0; |
2841 | 2841 | ||
2842 | } /* xlog_state_release_iclog */ | 2842 | } /* xlog_state_release_iclog */ |
2843 | 2843 | ||
@@ -3127,7 +3127,7 @@ try_again: | |||
3127 | } while (iclog != log->l_iclog); | 3127 | } while (iclog != log->l_iclog); |
3128 | 3128 | ||
3129 | LOG_UNLOCK(log, s); | 3129 | LOG_UNLOCK(log, s); |
3130 | return (0); | 3130 | return 0; |
3131 | } /* xlog_state_sync */ | 3131 | } /* xlog_state_sync */ |
3132 | 3132 | ||
3133 | 3133 | ||
@@ -3545,12 +3545,12 @@ xlog_state_ioerror( | |||
3545 | ic->ic_state = XLOG_STATE_IOERROR; | 3545 | ic->ic_state = XLOG_STATE_IOERROR; |
3546 | ic = ic->ic_next; | 3546 | ic = ic->ic_next; |
3547 | } while (ic != iclog); | 3547 | } while (ic != iclog); |
3548 | return (0); | 3548 | return 0; |
3549 | } | 3549 | } |
3550 | /* | 3550 | /* |
3551 | * Return non-zero, if state transition has already happened. | 3551 | * Return non-zero, if state transition has already happened. |
3552 | */ | 3552 | */ |
3553 | return (1); | 3553 | return 1; |
3554 | } | 3554 | } |
3555 | 3555 | ||
3556 | /* | 3556 | /* |
@@ -3587,7 +3587,7 @@ xfs_log_force_umount( | |||
3587 | log->l_flags & XLOG_ACTIVE_RECOVERY) { | 3587 | log->l_flags & XLOG_ACTIVE_RECOVERY) { |
3588 | mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN; | 3588 | mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN; |
3589 | XFS_BUF_DONE(mp->m_sb_bp); | 3589 | XFS_BUF_DONE(mp->m_sb_bp); |
3590 | return (0); | 3590 | return 0; |
3591 | } | 3591 | } |
3592 | 3592 | ||
3593 | /* | 3593 | /* |
@@ -3596,7 +3596,7 @@ xfs_log_force_umount( | |||
3596 | */ | 3596 | */ |
3597 | if (logerror && log->l_iclog->ic_state & XLOG_STATE_IOERROR) { | 3597 | if (logerror && log->l_iclog->ic_state & XLOG_STATE_IOERROR) { |
3598 | ASSERT(XLOG_FORCED_SHUTDOWN(log)); | 3598 | ASSERT(XLOG_FORCED_SHUTDOWN(log)); |
3599 | return (1); | 3599 | return 1; |
3600 | } | 3600 | } |
3601 | retval = 0; | 3601 | retval = 0; |
3602 | /* | 3602 | /* |
@@ -3678,7 +3678,7 @@ xfs_log_force_umount( | |||
3678 | } | 3678 | } |
3679 | #endif | 3679 | #endif |
3680 | /* return non-zero if log IOERROR transition had already happened */ | 3680 | /* return non-zero if log IOERROR transition had already happened */ |
3681 | return (retval); | 3681 | return retval; |
3682 | } | 3682 | } |
3683 | 3683 | ||
3684 | STATIC int | 3684 | STATIC int |
@@ -3692,8 +3692,8 @@ xlog_iclogs_empty(xlog_t *log) | |||
3692 | * any language. | 3692 | * any language. |
3693 | */ | 3693 | */ |
3694 | if (iclog->ic_header.h_num_logops) | 3694 | if (iclog->ic_header.h_num_logops) |
3695 | return(0); | 3695 | return 0; |
3696 | iclog = iclog->ic_next; | 3696 | iclog = iclog->ic_next; |
3697 | } while (iclog != log->l_iclog); | 3697 | } while (iclog != log->l_iclog); |
3698 | return(1); | 3698 | return 1; |
3699 | } | 3699 | } |
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 6088e14f84e..62188ea392c 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -646,7 +646,7 @@ xfs_mountfs( | |||
646 | 646 | ||
647 | if (mp->m_sb_bp == NULL) { | 647 | if (mp->m_sb_bp == NULL) { |
648 | if ((error = xfs_readsb(mp))) { | 648 | if ((error = xfs_readsb(mp))) { |
649 | return (error); | 649 | return error; |
650 | } | 650 | } |
651 | } | 651 | } |
652 | xfs_mount_common(mp, sbp); | 652 | xfs_mount_common(mp, sbp); |
@@ -889,7 +889,7 @@ xfs_mountfs( | |||
889 | * For client case we are done now | 889 | * For client case we are done now |
890 | */ | 890 | */ |
891 | if (mfsi_flags & XFS_MFSI_CLIENT) { | 891 | if (mfsi_flags & XFS_MFSI_CLIENT) { |
892 | return(0); | 892 | return 0; |
893 | } | 893 | } |
894 | 894 | ||
895 | /* | 895 | /* |
@@ -1182,7 +1182,7 @@ xfs_unmountfs_writesb(xfs_mount_t *mp) | |||
1182 | xfs_fs_cmn_err(CE_ALERT, mp, "Superblock write error detected while unmounting. Filesystem may not be marked shared readonly"); | 1182 | xfs_fs_cmn_err(CE_ALERT, mp, "Superblock write error detected while unmounting. Filesystem may not be marked shared readonly"); |
1183 | } | 1183 | } |
1184 | xfs_buf_relse(sbp); | 1184 | xfs_buf_relse(sbp); |
1185 | return (error); | 1185 | return error; |
1186 | } | 1186 | } |
1187 | 1187 | ||
1188 | /* | 1188 | /* |
@@ -1257,19 +1257,19 @@ xfs_mod_incore_sb_unlocked(xfs_mount_t *mp, xfs_sb_field_t field, | |||
1257 | lcounter += delta; | 1257 | lcounter += delta; |
1258 | if (lcounter < 0) { | 1258 | if (lcounter < 0) { |
1259 | ASSERT(0); | 1259 | ASSERT(0); |
1260 | return (XFS_ERROR(EINVAL)); | 1260 | return XFS_ERROR(EINVAL); |
1261 | } | 1261 | } |
1262 | mp->m_sb.sb_icount = lcounter; | 1262 | mp->m_sb.sb_icount = lcounter; |
1263 | return (0); | 1263 | return 0; |
1264 | case XFS_SBS_IFREE: | 1264 | case XFS_SBS_IFREE: |
1265 | lcounter = (long long)mp->m_sb.sb_ifree; | 1265 | lcounter = (long long)mp->m_sb.sb_ifree; |
1266 | lcounter += delta; | 1266 | lcounter += delta; |
1267 | if (lcounter < 0) { | 1267 | if (lcounter < 0) { |
1268 | ASSERT(0); | 1268 | ASSERT(0); |
1269 | return (XFS_ERROR(EINVAL)); | 1269 | return XFS_ERROR(EINVAL); |
1270 | } | 1270 | } |
1271 | mp->m_sb.sb_ifree = lcounter; | 1271 | mp->m_sb.sb_ifree = lcounter; |
1272 | return (0); | 1272 | return 0; |
1273 | case XFS_SBS_FDBLOCKS: | 1273 | case XFS_SBS_FDBLOCKS: |
1274 | 1274 | ||
1275 | lcounter = (long long)mp->m_sb.sb_fdblocks; | 1275 | lcounter = (long long)mp->m_sb.sb_fdblocks; |
@@ -1296,101 +1296,101 @@ xfs_mod_incore_sb_unlocked(xfs_mount_t *mp, xfs_sb_field_t field, | |||
1296 | if (rsvd) { | 1296 | if (rsvd) { |
1297 | lcounter = (long long)mp->m_resblks_avail + delta; | 1297 | lcounter = (long long)mp->m_resblks_avail + delta; |
1298 | if (lcounter < 0) { | 1298 | if (lcounter < 0) { |
1299 | return (XFS_ERROR(ENOSPC)); | 1299 | return XFS_ERROR(ENOSPC); |
1300 | } | 1300 | } |
1301 | mp->m_resblks_avail = lcounter; | 1301 | mp->m_resblks_avail = lcounter; |
1302 | return (0); | 1302 | return 0; |
1303 | } else { /* not reserved */ | 1303 | } else { /* not reserved */ |
1304 | return (XFS_ERROR(ENOSPC)); | 1304 | return XFS_ERROR(ENOSPC); |
1305 | } | 1305 | } |
1306 | } | 1306 | } |
1307 | } | 1307 | } |
1308 | 1308 | ||
1309 | mp->m_sb.sb_fdblocks = lcounter; | 1309 | mp->m_sb.sb_fdblocks = lcounter; |
1310 | return (0); | 1310 | return 0; |
1311 | case XFS_SBS_FREXTENTS: | 1311 | case XFS_SBS_FREXTENTS: |
1312 | lcounter = (long long)mp->m_sb.sb_frextents; | 1312 | lcounter = (long long)mp->m_sb.sb_frextents; |
1313 | lcounter += delta; | 1313 | lcounter += delta; |
1314 | if (lcounter < 0) { | 1314 | if (lcounter < 0) { |
1315 | return (XFS_ERROR(ENOSPC)); | 1315 | return XFS_ERROR(ENOSPC); |
1316 | } | 1316 | } |
1317 | mp->m_sb.sb_frextents = lcounter; | 1317 | mp->m_sb.sb_frextents = lcounter; |
1318 | return (0); | 1318 | return 0; |
1319 | case XFS_SBS_DBLOCKS: | 1319 | case XFS_SBS_DBLOCKS: |
1320 | lcounter = (long long)mp->m_sb.sb_dblocks; | 1320 | lcounter = (long long)mp->m_sb.sb_dblocks; |
1321 | lcounter += delta; | 1321 | lcounter += delta; |
1322 | if (lcounter < 0) { | 1322 | if (lcounter < 0) { |
1323 | ASSERT(0); | 1323 | ASSERT(0); |
1324 | return (XFS_ERROR(EINVAL)); | 1324 | return XFS_ERROR(EINVAL); |
1325 | } | 1325 | } |
1326 | mp->m_sb.sb_dblocks = lcounter; | 1326 | mp->m_sb.sb_dblocks = lcounter; |
1327 | return (0); | 1327 | return 0; |
1328 | case XFS_SBS_AGCOUNT: | 1328 | case XFS_SBS_AGCOUNT: |
1329 | scounter = mp->m_sb.sb_agcount; | 1329 | scounter = mp->m_sb.sb_agcount; |
1330 | scounter += delta; | 1330 | scounter += delta; |
1331 | if (scounter < 0) { | 1331 | if (scounter < 0) { |
1332 | ASSERT(0); | 1332 | ASSERT(0); |
1333 | return (XFS_ERROR(EINVAL)); | 1333 | return XFS_ERROR(EINVAL); |
1334 | } | 1334 | } |
1335 | mp->m_sb.sb_agcount = scounter; | 1335 | mp->m_sb.sb_agcount = scounter; |
1336 | return (0); | 1336 | return 0; |
1337 | case XFS_SBS_IMAX_PCT: | 1337 | case XFS_SBS_IMAX_PCT: |
1338 | scounter = mp->m_sb.sb_imax_pct; | 1338 | scounter = mp->m_sb.sb_imax_pct; |
1339 | scounter += delta; | 1339 | scounter += delta; |
1340 | if (scounter < 0) { | 1340 | if (scounter < 0) { |
1341 | ASSERT(0); | 1341 | ASSERT(0); |
1342 | return (XFS_ERROR(EINVAL)); | 1342 | return XFS_ERROR(EINVAL); |
1343 | } | 1343 | } |
1344 | mp->m_sb.sb_imax_pct = scounter; | 1344 | mp->m_sb.sb_imax_pct = scounter; |
1345 | return (0); | 1345 | return 0; |
1346 | case XFS_SBS_REXTSIZE: | 1346 | case XFS_SBS_REXTSIZE: |
1347 | scounter = mp->m_sb.sb_rextsize; | 1347 | scounter = mp->m_sb.sb_rextsize; |
1348 | scounter += delta; | 1348 | scounter += delta; |
1349 | if (scounter < 0) { | 1349 | if (scounter < 0) { |
1350 | ASSERT(0); | 1350 | ASSERT(0); |
1351 | return (XFS_ERROR(EINVAL)); | 1351 | return XFS_ERROR(EINVAL); |
1352 | } | 1352 | } |
1353 | mp->m_sb.sb_rextsize = scounter; | 1353 | mp->m_sb.sb_rextsize = scounter; |
1354 | return (0); | 1354 | return 0; |
1355 | case XFS_SBS_RBMBLOCKS: | 1355 | case XFS_SBS_RBMBLOCKS: |
1356 | scounter = mp->m_sb.sb_rbmblocks; | 1356 | scounter = mp->m_sb.sb_rbmblocks; |
1357 | scounter += delta; | 1357 | scounter += delta; |
1358 | if (scounter < 0) { | 1358 | if (scounter < 0) { |
1359 | ASSERT(0); | 1359 | ASSERT(0); |
1360 | return (XFS_ERROR(EINVAL)); | 1360 | return XFS_ERROR(EINVAL); |
1361 | } | 1361 | } |
1362 | mp->m_sb.sb_rbmblocks = scounter; | 1362 | mp->m_sb.sb_rbmblocks = scounter; |
1363 | return (0); | 1363 | return 0; |
1364 | case XFS_SBS_RBLOCKS: | 1364 | case XFS_SBS_RBLOCKS: |
1365 | lcounter = (long long)mp->m_sb.sb_rblocks; | 1365 | lcounter = (long long)mp->m_sb.sb_rblocks; |
1366 | lcounter += delta; | 1366 | lcounter += delta; |
1367 | if (lcounter < 0) { | 1367 | if (lcounter < 0) { |
1368 | ASSERT(0); | 1368 | ASSERT(0); |
1369 | return (XFS_ERROR(EINVAL)); | 1369 | return XFS_ERROR(EINVAL); |
1370 | } | 1370 | } |
1371 | mp->m_sb.sb_rblocks = lcounter; | 1371 | mp->m_sb.sb_rblocks = lcounter; |
1372 | return (0); | 1372 | return 0; |
1373 | case XFS_SBS_REXTENTS: | 1373 | case XFS_SBS_REXTENTS: |
1374 | lcounter = (long long)mp->m_sb.sb_rextents; | 1374 | lcounter = (long long)mp->m_sb.sb_rextents; |
1375 | lcounter += delta; | 1375 | lcounter += delta; |
1376 | if (lcounter < 0) { | 1376 | if (lcounter < 0) { |
1377 | ASSERT(0); | 1377 | ASSERT(0); |
1378 | return (XFS_ERROR(EINVAL)); | 1378 | return XFS_ERROR(EINVAL); |
1379 | } | 1379 | } |
1380 | mp->m_sb.sb_rextents = lcounter; | 1380 | mp->m_sb.sb_rextents = lcounter; |
1381 | return (0); | 1381 | return 0; |
1382 | case XFS_SBS_REXTSLOG: | 1382 | case XFS_SBS_REXTSLOG: |
1383 | scounter = mp->m_sb.sb_rextslog; | 1383 | scounter = mp->m_sb.sb_rextslog; |
1384 | scounter += delta; | 1384 | scounter += delta; |
1385 | if (scounter < 0) { | 1385 | if (scounter < 0) { |
1386 | ASSERT(0); | 1386 | ASSERT(0); |
1387 | return (XFS_ERROR(EINVAL)); | 1387 | return XFS_ERROR(EINVAL); |
1388 | } | 1388 | } |
1389 | mp->m_sb.sb_rextslog = scounter; | 1389 | mp->m_sb.sb_rextslog = scounter; |
1390 | return (0); | 1390 | return 0; |
1391 | default: | 1391 | default: |
1392 | ASSERT(0); | 1392 | ASSERT(0); |
1393 | return (XFS_ERROR(EINVAL)); | 1393 | return XFS_ERROR(EINVAL); |
1394 | } | 1394 | } |
1395 | } | 1395 | } |
1396 | 1396 | ||
@@ -1409,7 +1409,7 @@ xfs_mod_incore_sb(xfs_mount_t *mp, xfs_sb_field_t field, int delta, int rsvd) | |||
1409 | s = XFS_SB_LOCK(mp); | 1409 | s = XFS_SB_LOCK(mp); |
1410 | status = xfs_mod_incore_sb_unlocked(mp, field, delta, rsvd); | 1410 | status = xfs_mod_incore_sb_unlocked(mp, field, delta, rsvd); |
1411 | XFS_SB_UNLOCK(mp, s); | 1411 | XFS_SB_UNLOCK(mp, s); |
1412 | return (status); | 1412 | return status; |
1413 | } | 1413 | } |
1414 | 1414 | ||
1415 | /* | 1415 | /* |
@@ -1470,7 +1470,7 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd) | |||
1470 | } | 1470 | } |
1471 | } | 1471 | } |
1472 | XFS_SB_UNLOCK(mp, s); | 1472 | XFS_SB_UNLOCK(mp, s); |
1473 | return (status); | 1473 | return status; |
1474 | } | 1474 | } |
1475 | 1475 | ||
1476 | /* | 1476 | /* |
@@ -1500,7 +1500,7 @@ xfs_getsb( | |||
1500 | } | 1500 | } |
1501 | XFS_BUF_HOLD(bp); | 1501 | XFS_BUF_HOLD(bp); |
1502 | ASSERT(XFS_BUF_ISDONE(bp)); | 1502 | ASSERT(XFS_BUF_ISDONE(bp)); |
1503 | return (bp); | 1503 | return bp; |
1504 | } | 1504 | } |
1505 | 1505 | ||
1506 | /* | 1506 | /* |
diff --git a/fs/xfs/xfs_trans_item.c b/fs/xfs/xfs_trans_item.c index 486147ef0e3..1117d600d74 100644 --- a/fs/xfs/xfs_trans_item.c +++ b/fs/xfs/xfs_trans_item.c | |||
@@ -78,7 +78,7 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip) | |||
78 | lidp->lid_size = 0; | 78 | lidp->lid_size = 0; |
79 | lip->li_desc = lidp; | 79 | lip->li_desc = lidp; |
80 | lip->li_mountp = tp->t_mountp; | 80 | lip->li_mountp = tp->t_mountp; |
81 | return (lidp); | 81 | return lidp; |
82 | } | 82 | } |
83 | 83 | ||
84 | /* | 84 | /* |
@@ -119,7 +119,7 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip) | |||
119 | lidp->lid_size = 0; | 119 | lidp->lid_size = 0; |
120 | lip->li_desc = lidp; | 120 | lip->li_desc = lidp; |
121 | lip->li_mountp = tp->t_mountp; | 121 | lip->li_mountp = tp->t_mountp; |
122 | return (lidp); | 122 | return lidp; |
123 | } | 123 | } |
124 | 124 | ||
125 | /* | 125 | /* |
@@ -180,7 +180,7 @@ xfs_trans_find_item(xfs_trans_t *tp, xfs_log_item_t *lip) | |||
180 | { | 180 | { |
181 | ASSERT(lip->li_desc != NULL); | 181 | ASSERT(lip->li_desc != NULL); |
182 | 182 | ||
183 | return (lip->li_desc); | 183 | return lip->li_desc; |
184 | } | 184 | } |
185 | 185 | ||
186 | 186 | ||
@@ -219,10 +219,10 @@ xfs_trans_first_item(xfs_trans_t *tp) | |||
219 | continue; | 219 | continue; |
220 | } | 220 | } |
221 | 221 | ||
222 | return (XFS_LIC_SLOT(licp, i)); | 222 | return XFS_LIC_SLOT(licp, i); |
223 | } | 223 | } |
224 | cmn_err(CE_WARN, "xfs_trans_first_item() -- no first item"); | 224 | cmn_err(CE_WARN, "xfs_trans_first_item() -- no first item"); |
225 | return(NULL); | 225 | return NULL; |
226 | } | 226 | } |
227 | 227 | ||
228 | 228 | ||
@@ -252,7 +252,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp) | |||
252 | continue; | 252 | continue; |
253 | } | 253 | } |
254 | 254 | ||
255 | return (XFS_LIC_SLOT(licp, i)); | 255 | return XFS_LIC_SLOT(licp, i); |
256 | } | 256 | } |
257 | 257 | ||
258 | /* | 258 | /* |
@@ -261,7 +261,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp) | |||
261 | * If there is no next chunk, return NULL. | 261 | * If there is no next chunk, return NULL. |
262 | */ | 262 | */ |
263 | if (licp->lic_next == NULL) { | 263 | if (licp->lic_next == NULL) { |
264 | return (NULL); | 264 | return NULL; |
265 | } | 265 | } |
266 | 266 | ||
267 | licp = licp->lic_next; | 267 | licp = licp->lic_next; |
@@ -271,7 +271,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp) | |||
271 | continue; | 271 | continue; |
272 | } | 272 | } |
273 | 273 | ||
274 | return (XFS_LIC_SLOT(licp, i)); | 274 | return XFS_LIC_SLOT(licp, i); |
275 | } | 275 | } |
276 | ASSERT(0); | 276 | ASSERT(0); |
277 | /* NOTREACHED */ | 277 | /* NOTREACHED */ |
@@ -425,7 +425,7 @@ xfs_trans_unlock_chunk( | |||
425 | } | 425 | } |
426 | } | 426 | } |
427 | 427 | ||
428 | return (freed); | 428 | return freed; |
429 | } | 429 | } |
430 | 430 | ||
431 | 431 | ||
@@ -478,7 +478,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx) | |||
478 | */ | 478 | */ |
479 | lbsp->lbc_ag = ag; | 479 | lbsp->lbc_ag = ag; |
480 | lbsp->lbc_idx = idx; | 480 | lbsp->lbc_idx = idx; |
481 | return (lbsp); | 481 | return lbsp; |
482 | } | 482 | } |
483 | 483 | ||
484 | /* | 484 | /* |
@@ -512,7 +512,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx) | |||
512 | tp->t_busy_free--; | 512 | tp->t_busy_free--; |
513 | lbsp->lbc_ag = ag; | 513 | lbsp->lbc_ag = ag; |
514 | lbsp->lbc_idx = idx; | 514 | lbsp->lbc_idx = idx; |
515 | return (lbsp); | 515 | return lbsp; |
516 | } | 516 | } |
517 | 517 | ||
518 | 518 | ||
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 8076cc981e1..eaab355f5a8 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -338,7 +338,7 @@ xfs_setattr( | |||
338 | code = XFS_QM_DQVOPALLOC(mp, ip, uid, gid, projid, qflags, | 338 | code = XFS_QM_DQVOPALLOC(mp, ip, uid, gid, projid, qflags, |
339 | &udqp, &gdqp); | 339 | &udqp, &gdqp); |
340 | if (code) | 340 | if (code) |
341 | return (code); | 341 | return code; |
342 | } | 342 | } |
343 | 343 | ||
344 | /* | 344 | /* |
@@ -1027,11 +1027,8 @@ xfs_readlink( | |||
1027 | 1027 | ||
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | |||
1031 | error_return: | 1030 | error_return: |
1032 | |||
1033 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | 1031 | xfs_iunlock(ip, XFS_ILOCK_SHARED); |
1034 | |||
1035 | return error; | 1032 | return error; |
1036 | } | 1033 | } |
1037 | 1034 | ||
@@ -1206,7 +1203,7 @@ xfs_inactive_free_eofblocks( | |||
1206 | last_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)XFS_MAXIOFFSET(mp)); | 1203 | last_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)XFS_MAXIOFFSET(mp)); |
1207 | map_len = last_fsb - end_fsb; | 1204 | map_len = last_fsb - end_fsb; |
1208 | if (map_len <= 0) | 1205 | if (map_len <= 0) |
1209 | return (0); | 1206 | return 0; |
1210 | 1207 | ||
1211 | nimaps = 1; | 1208 | nimaps = 1; |
1212 | xfs_ilock(ip, XFS_ILOCK_SHARED); | 1209 | xfs_ilock(ip, XFS_ILOCK_SHARED); |
@@ -1221,7 +1218,7 @@ xfs_inactive_free_eofblocks( | |||
1221 | * Attach the dquots to the inode up front. | 1218 | * Attach the dquots to the inode up front. |
1222 | */ | 1219 | */ |
1223 | if ((error = XFS_QM_DQATTACH(mp, ip, 0))) | 1220 | if ((error = XFS_QM_DQATTACH(mp, ip, 0))) |
1224 | return (error); | 1221 | return error; |
1225 | 1222 | ||
1226 | /* | 1223 | /* |
1227 | * There are blocks after the end of file. | 1224 | * There are blocks after the end of file. |
@@ -1249,7 +1246,7 @@ xfs_inactive_free_eofblocks( | |||
1249 | ASSERT(XFS_FORCED_SHUTDOWN(mp)); | 1246 | ASSERT(XFS_FORCED_SHUTDOWN(mp)); |
1250 | xfs_trans_cancel(tp, 0); | 1247 | xfs_trans_cancel(tp, 0); |
1251 | xfs_iunlock(ip, XFS_IOLOCK_EXCL); | 1248 | xfs_iunlock(ip, XFS_IOLOCK_EXCL); |
1252 | return (error); | 1249 | return error; |
1253 | } | 1250 | } |
1254 | 1251 | ||
1255 | xfs_ilock(ip, XFS_ILOCK_EXCL); | 1252 | xfs_ilock(ip, XFS_ILOCK_EXCL); |
@@ -1277,7 +1274,7 @@ xfs_inactive_free_eofblocks( | |||
1277 | } | 1274 | } |
1278 | xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL); | 1275 | xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL); |
1279 | } | 1276 | } |
1280 | return (error); | 1277 | return error; |
1281 | } | 1278 | } |
1282 | 1279 | ||
1283 | /* | 1280 | /* |
@@ -1455,7 +1452,7 @@ xfs_inactive_symlink_local( | |||
1455 | if (error) { | 1452 | if (error) { |
1456 | xfs_trans_cancel(*tpp, 0); | 1453 | xfs_trans_cancel(*tpp, 0); |
1457 | *tpp = NULL; | 1454 | *tpp = NULL; |
1458 | return (error); | 1455 | return error; |
1459 | } | 1456 | } |
1460 | xfs_ilock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL); | 1457 | xfs_ilock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL); |
1461 | 1458 | ||
@@ -1468,7 +1465,7 @@ xfs_inactive_symlink_local( | |||
1468 | XFS_DATA_FORK); | 1465 | XFS_DATA_FORK); |
1469 | ASSERT(ip->i_df.if_bytes == 0); | 1466 | ASSERT(ip->i_df.if_bytes == 0); |
1470 | } | 1467 | } |
1471 | return (0); | 1468 | return 0; |
1472 | } | 1469 | } |
1473 | 1470 | ||
1474 | /* | 1471 | /* |
@@ -1494,7 +1491,7 @@ xfs_inactive_attrs( | |||
1494 | if (error) { | 1491 | if (error) { |
1495 | *tpp = NULL; | 1492 | *tpp = NULL; |
1496 | xfs_iunlock(ip, XFS_IOLOCK_EXCL); | 1493 | xfs_iunlock(ip, XFS_IOLOCK_EXCL); |
1497 | return (error); /* goto out*/ | 1494 | return error; /* goto out */ |
1498 | } | 1495 | } |
1499 | 1496 | ||
1500 | tp = xfs_trans_alloc(mp, XFS_TRANS_INACTIVE); | 1497 | tp = xfs_trans_alloc(mp, XFS_TRANS_INACTIVE); |
@@ -1507,7 +1504,7 @@ xfs_inactive_attrs( | |||
1507 | xfs_trans_cancel(tp, 0); | 1504 | xfs_trans_cancel(tp, 0); |
1508 | *tpp = NULL; | 1505 | *tpp = NULL; |
1509 | xfs_iunlock(ip, XFS_IOLOCK_EXCL); | 1506 | xfs_iunlock(ip, XFS_IOLOCK_EXCL); |
1510 | return (error); | 1507 | return error; |
1511 | } | 1508 | } |
1512 | 1509 | ||
1513 | xfs_ilock(ip, XFS_ILOCK_EXCL); | 1510 | xfs_ilock(ip, XFS_ILOCK_EXCL); |
@@ -1518,7 +1515,7 @@ xfs_inactive_attrs( | |||
1518 | ASSERT(ip->i_d.di_anextents == 0); | 1515 | ASSERT(ip->i_d.di_anextents == 0); |
1519 | 1516 | ||
1520 | *tpp = tp; | 1517 | *tpp = tp; |
1521 | return (0); | 1518 | return 0; |
1522 | } | 1519 | } |
1523 | 1520 | ||
1524 | STATIC int | 1521 | STATIC int |
@@ -1557,7 +1554,7 @@ xfs_release( | |||
1557 | (!(ip->i_d.di_flags & | 1554 | (!(ip->i_d.di_flags & |
1558 | (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND)))) { | 1555 | (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND)))) { |
1559 | if ((error = xfs_inactive_free_eofblocks(mp, ip))) | 1556 | if ((error = xfs_inactive_free_eofblocks(mp, ip))) |
1560 | return (error); | 1557 | return error; |
1561 | /* Update linux inode block count after free above */ | 1558 | /* Update linux inode block count after free above */ |
1562 | LINVFS_GET_IP(vp)->i_blocks = XFS_FSB_TO_BB(mp, | 1559 | LINVFS_GET_IP(vp)->i_blocks = XFS_FSB_TO_BB(mp, |
1563 | ip->i_d.di_nblocks + ip->i_delayed_blks); | 1560 | ip->i_d.di_nblocks + ip->i_delayed_blks); |
@@ -1638,7 +1635,7 @@ xfs_inactive( | |||
1638 | (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND)) || | 1635 | (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND)) || |
1639 | (ip->i_delayed_blks != 0)))) { | 1636 | (ip->i_delayed_blks != 0)))) { |
1640 | if ((error = xfs_inactive_free_eofblocks(mp, ip))) | 1637 | if ((error = xfs_inactive_free_eofblocks(mp, ip))) |
1641 | return (VN_INACTIVE_CACHE); | 1638 | return VN_INACTIVE_CACHE; |
1642 | /* Update linux inode block count after free above */ | 1639 | /* Update linux inode block count after free above */ |
1643 | LINVFS_GET_IP(vp)->i_blocks = XFS_FSB_TO_BB(mp, | 1640 | LINVFS_GET_IP(vp)->i_blocks = XFS_FSB_TO_BB(mp, |
1644 | ip->i_d.di_nblocks + ip->i_delayed_blks); | 1641 | ip->i_d.di_nblocks + ip->i_delayed_blks); |
@@ -1649,7 +1646,7 @@ xfs_inactive( | |||
1649 | ASSERT(ip->i_d.di_nlink == 0); | 1646 | ASSERT(ip->i_d.di_nlink == 0); |
1650 | 1647 | ||
1651 | if ((error = XFS_QM_DQATTACH(mp, ip, 0))) | 1648 | if ((error = XFS_QM_DQATTACH(mp, ip, 0))) |
1652 | return (VN_INACTIVE_CACHE); | 1649 | return VN_INACTIVE_CACHE; |
1653 | 1650 | ||
1654 | tp = xfs_trans_alloc(mp, XFS_TRANS_INACTIVE); | 1651 | tp = xfs_trans_alloc(mp, XFS_TRANS_INACTIVE); |
1655 | if (truncate) { | 1652 | if (truncate) { |
@@ -1672,7 +1669,7 @@ xfs_inactive( | |||
1672 | ASSERT(XFS_FORCED_SHUTDOWN(mp)); | 1669 | ASSERT(XFS_FORCED_SHUTDOWN(mp)); |
1673 | xfs_trans_cancel(tp, 0); | 1670 | xfs_trans_cancel(tp, 0); |
1674 | xfs_iunlock(ip, XFS_IOLOCK_EXCL); | 1671 | xfs_iunlock(ip, XFS_IOLOCK_EXCL); |
1675 | return (VN_INACTIVE_CACHE); | 1672 | return VN_INACTIVE_CACHE; |
1676 | } | 1673 | } |
1677 | 1674 | ||
1678 | xfs_ilock(ip, XFS_ILOCK_EXCL); | 1675 | xfs_ilock(ip, XFS_ILOCK_EXCL); |
@@ -1693,7 +1690,7 @@ xfs_inactive( | |||
1693 | xfs_trans_cancel(tp, | 1690 | xfs_trans_cancel(tp, |
1694 | XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT); | 1691 | XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT); |
1695 | xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL); | 1692 | xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL); |
1696 | return (VN_INACTIVE_CACHE); | 1693 | return VN_INACTIVE_CACHE; |
1697 | } | 1694 | } |
1698 | } else if ((ip->i_d.di_mode & S_IFMT) == S_IFLNK) { | 1695 | } else if ((ip->i_d.di_mode & S_IFMT) == S_IFLNK) { |
1699 | 1696 | ||
@@ -1707,7 +1704,7 @@ xfs_inactive( | |||
1707 | 1704 | ||
1708 | if (error) { | 1705 | if (error) { |
1709 | ASSERT(tp == NULL); | 1706 | ASSERT(tp == NULL); |
1710 | return (VN_INACTIVE_CACHE); | 1707 | return VN_INACTIVE_CACHE; |
1711 | } | 1708 | } |
1712 | 1709 | ||
1713 | xfs_trans_ijoin(tp, ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL); | 1710 | xfs_trans_ijoin(tp, ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL); |
@@ -1720,7 +1717,7 @@ xfs_inactive( | |||
1720 | if (error) { | 1717 | if (error) { |
1721 | ASSERT(XFS_FORCED_SHUTDOWN(mp)); | 1718 | ASSERT(XFS_FORCED_SHUTDOWN(mp)); |
1722 | xfs_trans_cancel(tp, 0); | 1719 | xfs_trans_cancel(tp, 0); |
1723 | return (VN_INACTIVE_CACHE); | 1720 | return VN_INACTIVE_CACHE; |
1724 | } | 1721 | } |
1725 | 1722 | ||
1726 | xfs_ilock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL); | 1723 | xfs_ilock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL); |
@@ -1742,7 +1739,7 @@ xfs_inactive( | |||
1742 | * cancelled, and the inode is unlocked. Just get out. | 1739 | * cancelled, and the inode is unlocked. Just get out. |
1743 | */ | 1740 | */ |
1744 | if (error) | 1741 | if (error) |
1745 | return (VN_INACTIVE_CACHE); | 1742 | return VN_INACTIVE_CACHE; |
1746 | } else if (ip->i_afp) { | 1743 | } else if (ip->i_afp) { |
1747 | xfs_idestroy_fork(ip, XFS_ATTR_FORK); | 1744 | xfs_idestroy_fork(ip, XFS_ATTR_FORK); |
1748 | } | 1745 | } |
@@ -2049,8 +2046,8 @@ std_return: | |||
2049 | abort_return: | 2046 | abort_return: |
2050 | cancel_flags |= XFS_TRANS_ABORT; | 2047 | cancel_flags |= XFS_TRANS_ABORT; |
2051 | /* FALLTHROUGH */ | 2048 | /* FALLTHROUGH */ |
2052 | error_return: | ||
2053 | 2049 | ||
2050 | error_return: | ||
2054 | if (tp != NULL) | 2051 | if (tp != NULL) |
2055 | xfs_trans_cancel(tp, cancel_flags); | 2052 | xfs_trans_cancel(tp, cancel_flags); |
2056 | 2053 | ||
@@ -2724,9 +2721,9 @@ std_return: | |||
2724 | abort_return: | 2721 | abort_return: |
2725 | cancel_flags |= XFS_TRANS_ABORT; | 2722 | cancel_flags |= XFS_TRANS_ABORT; |
2726 | /* FALLTHROUGH */ | 2723 | /* FALLTHROUGH */ |
2724 | |||
2727 | error_return: | 2725 | error_return: |
2728 | xfs_trans_cancel(tp, cancel_flags); | 2726 | xfs_trans_cancel(tp, cancel_flags); |
2729 | |||
2730 | goto std_return; | 2727 | goto std_return; |
2731 | } | 2728 | } |
2732 | /* | 2729 | /* |
@@ -3199,10 +3196,12 @@ std_return: | |||
3199 | } | 3196 | } |
3200 | return error; | 3197 | return error; |
3201 | 3198 | ||
3202 | error1: | 3199 | error1: |
3203 | xfs_bmap_cancel(&free_list); | 3200 | xfs_bmap_cancel(&free_list); |
3204 | cancel_flags |= XFS_TRANS_ABORT; | 3201 | cancel_flags |= XFS_TRANS_ABORT; |
3205 | error_return: | 3202 | /* FALLTHROUGH */ |
3203 | |||
3204 | error_return: | ||
3206 | xfs_trans_cancel(tp, cancel_flags); | 3205 | xfs_trans_cancel(tp, cancel_flags); |
3207 | goto std_return; | 3206 | goto std_return; |
3208 | } | 3207 | } |
@@ -3618,9 +3617,9 @@ xfs_rwlock( | |||
3618 | if (locktype == VRWLOCK_WRITE) { | 3617 | if (locktype == VRWLOCK_WRITE) { |
3619 | xfs_ilock(ip, XFS_IOLOCK_EXCL); | 3618 | xfs_ilock(ip, XFS_IOLOCK_EXCL); |
3620 | } else if (locktype == VRWLOCK_TRY_READ) { | 3619 | } else if (locktype == VRWLOCK_TRY_READ) { |
3621 | return (xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED)); | 3620 | return xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED); |
3622 | } else if (locktype == VRWLOCK_TRY_WRITE) { | 3621 | } else if (locktype == VRWLOCK_TRY_WRITE) { |
3623 | return (xfs_ilock_nowait(ip, XFS_IOLOCK_EXCL)); | 3622 | return xfs_ilock_nowait(ip, XFS_IOLOCK_EXCL); |
3624 | } else { | 3623 | } else { |
3625 | ASSERT((locktype == VRWLOCK_READ) || | 3624 | ASSERT((locktype == VRWLOCK_READ) || |
3626 | (locktype == VRWLOCK_WRITE_DIRECT)); | 3625 | (locktype == VRWLOCK_WRITE_DIRECT)); |
@@ -3868,7 +3867,7 @@ xfs_finish_reclaim( | |||
3868 | xfs_ifunlock(ip); | 3867 | xfs_ifunlock(ip); |
3869 | xfs_iunlock(ip, XFS_ILOCK_EXCL); | 3868 | xfs_iunlock(ip, XFS_ILOCK_EXCL); |
3870 | } | 3869 | } |
3871 | return(1); | 3870 | return 1; |
3872 | } | 3871 | } |
3873 | ip->i_flags |= XFS_IRECLAIM; | 3872 | ip->i_flags |= XFS_IRECLAIM; |
3874 | write_unlock(&ih->ih_lock); | 3873 | write_unlock(&ih->ih_lock); |
@@ -4045,7 +4044,7 @@ xfs_alloc_file_space( | |||
4045 | offset, end_dmi_offset - offset, | 4044 | offset, end_dmi_offset - offset, |
4046 | 0, NULL); | 4045 | 0, NULL); |
4047 | if (error) | 4046 | if (error) |
4048 | return(error); | 4047 | return error; |
4049 | } | 4048 | } |
4050 | 4049 | ||
4051 | /* | 4050 | /* |
@@ -4305,7 +4304,7 @@ xfs_free_file_space( | |||
4305 | offset, end_dmi_offset - offset, | 4304 | offset, end_dmi_offset - offset, |
4306 | AT_DELAY_FLAG(attr_flags), NULL); | 4305 | AT_DELAY_FLAG(attr_flags), NULL); |
4307 | if (error) | 4306 | if (error) |
4308 | return(error); | 4307 | return error; |
4309 | } | 4308 | } |
4310 | 4309 | ||
4311 | ASSERT(attr_flags & ATTR_NOLOCK ? attr_flags & ATTR_DMI : 1); | 4310 | ASSERT(attr_flags & ATTR_NOLOCK ? attr_flags & ATTR_DMI : 1); |
diff --git a/include/asm-v850/ptrace.h b/include/asm-v850/ptrace.h index 7bf72bb5078..4f35cf2cd64 100644 --- a/include/asm-v850/ptrace.h +++ b/include/asm-v850/ptrace.h | |||
@@ -92,7 +92,7 @@ struct pt_regs | |||
92 | /* The number of bytes used to store each register. */ | 92 | /* The number of bytes used to store each register. */ |
93 | #define _PT_REG_SIZE 4 | 93 | #define _PT_REG_SIZE 4 |
94 | 94 | ||
95 | /* Offset of a general purpose register in a stuct pt_regs. */ | 95 | /* Offset of a general purpose register in a struct pt_regs. */ |
96 | #define PT_GPR(num) ((num) * _PT_REG_SIZE) | 96 | #define PT_GPR(num) ((num) * _PT_REG_SIZE) |
97 | 97 | ||
98 | /* Offsets of various special registers & fields in a struct pt_regs. */ | 98 | /* Offsets of various special registers & fields in a struct pt_regs. */ |
diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h index 6351c4055ac..bac0fb389cf 100644 --- a/include/linux/pfkeyv2.h +++ b/include/linux/pfkeyv2.h | |||
@@ -104,7 +104,7 @@ struct sadb_prop { | |||
104 | /* followed by: | 104 | /* followed by: |
105 | struct sadb_comb sadb_combs[(sadb_prop_len + | 105 | struct sadb_comb sadb_combs[(sadb_prop_len + |
106 | sizeof(uint64_t) - sizeof(struct sadb_prop)) / | 106 | sizeof(uint64_t) - sizeof(struct sadb_prop)) / |
107 | sizeof(strut sadb_comb)]; */ | 107 | sizeof(struct sadb_comb)]; */ |
108 | 108 | ||
109 | struct sadb_comb { | 109 | struct sadb_comb { |
110 | uint8_t sadb_comb_auth; | 110 | uint8_t sadb_comb_auth; |
diff --git a/init/Kconfig b/init/Kconfig index 25f4d74adf7..7efa729d2cf 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -99,7 +99,7 @@ config SWAP | |||
99 | default y | 99 | default y |
100 | help | 100 | help |
101 | This option allows you to choose whether you want to have support | 101 | This option allows you to choose whether you want to have support |
102 | for socalled swap devices or swap files in your kernel that are | 102 | for so called swap devices or swap files in your kernel that are |
103 | used to provide more virtual memory than the actual RAM present | 103 | used to provide more virtual memory than the actual RAM present |
104 | in your computer. If unsure say Y. | 104 | in your computer. If unsure say Y. |
105 | 105 | ||
@@ -12,7 +12,7 @@ | |||
12 | * | 12 | * |
13 | * mostly rewritten, threaded and wake-one semantics added | 13 | * mostly rewritten, threaded and wake-one semantics added |
14 | * MSGMAX limit removed, sysctl's added | 14 | * MSGMAX limit removed, sysctl's added |
15 | * (c) 1999 Manfred Spraul <manfreds@colorfullife.com> | 15 | * (c) 1999 Manfred Spraul <manfred@colorfullife.com> |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/capability.h> | 18 | #include <linux/capability.h> |
@@ -56,7 +56,7 @@ | |||
56 | * /proc/sysvipc/sem support (c) 1999 Dragos Acostachioaie <dragos@iname.com> | 56 | * /proc/sysvipc/sem support (c) 1999 Dragos Acostachioaie <dragos@iname.com> |
57 | * | 57 | * |
58 | * SMP-threaded, sysctl's added | 58 | * SMP-threaded, sysctl's added |
59 | * (c) 1999 Manfred Spraul <manfreds@colorfullife.com> | 59 | * (c) 1999 Manfred Spraul <manfred@colorfullife.com> |
60 | * Enforced range limit on SEM_UNDO | 60 | * Enforced range limit on SEM_UNDO |
61 | * (c) 2001 Red Hat Inc <alan@redhat.com> | 61 | * (c) 2001 Red Hat Inc <alan@redhat.com> |
62 | * Lockless wakeup | 62 | * Lockless wakeup |
diff --git a/ipc/util.c b/ipc/util.c index 38b9a0af3bd..862621980b0 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Occurs in several places in the IPC code. | 7 | * Occurs in several places in the IPC code. |
8 | * Chris Evans, <chris@ferret.lmh.ox.ac.uk> | 8 | * Chris Evans, <chris@ferret.lmh.ox.ac.uk> |
9 | * Nov 1999 - ipc helper functions, unified SMP locking | 9 | * Nov 1999 - ipc helper functions, unified SMP locking |
10 | * Manfred Spraul <manfreds@colorfullife.com> | 10 | * Manfred Spraul <manfred@colorfullife.com> |
11 | * Oct 2002 - One lock per IPC id. RCU ipc_free for lock-free grow_ary(). | 11 | * Oct 2002 - One lock per IPC id. RCU ipc_free for lock-free grow_ary(). |
12 | * Mingming Cao <cmm@us.ibm.com> | 12 | * Mingming Cao <cmm@us.ibm.com> |
13 | */ | 13 | */ |
diff --git a/ipc/util.h b/ipc/util.h index fc9a28be079..efaff3ee7de 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * linux/ipc/util.h | 2 | * linux/ipc/util.h |
3 | * Copyright (C) 1999 Christoph Rohland | 3 | * Copyright (C) 1999 Christoph Rohland |
4 | * | 4 | * |
5 | * ipc helper functions (c) 1999 Manfred Spraul <manfreds@colorfullife.com> | 5 | * ipc helper functions (c) 1999 Manfred Spraul <manfred@colorfullife.com> |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #ifndef _IPC_UTIL_H | 8 | #ifndef _IPC_UTIL_H |
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 5ec248cb7f4..9fd8d4f0359 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig | |||
@@ -38,7 +38,7 @@ config PM_DEBUG | |||
38 | 38 | ||
39 | config SOFTWARE_SUSPEND | 39 | config SOFTWARE_SUSPEND |
40 | bool "Software Suspend" | 40 | bool "Software Suspend" |
41 | depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FVR || PPC32) && !SMP) | 41 | depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP) |
42 | ---help--- | 42 | ---help--- |
43 | Enable the possibility of suspending the machine. | 43 | Enable the possibility of suspending the machine. |
44 | It doesn't need APM. | 44 | It doesn't need APM. |
diff --git a/kernel/printk.c b/kernel/printk.c index 2251be80cd2..13ced0f7828 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * Ted Ts'o, 2/11/93. | 11 | * Ted Ts'o, 2/11/93. |
12 | * Modified for sysctl support, 1/8/97, Chris Horn. | 12 | * Modified for sysctl support, 1/8/97, Chris Horn. |
13 | * Fixed SMP synchronization, 08/08/99, Manfred Spraul | 13 | * Fixed SMP synchronization, 08/08/99, Manfred Spraul |
14 | * manfreds@colorfullife.com | 14 | * manfred@colorfullife.com |
15 | * Rewrote bits to get rid of console_lock | 15 | * Rewrote bits to get rid of console_lock |
16 | * 01Mar01 Andrew Morton <andrewm@uow.edu.au> | 16 | * 01Mar01 Andrew Morton <andrewm@uow.edu.au> |
17 | */ | 17 | */ |
diff --git a/sound/oss/opl3sa2.c b/sound/oss/opl3sa2.c index 5cecdbcbea9..0e161c6a047 100644 --- a/sound/oss/opl3sa2.c +++ b/sound/oss/opl3sa2.c | |||
@@ -530,7 +530,7 @@ static void __init attach_opl3sa2_mss(struct address_info* hw_config, struct res | |||
530 | if (hw_config->slots[0] != -1) { | 530 | if (hw_config->slots[0] != -1) { |
531 | /* Did the MSS driver install? */ | 531 | /* Did the MSS driver install? */ |
532 | if(num_mixers == (initial_mixers + 1)) { | 532 | if(num_mixers == (initial_mixers + 1)) { |
533 | /* The MSS mixer is installed, reroute mixers appropiately */ | 533 | /* The MSS mixer is installed, reroute mixers appropriately */ |
534 | AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_CD); | 534 | AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_CD); |
535 | AD1848_REROUTE(SOUND_MIXER_LINE2, SOUND_MIXER_SYNTH); | 535 | AD1848_REROUTE(SOUND_MIXER_LINE2, SOUND_MIXER_SYNTH); |
536 | AD1848_REROUTE(SOUND_MIXER_LINE3, SOUND_MIXER_LINE); | 536 | AD1848_REROUTE(SOUND_MIXER_LINE3, SOUND_MIXER_LINE); |