diff options
311 files changed, 5171 insertions, 3162 deletions
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt index bc107cb157a8..4868c34f7509 100644 --- a/Documentation/cpu-hotplug.txt +++ b/Documentation/cpu-hotplug.txt | |||
| @@ -46,7 +46,7 @@ maxcpus=n Restrict boot time cpus to n. Say if you have 4 cpus, using | |||
| 46 | maxcpus=2 will only boot 2. You can choose to bring the | 46 | maxcpus=2 will only boot 2. You can choose to bring the |
| 47 | other cpus later online, read FAQ's for more info. | 47 | other cpus later online, read FAQ's for more info. |
| 48 | 48 | ||
| 49 | additional_cpus*=n Use this to limit hotpluggable cpus. This option sets | 49 | additional_cpus=n (*) Use this to limit hotpluggable cpus. This option sets |
| 50 | cpu_possible_map = cpu_present_map + additional_cpus | 50 | cpu_possible_map = cpu_present_map + additional_cpus |
| 51 | 51 | ||
| 52 | (*) Option valid only for following architectures | 52 | (*) Option valid only for following architectures |
| @@ -101,15 +101,15 @@ cpu_possible_map/for_each_possible_cpu() to iterate. | |||
| 101 | 101 | ||
| 102 | Never use anything other than cpumask_t to represent bitmap of CPUs. | 102 | Never use anything other than cpumask_t to represent bitmap of CPUs. |
| 103 | 103 | ||
| 104 | #include <linux/cpumask.h> | 104 | #include <linux/cpumask.h> |
| 105 | 105 | ||
| 106 | for_each_possible_cpu - Iterate over cpu_possible_map | 106 | for_each_possible_cpu - Iterate over cpu_possible_map |
| 107 | for_each_online_cpu - Iterate over cpu_online_map | 107 | for_each_online_cpu - Iterate over cpu_online_map |
| 108 | for_each_present_cpu - Iterate over cpu_present_map | 108 | for_each_present_cpu - Iterate over cpu_present_map |
| 109 | for_each_cpu_mask(x,mask) - Iterate over some random collection of cpu mask. | 109 | for_each_cpu_mask(x,mask) - Iterate over some random collection of cpu mask. |
| 110 | 110 | ||
| 111 | #include <linux/cpu.h> | 111 | #include <linux/cpu.h> |
| 112 | lock_cpu_hotplug() and unlock_cpu_hotplug(): | 112 | lock_cpu_hotplug() and unlock_cpu_hotplug(): |
| 113 | 113 | ||
| 114 | The above calls are used to inhibit cpu hotplug operations. While holding the | 114 | The above calls are used to inhibit cpu hotplug operations. While holding the |
| 115 | cpucontrol mutex, cpu_online_map will not change. If you merely need to avoid | 115 | cpucontrol mutex, cpu_online_map will not change. If you merely need to avoid |
| @@ -120,7 +120,7 @@ will work as long as stop_machine_run() is used to take a cpu down. | |||
| 120 | 120 | ||
| 121 | CPU Hotplug - Frequently Asked Questions. | 121 | CPU Hotplug - Frequently Asked Questions. |
| 122 | 122 | ||
| 123 | Q: How to i enable my kernel to support CPU hotplug? | 123 | Q: How to enable my kernel to support CPU hotplug? |
| 124 | A: When doing make defconfig, Enable CPU hotplug support | 124 | A: When doing make defconfig, Enable CPU hotplug support |
| 125 | 125 | ||
| 126 | "Processor type and Features" -> Support for Hotpluggable CPUs | 126 | "Processor type and Features" -> Support for Hotpluggable CPUs |
| @@ -141,39 +141,39 @@ A: You should now notice an entry in sysfs. | |||
| 141 | Check if sysfs is mounted, using the "mount" command. You should notice | 141 | Check if sysfs is mounted, using the "mount" command. You should notice |
| 142 | an entry as shown below in the output. | 142 | an entry as shown below in the output. |
| 143 | 143 | ||
| 144 | .... | 144 | .... |
| 145 | none on /sys type sysfs (rw) | 145 | none on /sys type sysfs (rw) |
| 146 | .... | 146 | .... |
| 147 | 147 | ||
| 148 | if this is not mounted, do the following. | 148 | If this is not mounted, do the following. |
| 149 | 149 | ||
| 150 | #mkdir /sysfs | 150 | #mkdir /sysfs |
| 151 | #mount -t sysfs sys /sys | 151 | #mount -t sysfs sys /sys |
| 152 | 152 | ||
| 153 | now you should see entries for all present cpu, the following is an example | 153 | Now you should see entries for all present cpu, the following is an example |
| 154 | in a 8-way system. | 154 | in a 8-way system. |
| 155 | 155 | ||
| 156 | #pwd | 156 | #pwd |
| 157 | #/sys/devices/system/cpu | 157 | #/sys/devices/system/cpu |
| 158 | #ls -l | 158 | #ls -l |
| 159 | total 0 | 159 | total 0 |
| 160 | drwxr-xr-x 10 root root 0 Sep 19 07:44 . | 160 | drwxr-xr-x 10 root root 0 Sep 19 07:44 . |
| 161 | drwxr-xr-x 13 root root 0 Sep 19 07:45 .. | 161 | drwxr-xr-x 13 root root 0 Sep 19 07:45 .. |
| 162 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu0 | 162 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu0 |
| 163 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu1 | 163 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu1 |
| 164 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu2 | 164 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu2 |
| 165 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu3 | 165 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu3 |
| 166 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu4 | 166 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu4 |
| 167 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu5 | 167 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu5 |
| 168 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu6 | 168 | drwxr-xr-x 3 root root 0 Sep 19 07:44 cpu6 |
| 169 | drwxr-xr-x 3 root root 0 Sep 19 07:48 cpu7 | 169 | drwxr-xr-x 3 root root 0 Sep 19 07:48 cpu7 |
| 170 | 170 | ||
| 171 | Under each directory you would find an "online" file which is the control | 171 | Under each directory you would find an "online" file which is the control |
| 172 | file to logically online/offline a processor. | 172 | file to logically online/offline a processor. |
| 173 | 173 | ||
| 174 | Q: Does hot-add/hot-remove refer to physical add/remove of cpus? | 174 | Q: Does hot-add/hot-remove refer to physical add/remove of cpus? |
| 175 | A: The usage of hot-add/remove may not be very consistently used in the code. | 175 | A: The usage of hot-add/remove may not be very consistently used in the code. |
| 176 | CONFIG_CPU_HOTPLUG enables logical online/offline capability in the kernel. | 176 | CONFIG_HOTPLUG_CPU enables logical online/offline capability in the kernel. |
| 177 | To support physical addition/removal, one would need some BIOS hooks and | 177 | To support physical addition/removal, one would need some BIOS hooks and |
| 178 | the platform should have something like an attention button in PCI hotplug. | 178 | the platform should have something like an attention button in PCI hotplug. |
| 179 | CONFIG_ACPI_HOTPLUG_CPU enables ACPI support for physical add/remove of CPUs. | 179 | CONFIG_ACPI_HOTPLUG_CPU enables ACPI support for physical add/remove of CPUs. |
| @@ -181,17 +181,17 @@ CONFIG_ACPI_HOTPLUG_CPU enables ACPI support for physical add/remove of CPUs. | |||
| 181 | Q: How do i logically offline a CPU? | 181 | Q: How do i logically offline a CPU? |
| 182 | A: Do the following. | 182 | A: Do the following. |
| 183 | 183 | ||
| 184 | #echo 0 > /sys/devices/system/cpu/cpuX/online | 184 | #echo 0 > /sys/devices/system/cpu/cpuX/online |
| 185 | 185 | ||
| 186 | once the logical offline is successful, check | 186 | Once the logical offline is successful, check |
| 187 | 187 | ||
| 188 | #cat /proc/interrupts | 188 | #cat /proc/interrupts |
| 189 | 189 | ||
| 190 | you should now not see the CPU that you removed. Also online file will report | 190 | You should now not see the CPU that you removed. Also online file will report |
| 191 | the state as 0 when a cpu if offline and 1 when its online. | 191 | the state as 0 when a cpu if offline and 1 when its online. |
| 192 | 192 | ||
| 193 | #To display the current cpu state. | 193 | #To display the current cpu state. |
| 194 | #cat /sys/devices/system/cpu/cpuX/online | 194 | #cat /sys/devices/system/cpu/cpuX/online |
| 195 | 195 | ||
| 196 | Q: Why cant i remove CPU0 on some systems? | 196 | Q: Why cant i remove CPU0 on some systems? |
| 197 | A: Some architectures may have some special dependency on a certain CPU. | 197 | A: Some architectures may have some special dependency on a certain CPU. |
| @@ -234,8 +234,8 @@ Q: If i have some kernel code that needs to be aware of CPU arrival and | |||
| 234 | departure, how to i arrange for proper notification? | 234 | departure, how to i arrange for proper notification? |
| 235 | A: This is what you would need in your kernel code to receive notifications. | 235 | A: This is what you would need in your kernel code to receive notifications. |
| 236 | 236 | ||
| 237 | #include <linux/cpu.h> | 237 | #include <linux/cpu.h> |
| 238 | static int __cpuinit foobar_cpu_callback(struct notifier_block *nfb, | 238 | static int __cpuinit foobar_cpu_callback(struct notifier_block *nfb, |
| 239 | unsigned long action, void *hcpu) | 239 | unsigned long action, void *hcpu) |
| 240 | { | 240 | { |
| 241 | unsigned int cpu = (unsigned long)hcpu; | 241 | unsigned int cpu = (unsigned long)hcpu; |
| @@ -279,10 +279,10 @@ Q: I don't see my action being called for all CPUs already up and running? | |||
| 279 | A: Yes, CPU notifiers are called only when new CPUs are on-lined or offlined. | 279 | A: Yes, CPU notifiers are called only when new CPUs are on-lined or offlined. |
| 280 | If you need to perform some action for each cpu already in the system, then | 280 | If you need to perform some action for each cpu already in the system, then |
| 281 | 281 | ||
| 282 | for_each_online_cpu(i) { | 282 | for_each_online_cpu(i) { |
| 283 | foobar_cpu_callback(&foobar_cpu_notifier, CPU_UP_PREPARE, i); | 283 | foobar_cpu_callback(&foobar_cpu_notifier, CPU_UP_PREPARE, i); |
| 284 | foobar_cpu_callback(&foobar-cpu_notifier, CPU_ONLINE, i); | 284 | foobar_cpu_callback(&foobar_cpu_notifier, CPU_ONLINE, i); |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | Q: If i would like to develop cpu hotplug support for a new architecture, | 287 | Q: If i would like to develop cpu hotplug support for a new architecture, |
| 288 | what do i need at a minimum? | 288 | what do i need at a minimum? |
| @@ -307,38 +307,38 @@ Q: I need to ensure that a particular cpu is not removed when there is some | |||
| 307 | work specific to this cpu is in progress. | 307 | work specific to this cpu is in progress. |
| 308 | A: First switch the current thread context to preferred cpu | 308 | A: First switch the current thread context to preferred cpu |
| 309 | 309 | ||
| 310 | int my_func_on_cpu(int cpu) | 310 | int my_func_on_cpu(int cpu) |
| 311 | { | 311 | { |
| 312 | cpumask_t saved_mask, new_mask = CPU_MASK_NONE; | 312 | cpumask_t saved_mask, new_mask = CPU_MASK_NONE; |
| 313 | int curr_cpu, err = 0; | 313 | int curr_cpu, err = 0; |
| 314 | 314 | ||
| 315 | saved_mask = current->cpus_allowed; | 315 | saved_mask = current->cpus_allowed; |
| 316 | cpu_set(cpu, new_mask); | 316 | cpu_set(cpu, new_mask); |
| 317 | err = set_cpus_allowed(current, new_mask); | 317 | err = set_cpus_allowed(current, new_mask); |
| 318 | 318 | ||
| 319 | if (err) | 319 | if (err) |
| 320 | return err; | 320 | return err; |
| 321 | 321 | ||
| 322 | /* | 322 | /* |
| 323 | * If we got scheduled out just after the return from | 323 | * If we got scheduled out just after the return from |
| 324 | * set_cpus_allowed() before running the work, this ensures | 324 | * set_cpus_allowed() before running the work, this ensures |
| 325 | * we stay locked. | 325 | * we stay locked. |
| 326 | */ | 326 | */ |
| 327 | curr_cpu = get_cpu(); | 327 | curr_cpu = get_cpu(); |
| 328 | 328 | ||
| 329 | if (curr_cpu != cpu) { | 329 | if (curr_cpu != cpu) { |
| 330 | err = -EAGAIN; | 330 | err = -EAGAIN; |
| 331 | goto ret; | 331 | goto ret; |
| 332 | } else { | 332 | } else { |
| 333 | /* | 333 | /* |
| 334 | * Do work : But cant sleep, since get_cpu() disables preempt | 334 | * Do work : But cant sleep, since get_cpu() disables preempt |
| 335 | */ | 335 | */ |
| 336 | } | 336 | } |
| 337 | ret: | 337 | ret: |
| 338 | put_cpu(); | 338 | put_cpu(); |
| 339 | set_cpus_allowed(current, saved_mask); | 339 | set_cpus_allowed(current, saved_mask); |
| 340 | return err; | 340 | return err; |
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | 343 | ||
| 344 | Q: How do we determine how many CPUs are available for hotplug. | 344 | Q: How do we determine how many CPUs are available for hotplug. |
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index 994355b0cd19..7f790f66ec68 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt | |||
| @@ -1898,7 +1898,7 @@ queue before processing any further requests: | |||
| 1898 | smp_wmb(); | 1898 | smp_wmb(); |
| 1899 | <A:modify v=2> <C:busy> | 1899 | <A:modify v=2> <C:busy> |
| 1900 | <C:queue v=2> | 1900 | <C:queue v=2> |
| 1901 | p = &b; q = p; | 1901 | p = &v; q = p; |
| 1902 | <D:request p> | 1902 | <D:request p> |
| 1903 | <B:modify p=&v> <D:commit p=&v> | 1903 | <B:modify p=&v> <D:commit p=&v> |
| 1904 | <D:read p> | 1904 | <D:read p> |
diff --git a/Documentation/mips/time.README b/Documentation/mips/time.README index 69ddc5c14b79..e1304b6bc483 100644 --- a/Documentation/mips/time.README +++ b/Documentation/mips/time.README | |||
| @@ -63,7 +63,7 @@ the following functions or values: | |||
| 63 | a) board_time_init - a function pointer. Invoked at the beginnig of | 63 | a) board_time_init - a function pointer. Invoked at the beginnig of |
| 64 | time_init(). It is optional. | 64 | time_init(). It is optional. |
| 65 | 1. (optional) set up RTC routines | 65 | 1. (optional) set up RTC routines |
| 66 | 2. (optional) calibrate and set the mips_counter_frequency | 66 | 2. (optional) calibrate and set the mips_hpt_frequency |
| 67 | 67 | ||
| 68 | b) plat_timer_setup - a function pointer. Invoked at the end of time_init() | 68 | b) plat_timer_setup - a function pointer. Invoked at the end of time_init() |
| 69 | 1. (optional) over-ride any decisions made in time_init() | 69 | 1. (optional) over-ride any decisions made in time_init() |
| @@ -72,7 +72,7 @@ the following functions or values: | |||
| 72 | 72 | ||
| 73 | c) (optional) board-specific RTC routines. | 73 | c) (optional) board-specific RTC routines. |
| 74 | 74 | ||
| 75 | d) (optional) mips_counter_frequency - It must be definied if the board | 75 | d) (optional) mips_hpt_frequency - It must be definied if the board |
| 76 | is using CPU counter for timer interrupt or it is using fixed rate | 76 | is using CPU counter for timer interrupt or it is using fixed rate |
| 77 | gettimeoffset(). | 77 | gettimeoffset(). |
| 78 | 78 | ||
| @@ -104,7 +104,7 @@ Step 1: decide how you like to implement the time services. | |||
| 104 | or use an exnternal timer? | 104 | or use an exnternal timer? |
| 105 | 105 | ||
| 106 | In order to use CPU counter register as the timer interrupt source, you | 106 | In order to use CPU counter register as the timer interrupt source, you |
| 107 | must know the counter speed (mips_counter_frequency). It is usually the | 107 | must know the counter speed (mips_hpt_frequency). It is usually the |
| 108 | same as the CPU speed or an integral divisor of it. | 108 | same as the CPU speed or an integral divisor of it. |
| 109 | 109 | ||
| 110 | d) decide on whether you want to use high-level or low-level timer | 110 | d) decide on whether you want to use high-level or low-level timer |
| @@ -121,8 +121,8 @@ Step 3: implement rtc routines, board_time_init() and plat_timer_setup() | |||
| 121 | if needed. | 121 | if needed. |
| 122 | 122 | ||
| 123 | board_time_init() - | 123 | board_time_init() - |
| 124 | a) (optional) set up RTC routines, | 124 | a) (optional) set up RTC routines, |
| 125 | b) (optional) calibrate and set the mips_counter_frequency | 125 | b) (optional) calibrate and set the mips_hpt_frequency |
| 126 | (only needed if you intended to use fixed_rate_gettimeoffset | 126 | (only needed if you intended to use fixed_rate_gettimeoffset |
| 127 | or use cpu counter as timer interrupt source) | 127 | or use cpu counter as timer interrupt source) |
| 128 | 128 | ||
| @@ -499,6 +499,7 @@ endif | |||
| 499 | 499 | ||
| 500 | ifdef CONFIG_UNWIND_INFO | 500 | ifdef CONFIG_UNWIND_INFO |
| 501 | CFLAGS += -fasynchronous-unwind-tables | 501 | CFLAGS += -fasynchronous-unwind-tables |
| 502 | LDFLAGS_vmlinux += --eh-frame-hdr | ||
| 502 | endif | 503 | endif |
| 503 | 504 | ||
| 504 | ifdef CONFIG_DEBUG_INFO | 505 | ifdef CONFIG_DEBUG_INFO |
diff --git a/arch/arm/mach-lh7a40x/common.h b/arch/arm/mach-lh7a40x/common.h index 18e8bb4eb202..0ca20c6c83b7 100644 --- a/arch/arm/mach-lh7a40x/common.h +++ b/arch/arm/mach-lh7a40x/common.h | |||
| @@ -15,4 +15,4 @@ extern void lh7a404_init_irq (void); | |||
| 15 | extern void lh7a40x_clcd_init (void); | 15 | extern void lh7a40x_clcd_init (void); |
| 16 | extern void lh7a40x_init_board_irq (void); | 16 | extern void lh7a40x_init_board_irq (void); |
| 17 | 17 | ||
| 18 | #define IRQ_DISPATCH(irq) desc_handle_irq((irq),(irq_desc + irq), regs) | 18 | #define IRQ_DISPATCH(irq) desc_handle_irq((irq),(irq_desc + irq)) |
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 7cc0b189b82b..0677908dfa06 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile | |||
| @@ -42,6 +42,10 @@ cflags-$(CONFIG_REGPARM) += -mregparm=3 | |||
| 42 | # temporary until string.h is fixed | 42 | # temporary until string.h is fixed |
| 43 | cflags-y += -ffreestanding | 43 | cflags-y += -ffreestanding |
| 44 | 44 | ||
| 45 | # this works around some issues with generating unwind tables in older gccs | ||
| 46 | # newer gccs do it by default | ||
| 47 | cflags-y += -maccumulate-outgoing-args | ||
| 48 | |||
| 45 | # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use | 49 | # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use |
| 46 | # a lot more stack due to the lack of sharing of stacklots: | 50 | # a lot more stack due to the lack of sharing of stacklots: |
| 47 | CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-option,-fno-unit-at-a-time); fi ;) | 51 | CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-option,-fno-unit-at-a-time); fi ;) |
| @@ -51,8 +55,8 @@ cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | |||
| 51 | AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | 55 | AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) |
| 52 | 56 | ||
| 53 | # is .cfi_signal_frame supported too? | 57 | # is .cfi_signal_frame supported too? |
| 54 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | 58 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,) |
| 55 | AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | 59 | AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,) |
| 56 | 60 | ||
| 57 | CFLAGS += $(cflags-y) | 61 | CFLAGS += $(cflags-y) |
| 58 | 62 | ||
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 60c0c02574f0..97aacd6bd7d8 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19-rc1 | 3 | # Linux kernel version: 2.6.19-rc2-git4 |
| 4 | # Thu Oct 5 13:04:53 2006 | 4 | # Sat Oct 21 03:38:56 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_X86_32=y | 6 | CONFIG_X86_32=y |
| 7 | CONFIG_GENERIC_TIME=y | 7 | CONFIG_GENERIC_TIME=y |
| @@ -380,8 +380,8 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
| 380 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 380 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 381 | # CONFIG_INET6_XFRM_MODE_BEET is not set | 381 | # CONFIG_INET6_XFRM_MODE_BEET is not set |
| 382 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 382 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 383 | CONFIG_IPV6_SIT=y | ||
| 383 | # CONFIG_IPV6_TUNNEL is not set | 384 | # CONFIG_IPV6_TUNNEL is not set |
| 384 | # CONFIG_IPV6_SUBTREES is not set | ||
| 385 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 385 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 386 | # CONFIG_NETWORK_SECMARK is not set | 386 | # CONFIG_NETWORK_SECMARK is not set |
| 387 | # CONFIG_NETFILTER is not set | 387 | # CONFIG_NETFILTER is not set |
| @@ -483,6 +483,13 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 483 | # CONFIG_ATA_OVER_ETH is not set | 483 | # CONFIG_ATA_OVER_ETH is not set |
| 484 | 484 | ||
| 485 | # | 485 | # |
| 486 | # Misc devices | ||
| 487 | # | ||
| 488 | # CONFIG_IBM_ASM is not set | ||
| 489 | # CONFIG_SGI_IOC4 is not set | ||
| 490 | # CONFIG_TIFM_CORE is not set | ||
| 491 | |||
| 492 | # | ||
| 486 | # ATA/ATAPI/MFM/RLL support | 493 | # ATA/ATAPI/MFM/RLL support |
| 487 | # | 494 | # |
| 488 | CONFIG_IDE=y | 495 | CONFIG_IDE=y |
| @@ -1024,6 +1031,7 @@ CONFIG_HANGCHECK_TIMER=y | |||
| 1024 | # | 1031 | # |
| 1025 | # Dallas's 1-wire bus | 1032 | # Dallas's 1-wire bus |
| 1026 | # | 1033 | # |
| 1034 | # CONFIG_W1 is not set | ||
| 1027 | 1035 | ||
| 1028 | # | 1036 | # |
| 1029 | # Hardware Monitoring support | 1037 | # Hardware Monitoring support |
| @@ -1032,12 +1040,6 @@ CONFIG_HANGCHECK_TIMER=y | |||
| 1032 | # CONFIG_HWMON_VID is not set | 1040 | # CONFIG_HWMON_VID is not set |
| 1033 | 1041 | ||
| 1034 | # | 1042 | # |
| 1035 | # Misc devices | ||
| 1036 | # | ||
| 1037 | # CONFIG_IBM_ASM is not set | ||
| 1038 | # CONFIG_TIFM_CORE is not set | ||
| 1039 | |||
| 1040 | # | ||
| 1041 | # Multimedia devices | 1043 | # Multimedia devices |
| 1042 | # | 1044 | # |
| 1043 | # CONFIG_VIDEO_DEV is not set | 1045 | # CONFIG_VIDEO_DEV is not set |
| @@ -1169,7 +1171,6 @@ CONFIG_USB_HIDINPUT=y | |||
| 1169 | # CONFIG_USB_ATI_REMOTE2 is not set | 1171 | # CONFIG_USB_ATI_REMOTE2 is not set |
| 1170 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1172 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 1171 | # CONFIG_USB_APPLETOUCH is not set | 1173 | # CONFIG_USB_APPLETOUCH is not set |
| 1172 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1173 | 1174 | ||
| 1174 | # | 1175 | # |
| 1175 | # USB Imaging devices | 1176 | # USB Imaging devices |
| @@ -1215,6 +1216,7 @@ CONFIG_USB_MON=y | |||
| 1215 | # CONFIG_USB_APPLEDISPLAY is not set | 1216 | # CONFIG_USB_APPLEDISPLAY is not set |
| 1216 | # CONFIG_USB_SISUSBVGA is not set | 1217 | # CONFIG_USB_SISUSBVGA is not set |
| 1217 | # CONFIG_USB_LD is not set | 1218 | # CONFIG_USB_LD is not set |
| 1219 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1218 | # CONFIG_USB_TEST is not set | 1220 | # CONFIG_USB_TEST is not set |
| 1219 | 1221 | ||
| 1220 | # | 1222 | # |
| @@ -1284,6 +1286,7 @@ CONFIG_EXT3_FS=y | |||
| 1284 | CONFIG_EXT3_FS_XATTR=y | 1286 | CONFIG_EXT3_FS_XATTR=y |
| 1285 | CONFIG_EXT3_FS_POSIX_ACL=y | 1287 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1286 | # CONFIG_EXT3_FS_SECURITY is not set | 1288 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1289 | # CONFIG_EXT4DEV_FS is not set | ||
| 1287 | CONFIG_JBD=y | 1290 | CONFIG_JBD=y |
| 1288 | # CONFIG_JBD_DEBUG is not set | 1291 | # CONFIG_JBD_DEBUG is not set |
| 1289 | CONFIG_FS_MBCACHE=y | 1292 | CONFIG_FS_MBCACHE=y |
| @@ -1307,6 +1310,7 @@ CONFIG_DNOTIFY=y | |||
| 1307 | # CONFIG_AUTOFS_FS is not set | 1310 | # CONFIG_AUTOFS_FS is not set |
| 1308 | CONFIG_AUTOFS4_FS=y | 1311 | CONFIG_AUTOFS4_FS=y |
| 1309 | # CONFIG_FUSE_FS is not set | 1312 | # CONFIG_FUSE_FS is not set |
| 1313 | CONFIG_GENERIC_ACL=y | ||
| 1310 | 1314 | ||
| 1311 | # | 1315 | # |
| 1312 | # CD-ROM/DVD Filesystems | 1316 | # CD-ROM/DVD Filesystems |
| @@ -1384,7 +1388,6 @@ CONFIG_SUNRPC=y | |||
| 1384 | # CONFIG_CODA_FS is not set | 1388 | # CONFIG_CODA_FS is not set |
| 1385 | # CONFIG_AFS_FS is not set | 1389 | # CONFIG_AFS_FS is not set |
| 1386 | # CONFIG_9P_FS is not set | 1390 | # CONFIG_9P_FS is not set |
| 1387 | CONFIG_GENERIC_ACL=y | ||
| 1388 | 1391 | ||
| 1389 | # | 1392 | # |
| 1390 | # Partition Types | 1393 | # Partition Types |
| @@ -1437,10 +1440,6 @@ CONFIG_NLS_ISO8859_15=y | |||
| 1437 | CONFIG_NLS_UTF8=y | 1440 | CONFIG_NLS_UTF8=y |
| 1438 | 1441 | ||
| 1439 | # | 1442 | # |
| 1440 | # Distributed Lock Manager | ||
| 1441 | # | ||
| 1442 | |||
| 1443 | # | ||
| 1444 | # Instrumentation Support | 1443 | # Instrumentation Support |
| 1445 | # | 1444 | # |
| 1446 | CONFIG_PROFILING=y | 1445 | CONFIG_PROFILING=y |
| @@ -1480,6 +1479,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1480 | CONFIG_UNWIND_INFO=y | 1479 | CONFIG_UNWIND_INFO=y |
| 1481 | CONFIG_STACK_UNWIND=y | 1480 | CONFIG_STACK_UNWIND=y |
| 1482 | # CONFIG_FORCED_INLINING is not set | 1481 | # CONFIG_FORCED_INLINING is not set |
| 1482 | # CONFIG_HEADERS_CHECK is not set | ||
| 1483 | # CONFIG_RCU_TORTURE_TEST is not set | 1483 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1484 | # CONFIG_LKDTM is not set | 1484 | # CONFIG_LKDTM is not set |
| 1485 | CONFIG_EARLY_PRINTK=y | 1485 | CONFIG_EARLY_PRINTK=y |
diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c index 28ab80649764..583c238e17fb 100644 --- a/arch/i386/kernel/alternative.c +++ b/arch/i386/kernel/alternative.c | |||
| @@ -344,6 +344,7 @@ void alternatives_smp_switch(int smp) | |||
| 344 | 344 | ||
| 345 | void __init alternative_instructions(void) | 345 | void __init alternative_instructions(void) |
| 346 | { | 346 | { |
| 347 | unsigned long flags; | ||
| 347 | if (no_replacement) { | 348 | if (no_replacement) { |
| 348 | printk(KERN_INFO "(SMP-)alternatives turned off\n"); | 349 | printk(KERN_INFO "(SMP-)alternatives turned off\n"); |
| 349 | free_init_pages("SMP alternatives", | 350 | free_init_pages("SMP alternatives", |
| @@ -351,6 +352,8 @@ void __init alternative_instructions(void) | |||
| 351 | (unsigned long)__smp_alt_end); | 352 | (unsigned long)__smp_alt_end); |
| 352 | return; | 353 | return; |
| 353 | } | 354 | } |
| 355 | |||
| 356 | local_irq_save(flags); | ||
| 354 | apply_alternatives(__alt_instructions, __alt_instructions_end); | 357 | apply_alternatives(__alt_instructions, __alt_instructions_end); |
| 355 | 358 | ||
| 356 | /* switch to patch-once-at-boottime-only mode and free the | 359 | /* switch to patch-once-at-boottime-only mode and free the |
| @@ -386,4 +389,5 @@ void __init alternative_instructions(void) | |||
| 386 | alternatives_smp_switch(0); | 389 | alternatives_smp_switch(0); |
| 387 | } | 390 | } |
| 388 | #endif | 391 | #endif |
| 392 | local_irq_restore(flags); | ||
| 389 | } | 393 | } |
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S index be9d883c62ce..ca31f18d277c 100644 --- a/arch/i386/kernel/head.S +++ b/arch/i386/kernel/head.S | |||
| @@ -317,7 +317,7 @@ is386: movl $2,%ecx # set MP | |||
| 317 | movl %eax,%gs | 317 | movl %eax,%gs |
| 318 | lldt %ax | 318 | lldt %ax |
| 319 | cld # gcc2 wants the direction flag cleared at all times | 319 | cld # gcc2 wants the direction flag cleared at all times |
| 320 | pushl %eax # fake return address | 320 | pushl $0 # fake return address for unwinder |
| 321 | #ifdef CONFIG_SMP | 321 | #ifdef CONFIG_SMP |
| 322 | movb ready, %cl | 322 | movb ready, %cl |
| 323 | movb $1, ready | 323 | movb $1, ready |
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index 3e8e3adb0489..eaafe233a5da 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c | |||
| @@ -219,11 +219,11 @@ static int __init check_nmi_watchdog(void) | |||
| 219 | int cpu; | 219 | int cpu; |
| 220 | 220 | ||
| 221 | /* Enable NMI watchdog for newer systems. | 221 | /* Enable NMI watchdog for newer systems. |
| 222 | Actually it should be safe for most systems before 2004 too except | 222 | Probably safe on most older systems too, but let's be careful. |
| 223 | for some IBM systems that corrupt registers when NMI happens | 223 | IBM ThinkPads use INT10 inside SMM and that allows early NMI inside SMM |
| 224 | during SMM. Unfortunately we don't have more exact information | 224 | which hangs the system. Disable watchdog for all thinkpads */ |
| 225 | on these and use this coarse check. */ | 225 | if (nmi_watchdog == NMI_DEFAULT && dmi_get_year(DMI_BIOS_DATE) >= 2004 && |
| 226 | if (nmi_watchdog == NMI_DEFAULT && dmi_get_year(DMI_BIOS_DATE) >= 2004) | 226 | !dmi_name_in_vendors("ThinkPad")) |
| 227 | nmi_watchdog = NMI_LOCAL_APIC; | 227 | nmi_watchdog = NMI_LOCAL_APIC; |
| 228 | 228 | ||
| 229 | if ((nmi_watchdog == NMI_NONE) || (nmi_watchdog == NMI_DEFAULT)) | 229 | if ((nmi_watchdog == NMI_NONE) || (nmi_watchdog == NMI_DEFAULT)) |
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c index 57d375900afb..1e1fa3e391a3 100644 --- a/arch/i386/kernel/process.c +++ b/arch/i386/kernel/process.c | |||
| @@ -336,7 +336,6 @@ extern void kernel_thread_helper(void); | |||
| 336 | int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) | 336 | int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) |
| 337 | { | 337 | { |
| 338 | struct pt_regs regs; | 338 | struct pt_regs regs; |
| 339 | int err; | ||
| 340 | 339 | ||
| 341 | memset(®s, 0, sizeof(regs)); | 340 | memset(®s, 0, sizeof(regs)); |
| 342 | 341 | ||
| @@ -351,10 +350,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) | |||
| 351 | regs.eflags = X86_EFLAGS_IF | X86_EFLAGS_SF | X86_EFLAGS_PF | 0x2; | 350 | regs.eflags = X86_EFLAGS_IF | X86_EFLAGS_SF | X86_EFLAGS_PF | 0x2; |
| 352 | 351 | ||
| 353 | /* Ok, create the new process.. */ | 352 | /* Ok, create the new process.. */ |
| 354 | err = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL); | 353 | return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, NULL, NULL); |
| 355 | if (err == 0) /* terminate kernel stack */ | ||
| 356 | task_pt_regs(current)->eip = 0; | ||
| 357 | return err; | ||
| 358 | } | 354 | } |
| 359 | EXPORT_SYMBOL(kernel_thread); | 355 | EXPORT_SYMBOL(kernel_thread); |
| 360 | 356 | ||
diff --git a/arch/i386/lib/usercopy.c b/arch/i386/lib/usercopy.c index 258df6b4d7d7..d22cfc9d656c 100644 --- a/arch/i386/lib/usercopy.c +++ b/arch/i386/lib/usercopy.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/highmem.h> | 9 | #include <linux/highmem.h> |
| 10 | #include <linux/blkdev.h> | 10 | #include <linux/blkdev.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/backing-dev.h> | ||
| 12 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 13 | #include <asm/mmx.h> | 14 | #include <asm/mmx.h> |
| 14 | 15 | ||
| @@ -741,7 +742,7 @@ survive: | |||
| 741 | 742 | ||
| 742 | if (retval == -ENOMEM && is_init(current)) { | 743 | if (retval == -ENOMEM && is_init(current)) { |
| 743 | up_read(¤t->mm->mmap_sem); | 744 | up_read(¤t->mm->mmap_sem); |
| 744 | blk_congestion_wait(WRITE, HZ/50); | 745 | congestion_wait(WRITE, HZ/50); |
| 745 | goto survive; | 746 | goto survive; |
| 746 | } | 747 | } |
| 747 | 748 | ||
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c index c4fae8ff4671..626de44bd888 100644 --- a/arch/mips/au1000/common/dbdma.c +++ b/arch/mips/au1000/common/dbdma.c | |||
| @@ -849,7 +849,7 @@ au1xxx_dbdma_chan_free(u32 chanid) | |||
| 849 | EXPORT_SYMBOL(au1xxx_dbdma_chan_free); | 849 | EXPORT_SYMBOL(au1xxx_dbdma_chan_free); |
| 850 | 850 | ||
| 851 | static irqreturn_t | 851 | static irqreturn_t |
| 852 | dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 852 | dbdma_interrupt(int irq, void *dev_id) |
| 853 | { | 853 | { |
| 854 | u32 intstat; | 854 | u32 intstat; |
| 855 | u32 chan_index; | 855 | u32 chan_index; |
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index 26b0b9883496..280a8001eacf 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc1 | 3 | # Linux kernel version: 2.6.19-rc2 |
| 4 | # Thu Jul 6 10:04:18 2006 | 4 | # Sat Oct 14 23:01:16 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -25,8 +25,6 @@ CONFIG_MIPS=y | |||
| 25 | # CONFIG_MIPS_COBALT is not set | 25 | # CONFIG_MIPS_COBALT is not set |
| 26 | # CONFIG_MACH_DECSTATION is not set | 26 | # CONFIG_MACH_DECSTATION is not set |
| 27 | # CONFIG_MIPS_EV64120 is not set | 27 | # CONFIG_MIPS_EV64120 is not set |
| 28 | # CONFIG_MIPS_IVR is not set | ||
| 29 | # CONFIG_MIPS_ITE8172 is not set | ||
| 30 | # CONFIG_MACH_JAZZ is not set | 28 | # CONFIG_MACH_JAZZ is not set |
| 31 | # CONFIG_LASAT is not set | 29 | # CONFIG_LASAT is not set |
| 32 | # CONFIG_MIPS_ATLAS is not set | 30 | # CONFIG_MIPS_ATLAS is not set |
| @@ -41,13 +39,13 @@ CONFIG_MIPS=y | |||
| 41 | # CONFIG_MOMENCO_OCELOT_G is not set | 39 | # CONFIG_MOMENCO_OCELOT_G is not set |
| 42 | # CONFIG_MIPS_XXS1500 is not set | 40 | # CONFIG_MIPS_XXS1500 is not set |
| 43 | # CONFIG_PNX8550_V2PCI is not set | 41 | # CONFIG_PNX8550_V2PCI is not set |
| 44 | # CONFIG_PNX8550_JBS is not set | 42 | CONFIG_PNX8550_JBS=y |
| 45 | # CONFIG_DDB5477 is not set | 43 | # CONFIG_DDB5477 is not set |
| 46 | # CONFIG_MACH_VR41XX is not set | 44 | # CONFIG_MACH_VR41XX is not set |
| 47 | # CONFIG_PMC_YOSEMITE is not set | 45 | # CONFIG_PMC_YOSEMITE is not set |
| 48 | # CONFIG_QEMU is not set | 46 | # CONFIG_QEMU is not set |
| 49 | # CONFIG_MARKEINS is not set | 47 | # CONFIG_MARKEINS is not set |
| 50 | CONFIG_SGI_IP22=y | 48 | # CONFIG_SGI_IP22 is not set |
| 51 | # CONFIG_SGI_IP27 is not set | 49 | # CONFIG_SGI_IP27 is not set |
| 52 | # CONFIG_SGI_IP32 is not set | 50 | # CONFIG_SGI_IP32 is not set |
| 53 | # CONFIG_SIBYTE_BIGSUR is not set | 51 | # CONFIG_SIBYTE_BIGSUR is not set |
| @@ -67,25 +65,21 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 65 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 68 | CONFIG_GENERIC_HWEIGHT=y | 66 | CONFIG_GENERIC_HWEIGHT=y |
| 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_GENERIC_TIME=y | ||
| 70 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 69 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 71 | CONFIG_ARC=y | ||
| 72 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 73 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 74 | CONFIG_CPU_BIG_ENDIAN=y | 72 | # CONFIG_CPU_BIG_ENDIAN is not set |
| 75 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 73 | CONFIG_CPU_LITTLE_ENDIAN=y |
| 76 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 74 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| 77 | CONFIG_IRQ_CPU=y | 75 | CONFIG_PNX8550=y |
| 78 | CONFIG_SWAP_IO_SPACE=y | 76 | CONFIG_SOC_PNX8550=y |
| 79 | CONFIG_ARC32=y | ||
| 80 | CONFIG_BOOT_ELF32=y | ||
| 81 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 77 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
| 82 | # CONFIG_ARC_CONSOLE is not set | ||
| 83 | CONFIG_ARC_PROMLIB=y | ||
| 84 | 78 | ||
| 85 | # | 79 | # |
| 86 | # CPU selection | 80 | # CPU selection |
| 87 | # | 81 | # |
| 88 | # CONFIG_CPU_MIPS32_R1 is not set | 82 | CONFIG_CPU_MIPS32_R1=y |
| 89 | # CONFIG_CPU_MIPS32_R2 is not set | 83 | # CONFIG_CPU_MIPS32_R2 is not set |
| 90 | # CONFIG_CPU_MIPS64_R1 is not set | 84 | # CONFIG_CPU_MIPS64_R1 is not set |
| 91 | # CONFIG_CPU_MIPS64_R2 is not set | 85 | # CONFIG_CPU_MIPS64_R2 is not set |
| @@ -93,7 +87,7 @@ CONFIG_ARC_PROMLIB=y | |||
| 93 | # CONFIG_CPU_TX39XX is not set | 87 | # CONFIG_CPU_TX39XX is not set |
| 94 | # CONFIG_CPU_VR41XX is not set | 88 | # CONFIG_CPU_VR41XX is not set |
| 95 | # CONFIG_CPU_R4300 is not set | 89 | # CONFIG_CPU_R4300 is not set |
| 96 | CONFIG_CPU_R4X00=y | 90 | # CONFIG_CPU_R4X00 is not set |
| 97 | # CONFIG_CPU_TX49XX is not set | 91 | # CONFIG_CPU_TX49XX is not set |
| 98 | # CONFIG_CPU_R5000 is not set | 92 | # CONFIG_CPU_R5000 is not set |
| 99 | # CONFIG_CPU_R5432 is not set | 93 | # CONFIG_CPU_R5432 is not set |
| @@ -104,12 +98,11 @@ CONFIG_CPU_R4X00=y | |||
| 104 | # CONFIG_CPU_RM7000 is not set | 98 | # CONFIG_CPU_RM7000 is not set |
| 105 | # CONFIG_CPU_RM9000 is not set | 99 | # CONFIG_CPU_RM9000 is not set |
| 106 | # CONFIG_CPU_SB1 is not set | 100 | # CONFIG_CPU_SB1 is not set |
| 107 | CONFIG_SYS_HAS_CPU_R4X00=y | 101 | CONFIG_SYS_HAS_CPU_MIPS32_R1=y |
| 108 | CONFIG_SYS_HAS_CPU_R5000=y | 102 | CONFIG_CPU_MIPS32=y |
| 103 | CONFIG_CPU_MIPSR1=y | ||
| 109 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 104 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
| 110 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
| 111 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 105 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
| 112 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | ||
| 113 | 106 | ||
| 114 | # | 107 | # |
| 115 | # Kernel type | 108 | # Kernel type |
| @@ -120,17 +113,17 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 120 | # CONFIG_PAGE_SIZE_8KB is not set | 113 | # CONFIG_PAGE_SIZE_8KB is not set |
| 121 | # CONFIG_PAGE_SIZE_16KB is not set | 114 | # CONFIG_PAGE_SIZE_16KB is not set |
| 122 | # CONFIG_PAGE_SIZE_64KB is not set | 115 | # CONFIG_PAGE_SIZE_64KB is not set |
| 123 | CONFIG_BOARD_SCACHE=y | 116 | CONFIG_CPU_HAS_PREFETCH=y |
| 124 | CONFIG_IP22_CPU_SCACHE=y | ||
| 125 | CONFIG_MIPS_MT_DISABLED=y | 117 | CONFIG_MIPS_MT_DISABLED=y |
| 126 | # CONFIG_MIPS_MT_SMTC is not set | ||
| 127 | # CONFIG_MIPS_MT_SMP is not set | 118 | # CONFIG_MIPS_MT_SMP is not set |
| 119 | # CONFIG_MIPS_MT_SMTC is not set | ||
| 128 | # CONFIG_MIPS_VPE_LOADER is not set | 120 | # CONFIG_MIPS_VPE_LOADER is not set |
| 129 | # CONFIG_64BIT_PHYS_ADDR is not set | 121 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 130 | CONFIG_CPU_HAS_LLSC=y | 122 | CONFIG_CPU_HAS_LLSC=y |
| 131 | CONFIG_CPU_HAS_SYNC=y | 123 | CONFIG_CPU_HAS_SYNC=y |
| 132 | CONFIG_GENERIC_HARDIRQS=y | 124 | CONFIG_GENERIC_HARDIRQS=y |
| 133 | CONFIG_GENERIC_IRQ_PROBE=y | 125 | CONFIG_GENERIC_IRQ_PROBE=y |
| 126 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 134 | CONFIG_ARCH_FLATMEM_ENABLE=y | 127 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 135 | CONFIG_SELECT_MEMORY_MODEL=y | 128 | CONFIG_SELECT_MEMORY_MODEL=y |
| 136 | CONFIG_FLATMEM_MANUAL=y | 129 | CONFIG_FLATMEM_MANUAL=y |
| @@ -144,12 +137,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 144 | # CONFIG_HZ_48 is not set | 137 | # CONFIG_HZ_48 is not set |
| 145 | # CONFIG_HZ_100 is not set | 138 | # CONFIG_HZ_100 is not set |
| 146 | # CONFIG_HZ_128 is not set | 139 | # CONFIG_HZ_128 is not set |
| 147 | # CONFIG_HZ_250 is not set | 140 | CONFIG_HZ_250=y |
| 148 | # CONFIG_HZ_256 is not set | 141 | # CONFIG_HZ_256 is not set |
| 149 | CONFIG_HZ_1000=y | 142 | # CONFIG_HZ_1000 is not set |
| 150 | # CONFIG_HZ_1024 is not set | 143 | # CONFIG_HZ_1024 is not set |
| 151 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 144 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
| 152 | CONFIG_HZ=1000 | 145 | CONFIG_HZ=250 |
| 153 | CONFIG_PREEMPT_NONE=y | 146 | CONFIG_PREEMPT_NONE=y |
| 154 | # CONFIG_PREEMPT_VOLUNTARY is not set | 147 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 155 | # CONFIG_PREEMPT is not set | 148 | # CONFIG_PREEMPT is not set |
| @@ -171,16 +164,20 @@ CONFIG_LOCALVERSION="" | |||
| 171 | CONFIG_LOCALVERSION_AUTO=y | 164 | CONFIG_LOCALVERSION_AUTO=y |
| 172 | CONFIG_SWAP=y | 165 | CONFIG_SWAP=y |
| 173 | CONFIG_SYSVIPC=y | 166 | CONFIG_SYSVIPC=y |
| 167 | # CONFIG_IPC_NS is not set | ||
| 174 | # CONFIG_POSIX_MQUEUE is not set | 168 | # CONFIG_POSIX_MQUEUE is not set |
| 175 | # CONFIG_BSD_PROCESS_ACCT is not set | 169 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 176 | CONFIG_SYSCTL=y | 170 | # CONFIG_TASKSTATS is not set |
| 171 | # CONFIG_UTS_NS is not set | ||
| 177 | # CONFIG_AUDIT is not set | 172 | # CONFIG_AUDIT is not set |
| 178 | CONFIG_IKCONFIG=y | 173 | CONFIG_IKCONFIG=y |
| 179 | CONFIG_IKCONFIG_PROC=y | 174 | CONFIG_IKCONFIG_PROC=y |
| 180 | # CONFIG_RELAY is not set | 175 | # CONFIG_RELAY is not set |
| 181 | CONFIG_INITRAMFS_SOURCE="" | 176 | CONFIG_INITRAMFS_SOURCE="" |
| 182 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 177 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 178 | CONFIG_SYSCTL=y | ||
| 183 | CONFIG_EMBEDDED=y | 179 | CONFIG_EMBEDDED=y |
| 180 | # CONFIG_SYSCTL_SYSCALL is not set | ||
| 184 | CONFIG_KALLSYMS=y | 181 | CONFIG_KALLSYMS=y |
| 185 | # CONFIG_KALLSYMS_ALL is not set | 182 | # CONFIG_KALLSYMS_ALL is not set |
| 186 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 183 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -189,12 +186,12 @@ CONFIG_PRINTK=y | |||
| 189 | CONFIG_BUG=y | 186 | CONFIG_BUG=y |
| 190 | CONFIG_ELF_CORE=y | 187 | CONFIG_ELF_CORE=y |
| 191 | CONFIG_BASE_FULL=y | 188 | CONFIG_BASE_FULL=y |
| 192 | CONFIG_RT_MUTEXES=y | ||
| 193 | CONFIG_FUTEX=y | 189 | CONFIG_FUTEX=y |
| 194 | CONFIG_EPOLL=y | 190 | CONFIG_EPOLL=y |
| 195 | CONFIG_SHMEM=y | 191 | CONFIG_SHMEM=y |
| 196 | CONFIG_SLAB=y | 192 | CONFIG_SLAB=y |
| 197 | CONFIG_VM_EVENT_COUNTERS=y | 193 | CONFIG_VM_EVENT_COUNTERS=y |
| 194 | CONFIG_RT_MUTEXES=y | ||
| 198 | # CONFIG_TINY_SHMEM is not set | 195 | # CONFIG_TINY_SHMEM is not set |
| 199 | CONFIG_BASE_SMALL=0 | 196 | CONFIG_BASE_SMALL=0 |
| 200 | # CONFIG_SLOB is not set | 197 | # CONFIG_SLOB is not set |
| @@ -211,6 +208,7 @@ CONFIG_KMOD=y | |||
| 211 | # | 208 | # |
| 212 | # Block layer | 209 | # Block layer |
| 213 | # | 210 | # |
| 211 | CONFIG_BLOCK=y | ||
| 214 | # CONFIG_LBD is not set | 212 | # CONFIG_LBD is not set |
| 215 | # CONFIG_BLK_DEV_IO_TRACE is not set | 213 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 216 | # CONFIG_LSF is not set | 214 | # CONFIG_LSF is not set |
| @@ -231,8 +229,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 231 | # | 229 | # |
| 232 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 230 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 233 | # | 231 | # |
| 234 | CONFIG_HW_HAS_EISA=y | 232 | CONFIG_HW_HAS_PCI=y |
| 235 | # CONFIG_EISA is not set | 233 | CONFIG_PCI=y |
| 234 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
| 235 | # CONFIG_PCI_DEBUG is not set | ||
| 236 | CONFIG_MMU=y | 236 | CONFIG_MMU=y |
| 237 | 237 | ||
| 238 | # | 238 | # |
| @@ -243,6 +243,7 @@ CONFIG_MMU=y | |||
| 243 | # | 243 | # |
| 244 | # PCI Hotplug Support | 244 | # PCI Hotplug Support |
| 245 | # | 245 | # |
| 246 | # CONFIG_HOTPLUG_PCI is not set | ||
| 246 | 247 | ||
| 247 | # | 248 | # |
| 248 | # Executable file formats | 249 | # Executable file formats |
| @@ -265,6 +266,7 @@ CONFIG_PACKET=y | |||
| 265 | CONFIG_UNIX=y | 266 | CONFIG_UNIX=y |
| 266 | CONFIG_XFRM=y | 267 | CONFIG_XFRM=y |
| 267 | # CONFIG_XFRM_USER is not set | 268 | # CONFIG_XFRM_USER is not set |
| 269 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 268 | # CONFIG_NET_KEY is not set | 270 | # CONFIG_NET_KEY is not set |
| 269 | CONFIG_INET=y | 271 | CONFIG_INET=y |
| 270 | # CONFIG_IP_MULTICAST is not set | 272 | # CONFIG_IP_MULTICAST is not set |
| @@ -283,16 +285,18 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 283 | # CONFIG_INET_IPCOMP is not set | 285 | # CONFIG_INET_IPCOMP is not set |
| 284 | # CONFIG_INET_XFRM_TUNNEL is not set | 286 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 285 | # CONFIG_INET_TUNNEL is not set | 287 | # CONFIG_INET_TUNNEL is not set |
| 286 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 288 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 287 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 289 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 290 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 288 | CONFIG_INET_DIAG=y | 291 | CONFIG_INET_DIAG=y |
| 289 | CONFIG_INET_TCP_DIAG=y | 292 | CONFIG_INET_TCP_DIAG=y |
| 290 | # CONFIG_TCP_CONG_ADVANCED is not set | 293 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 291 | CONFIG_TCP_CONG_BIC=y | 294 | CONFIG_TCP_CONG_CUBIC=y |
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 292 | # CONFIG_IPV6 is not set | 296 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | 297 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 294 | # CONFIG_INET6_TUNNEL is not set | 298 | # CONFIG_INET6_TUNNEL is not set |
| 295 | CONFIG_NETWORK_SECMARK=y | 299 | # CONFIG_NETWORK_SECMARK is not set |
| 296 | # CONFIG_NETFILTER is not set | 300 | # CONFIG_NETFILTER is not set |
| 297 | 301 | ||
| 298 | # | 302 | # |
| @@ -318,7 +322,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 318 | # CONFIG_ATALK is not set | 322 | # CONFIG_ATALK is not set |
| 319 | # CONFIG_X25 is not set | 323 | # CONFIG_X25 is not set |
| 320 | # CONFIG_LAPB is not set | 324 | # CONFIG_LAPB is not set |
| 321 | # CONFIG_NET_DIVERT is not set | ||
| 322 | # CONFIG_ECONET is not set | 325 | # CONFIG_ECONET is not set |
| 323 | # CONFIG_WAN_ROUTER is not set | 326 | # CONFIG_WAN_ROUTER is not set |
| 324 | 327 | ||
| @@ -371,13 +374,20 @@ CONFIG_FW_LOADER=y | |||
| 371 | # | 374 | # |
| 372 | # Block devices | 375 | # Block devices |
| 373 | # | 376 | # |
| 377 | # CONFIG_BLK_CPQ_DA is not set | ||
| 378 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 379 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 380 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 374 | # CONFIG_BLK_DEV_COW_COMMON is not set | 381 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 375 | CONFIG_BLK_DEV_LOOP=y | 382 | CONFIG_BLK_DEV_LOOP=y |
| 376 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 383 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 377 | # CONFIG_BLK_DEV_NBD is not set | 384 | # CONFIG_BLK_DEV_NBD is not set |
| 385 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 386 | # CONFIG_BLK_DEV_UB is not set | ||
| 378 | CONFIG_BLK_DEV_RAM=y | 387 | CONFIG_BLK_DEV_RAM=y |
| 379 | CONFIG_BLK_DEV_RAM_COUNT=16 | 388 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 380 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 389 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
| 390 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 381 | CONFIG_BLK_DEV_INITRD=y | 391 | CONFIG_BLK_DEV_INITRD=y |
| 382 | # CONFIG_CDROM_PKTCDVD is not set | 392 | # CONFIG_CDROM_PKTCDVD is not set |
| 383 | # CONFIG_ATA_OVER_ETH is not set | 393 | # CONFIG_ATA_OVER_ETH is not set |
| @@ -386,6 +396,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 386 | # ATA/ATAPI/MFM/RLL support | 396 | # ATA/ATAPI/MFM/RLL support |
| 387 | # | 397 | # |
| 388 | CONFIG_IDE=y | 398 | CONFIG_IDE=y |
| 399 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 389 | CONFIG_BLK_DEV_IDE=y | 400 | CONFIG_BLK_DEV_IDE=y |
| 390 | 401 | ||
| 391 | # | 402 | # |
| @@ -404,8 +415,39 @@ CONFIG_BLK_DEV_IDESCSI=y | |||
| 404 | # IDE chipset support/bugfixes | 415 | # IDE chipset support/bugfixes |
| 405 | # | 416 | # |
| 406 | CONFIG_IDE_GENERIC=y | 417 | CONFIG_IDE_GENERIC=y |
| 418 | CONFIG_BLK_DEV_IDEPCI=y | ||
| 419 | CONFIG_IDEPCI_SHARE_IRQ=y | ||
| 420 | CONFIG_BLK_DEV_OFFBOARD=y | ||
| 421 | CONFIG_BLK_DEV_GENERIC=y | ||
| 422 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 423 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
| 424 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 425 | # CONFIG_IDEDMA_PCI_AUTO is not set | ||
| 426 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 427 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 428 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
| 429 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 430 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 431 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 432 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 433 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 434 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 435 | CONFIG_BLK_DEV_HPT366=y | ||
| 436 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 437 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 438 | # CONFIG_BLK_DEV_PIIX is not set | ||
| 439 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 440 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 441 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 442 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
| 443 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 444 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 445 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 446 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 447 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 407 | # CONFIG_IDE_ARM is not set | 448 | # CONFIG_IDE_ARM is not set |
| 408 | # CONFIG_BLK_DEV_IDEDMA is not set | 449 | CONFIG_BLK_DEV_IDEDMA=y |
| 450 | # CONFIG_IDEDMA_IVB is not set | ||
| 409 | # CONFIG_IDEDMA_AUTO is not set | 451 | # CONFIG_IDEDMA_AUTO is not set |
| 410 | # CONFIG_BLK_DEV_HD is not set | 452 | # CONFIG_BLK_DEV_HD is not set |
| 411 | 453 | ||
| @@ -414,6 +456,7 @@ CONFIG_IDE_GENERIC=y | |||
| 414 | # | 456 | # |
| 415 | # CONFIG_RAID_ATTRS is not set | 457 | # CONFIG_RAID_ATTRS is not set |
| 416 | CONFIG_SCSI=y | 458 | CONFIG_SCSI=y |
| 459 | CONFIG_SCSI_NETLINK=y | ||
| 417 | CONFIG_SCSI_PROC_FS=y | 460 | CONFIG_SCSI_PROC_FS=y |
| 418 | 461 | ||
| 419 | # | 462 | # |
| @@ -434,22 +477,54 @@ CONFIG_SCSI_CONSTANTS=y | |||
| 434 | # CONFIG_SCSI_LOGGING is not set | 477 | # CONFIG_SCSI_LOGGING is not set |
| 435 | 478 | ||
| 436 | # | 479 | # |
| 437 | # SCSI Transport Attributes | 480 | # SCSI Transports |
| 438 | # | 481 | # |
| 439 | # CONFIG_SCSI_SPI_ATTRS is not set | 482 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 440 | CONFIG_SCSI_FC_ATTRS=y | 483 | CONFIG_SCSI_FC_ATTRS=y |
| 441 | CONFIG_SCSI_ISCSI_ATTRS=m | 484 | CONFIG_SCSI_ISCSI_ATTRS=m |
| 442 | # CONFIG_SCSI_SAS_ATTRS is not set | 485 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 486 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 443 | 487 | ||
| 444 | # | 488 | # |
| 445 | # SCSI low-level drivers | 489 | # SCSI low-level drivers |
| 446 | # | 490 | # |
| 447 | CONFIG_ISCSI_TCP=m | 491 | CONFIG_ISCSI_TCP=m |
| 448 | # CONFIG_SGIWD93_SCSI is not set | 492 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 449 | # CONFIG_SCSI_SATA is not set | 493 | # CONFIG_SCSI_3W_9XXX is not set |
| 494 | # CONFIG_SCSI_ACARD is not set | ||
| 495 | # CONFIG_SCSI_AACRAID is not set | ||
| 496 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 497 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 498 | # CONFIG_SCSI_AIC79XX is not set | ||
| 499 | # CONFIG_SCSI_AIC94XX is not set | ||
| 500 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 501 | # CONFIG_SCSI_ARCMSR is not set | ||
| 502 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 503 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 504 | # CONFIG_MEGARAID_SAS is not set | ||
| 505 | # CONFIG_SCSI_HPTIOP is not set | ||
| 506 | # CONFIG_SCSI_DMX3191D is not set | ||
| 507 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 508 | # CONFIG_SCSI_IPS is not set | ||
| 509 | # CONFIG_SCSI_INITIO is not set | ||
| 510 | # CONFIG_SCSI_INIA100 is not set | ||
| 511 | # CONFIG_SCSI_STEX is not set | ||
| 512 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 513 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 514 | # CONFIG_SCSI_QLA_FC is not set | ||
| 515 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 516 | # CONFIG_SCSI_LPFC is not set | ||
| 517 | # CONFIG_SCSI_DC395x is not set | ||
| 518 | # CONFIG_SCSI_DC390T is not set | ||
| 519 | # CONFIG_SCSI_NSP32 is not set | ||
| 450 | # CONFIG_SCSI_DEBUG is not set | 520 | # CONFIG_SCSI_DEBUG is not set |
| 451 | 521 | ||
| 452 | # | 522 | # |
| 523 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 524 | # | ||
| 525 | # CONFIG_ATA is not set | ||
| 526 | |||
| 527 | # | ||
| 453 | # Multi-device support (RAID and LVM) | 528 | # Multi-device support (RAID and LVM) |
| 454 | # | 529 | # |
| 455 | # CONFIG_MD is not set | 530 | # CONFIG_MD is not set |
| @@ -458,14 +533,19 @@ CONFIG_ISCSI_TCP=m | |||
| 458 | # Fusion MPT device support | 533 | # Fusion MPT device support |
| 459 | # | 534 | # |
| 460 | # CONFIG_FUSION is not set | 535 | # CONFIG_FUSION is not set |
| 536 | # CONFIG_FUSION_SPI is not set | ||
| 537 | # CONFIG_FUSION_FC is not set | ||
| 538 | # CONFIG_FUSION_SAS is not set | ||
| 461 | 539 | ||
| 462 | # | 540 | # |
| 463 | # IEEE 1394 (FireWire) support | 541 | # IEEE 1394 (FireWire) support |
| 464 | # | 542 | # |
| 543 | # CONFIG_IEEE1394 is not set | ||
| 465 | 544 | ||
| 466 | # | 545 | # |
| 467 | # I2O device support | 546 | # I2O device support |
| 468 | # | 547 | # |
| 548 | # CONFIG_I2O is not set | ||
| 469 | 549 | ||
| 470 | # | 550 | # |
| 471 | # Network device support | 551 | # Network device support |
| @@ -477,6 +557,11 @@ CONFIG_NETDEVICES=y | |||
| 477 | # CONFIG_TUN is not set | 557 | # CONFIG_TUN is not set |
| 478 | 558 | ||
| 479 | # | 559 | # |
| 560 | # ARCnet devices | ||
| 561 | # | ||
| 562 | # CONFIG_ARCNET is not set | ||
| 563 | |||
| 564 | # | ||
| 480 | # PHY device support | 565 | # PHY device support |
| 481 | # | 566 | # |
| 482 | # CONFIG_PHYLIB is not set | 567 | # CONFIG_PHYLIB is not set |
| @@ -486,20 +571,73 @@ CONFIG_NETDEVICES=y | |||
| 486 | # | 571 | # |
| 487 | CONFIG_NET_ETHERNET=y | 572 | CONFIG_NET_ETHERNET=y |
| 488 | CONFIG_MII=y | 573 | CONFIG_MII=y |
| 574 | # CONFIG_HAPPYMEAL is not set | ||
| 575 | # CONFIG_SUNGEM is not set | ||
| 576 | # CONFIG_CASSINI is not set | ||
| 577 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 489 | # CONFIG_DM9000 is not set | 578 | # CONFIG_DM9000 is not set |
| 490 | # CONFIG_SGISEEQ is not set | 579 | |
| 580 | # | ||
| 581 | # Tulip family network device support | ||
| 582 | # | ||
| 583 | # CONFIG_NET_TULIP is not set | ||
| 584 | # CONFIG_HP100 is not set | ||
| 585 | CONFIG_NET_PCI=y | ||
| 586 | # CONFIG_PCNET32 is not set | ||
| 587 | # CONFIG_AMD8111_ETH is not set | ||
| 588 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
| 589 | # CONFIG_B44 is not set | ||
| 590 | # CONFIG_FORCEDETH is not set | ||
| 591 | # CONFIG_DGRS is not set | ||
| 592 | # CONFIG_EEPRO100 is not set | ||
| 593 | # CONFIG_E100 is not set | ||
| 594 | # CONFIG_FEALNX is not set | ||
| 595 | # CONFIG_NATSEMI is not set | ||
| 596 | # CONFIG_NE2K_PCI is not set | ||
| 597 | # CONFIG_8139CP is not set | ||
| 598 | CONFIG_8139TOO=y | ||
| 599 | # CONFIG_8139TOO_PIO is not set | ||
| 600 | CONFIG_8139TOO_TUNE_TWISTER=y | ||
| 601 | CONFIG_8139TOO_8129=y | ||
| 602 | # CONFIG_8139_OLD_RX_RESET is not set | ||
| 603 | # CONFIG_SIS900 is not set | ||
| 604 | # CONFIG_EPIC100 is not set | ||
| 605 | # CONFIG_SUNDANCE is not set | ||
| 606 | # CONFIG_TLAN is not set | ||
| 607 | # CONFIG_VIA_RHINE is not set | ||
| 608 | # CONFIG_LAN_SAA9730 is not set | ||
| 491 | 609 | ||
| 492 | # | 610 | # |
| 493 | # Ethernet (1000 Mbit) | 611 | # Ethernet (1000 Mbit) |
| 494 | # | 612 | # |
| 613 | # CONFIG_ACENIC is not set | ||
| 614 | # CONFIG_DL2K is not set | ||
| 615 | # CONFIG_E1000 is not set | ||
| 616 | # CONFIG_NS83820 is not set | ||
| 617 | # CONFIG_HAMACHI is not set | ||
| 618 | # CONFIG_YELLOWFIN is not set | ||
| 619 | # CONFIG_R8169 is not set | ||
| 620 | # CONFIG_SIS190 is not set | ||
| 621 | # CONFIG_SKGE is not set | ||
| 622 | # CONFIG_SKY2 is not set | ||
| 623 | # CONFIG_SK98LIN is not set | ||
| 624 | # CONFIG_VIA_VELOCITY is not set | ||
| 625 | # CONFIG_TIGON3 is not set | ||
| 626 | # CONFIG_BNX2 is not set | ||
| 627 | # CONFIG_QLA3XXX is not set | ||
| 495 | 628 | ||
| 496 | # | 629 | # |
| 497 | # Ethernet (10000 Mbit) | 630 | # Ethernet (10000 Mbit) |
| 498 | # | 631 | # |
| 632 | # CONFIG_CHELSIO_T1 is not set | ||
| 633 | # CONFIG_IXGB is not set | ||
| 634 | # CONFIG_S2IO is not set | ||
| 635 | # CONFIG_MYRI10GE is not set | ||
| 499 | 636 | ||
| 500 | # | 637 | # |
| 501 | # Token Ring devices | 638 | # Token Ring devices |
| 502 | # | 639 | # |
| 640 | # CONFIG_TR is not set | ||
| 503 | 641 | ||
| 504 | # | 642 | # |
| 505 | # Wireless LAN (non-hamradio) | 643 | # Wireless LAN (non-hamradio) |
| @@ -510,8 +648,11 @@ CONFIG_MII=y | |||
| 510 | # Wan interfaces | 648 | # Wan interfaces |
| 511 | # | 649 | # |
| 512 | # CONFIG_WAN is not set | 650 | # CONFIG_WAN is not set |
| 651 | # CONFIG_FDDI is not set | ||
| 652 | # CONFIG_HIPPI is not set | ||
| 513 | # CONFIG_PPP is not set | 653 | # CONFIG_PPP is not set |
| 514 | # CONFIG_SLIP is not set | 654 | # CONFIG_SLIP is not set |
| 655 | # CONFIG_NET_FC is not set | ||
| 515 | # CONFIG_SHAPER is not set | 656 | # CONFIG_SHAPER is not set |
| 516 | # CONFIG_NETCONSOLE is not set | 657 | # CONFIG_NETCONSOLE is not set |
| 517 | # CONFIG_NETPOLL is not set | 658 | # CONFIG_NETPOLL is not set |
| @@ -531,6 +672,7 @@ CONFIG_MII=y | |||
| 531 | # Input device support | 672 | # Input device support |
| 532 | # | 673 | # |
| 533 | CONFIG_INPUT=y | 674 | CONFIG_INPUT=y |
| 675 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 534 | 676 | ||
| 535 | # | 677 | # |
| 536 | # Userland interfaces | 678 | # Userland interfaces |
| @@ -556,6 +698,7 @@ CONFIG_INPUT=y | |||
| 556 | CONFIG_SERIO=y | 698 | CONFIG_SERIO=y |
| 557 | # CONFIG_SERIO_I8042 is not set | 699 | # CONFIG_SERIO_I8042 is not set |
| 558 | # CONFIG_SERIO_SERPORT is not set | 700 | # CONFIG_SERIO_SERPORT is not set |
| 701 | # CONFIG_SERIO_PCIPS2 is not set | ||
| 559 | CONFIG_SERIO_LIBPS2=y | 702 | CONFIG_SERIO_LIBPS2=y |
| 560 | # CONFIG_SERIO_RAW is not set | 703 | # CONFIG_SERIO_RAW is not set |
| 561 | # CONFIG_GAMEPORT is not set | 704 | # CONFIG_GAMEPORT is not set |
| @@ -566,7 +709,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 566 | CONFIG_VT=y | 709 | CONFIG_VT=y |
| 567 | CONFIG_VT_CONSOLE=y | 710 | CONFIG_VT_CONSOLE=y |
| 568 | CONFIG_HW_CONSOLE=y | 711 | CONFIG_HW_CONSOLE=y |
| 569 | CONFIG_VT_HW_CONSOLE_BINDING=y | 712 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 570 | # CONFIG_SERIAL_NONSTANDARD is not set | 713 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 571 | 714 | ||
| 572 | # | 715 | # |
| @@ -577,7 +720,8 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
| 577 | # | 720 | # |
| 578 | # Non-8250 serial port support | 721 | # Non-8250 serial port support |
| 579 | # | 722 | # |
| 580 | # CONFIG_SERIAL_IP22_ZILOG is not set | 723 | # CONFIG_SERIAL_IP3106 is not set |
| 724 | # CONFIG_SERIAL_JSM is not set | ||
| 581 | CONFIG_UNIX98_PTYS=y | 725 | CONFIG_UNIX98_PTYS=y |
| 582 | CONFIG_LEGACY_PTYS=y | 726 | CONFIG_LEGACY_PTYS=y |
| 583 | CONFIG_LEGACY_PTY_COUNT=256 | 727 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -591,16 +735,17 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 591 | # Watchdog Cards | 735 | # Watchdog Cards |
| 592 | # | 736 | # |
| 593 | # CONFIG_WATCHDOG is not set | 737 | # CONFIG_WATCHDOG is not set |
| 594 | # CONFIG_HW_RANDOM is not set | 738 | CONFIG_HW_RANDOM=y |
| 595 | # CONFIG_RTC is not set | 739 | # CONFIG_RTC is not set |
| 596 | # CONFIG_SGI_DS1286 is not set | ||
| 597 | # CONFIG_GEN_RTC is not set | 740 | # CONFIG_GEN_RTC is not set |
| 598 | # CONFIG_DTLK is not set | 741 | # CONFIG_DTLK is not set |
| 599 | # CONFIG_R3964 is not set | 742 | # CONFIG_R3964 is not set |
| 743 | # CONFIG_APPLICOM is not set | ||
| 600 | 744 | ||
| 601 | # | 745 | # |
| 602 | # Ftape, the floppy tape device driver | 746 | # Ftape, the floppy tape device driver |
| 603 | # | 747 | # |
| 748 | # CONFIG_DRM is not set | ||
| 604 | # CONFIG_RAW_DRIVER is not set | 749 | # CONFIG_RAW_DRIVER is not set |
| 605 | 750 | ||
| 606 | # | 751 | # |
| @@ -631,35 +776,37 @@ CONFIG_HWMON=y | |||
| 631 | # CONFIG_HWMON_VID is not set | 776 | # CONFIG_HWMON_VID is not set |
| 632 | # CONFIG_SENSORS_ABITUGURU is not set | 777 | # CONFIG_SENSORS_ABITUGURU is not set |
| 633 | # CONFIG_SENSORS_F71805F is not set | 778 | # CONFIG_SENSORS_F71805F is not set |
| 779 | # CONFIG_SENSORS_VT1211 is not set | ||
| 634 | # CONFIG_HWMON_DEBUG_CHIP is not set | 780 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 635 | 781 | ||
| 636 | # | 782 | # |
| 637 | # Misc devices | 783 | # Misc devices |
| 638 | # | 784 | # |
| 785 | # CONFIG_TIFM_CORE is not set | ||
| 639 | 786 | ||
| 640 | # | 787 | # |
| 641 | # Multimedia devices | 788 | # Multimedia devices |
| 642 | # | 789 | # |
| 643 | # CONFIG_VIDEO_DEV is not set | 790 | # CONFIG_VIDEO_DEV is not set |
| 644 | CONFIG_VIDEO_V4L2=y | ||
| 645 | 791 | ||
| 646 | # | 792 | # |
| 647 | # Digital Video Broadcasting Devices | 793 | # Digital Video Broadcasting Devices |
| 648 | # | 794 | # |
| 649 | # CONFIG_DVB is not set | 795 | # CONFIG_DVB is not set |
| 796 | # CONFIG_USB_DABUSB is not set | ||
| 650 | 797 | ||
| 651 | # | 798 | # |
| 652 | # Graphics support | 799 | # Graphics support |
| 653 | # | 800 | # |
| 654 | # CONFIG_FIRMWARE_EDID is not set | 801 | CONFIG_FIRMWARE_EDID=y |
| 655 | # CONFIG_FB is not set | 802 | # CONFIG_FB is not set |
| 656 | 803 | ||
| 657 | # | 804 | # |
| 658 | # Console display driver support | 805 | # Console display driver support |
| 659 | # | 806 | # |
| 660 | # CONFIG_VGA_CONSOLE is not set | 807 | # CONFIG_VGA_CONSOLE is not set |
| 661 | # CONFIG_SGI_NEWPORT_CONSOLE is not set | ||
| 662 | CONFIG_DUMMY_CONSOLE=y | 808 | CONFIG_DUMMY_CONSOLE=y |
| 809 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 663 | 810 | ||
| 664 | # | 811 | # |
| 665 | # Sound | 812 | # Sound |
| @@ -669,15 +816,131 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 669 | # | 816 | # |
| 670 | # USB support | 817 | # USB support |
| 671 | # | 818 | # |
| 672 | # CONFIG_USB_ARCH_HAS_HCD is not set | 819 | CONFIG_USB_ARCH_HAS_HCD=y |
| 673 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 820 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 674 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 821 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 822 | CONFIG_USB=y | ||
| 823 | # CONFIG_USB_DEBUG is not set | ||
| 824 | |||
| 825 | # | ||
| 826 | # Miscellaneous USB options | ||
| 827 | # | ||
| 828 | # CONFIG_USB_DEVICEFS is not set | ||
| 829 | # CONFIG_USB_BANDWIDTH is not set | ||
| 830 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 831 | # CONFIG_USB_OTG is not set | ||
| 832 | |||
| 833 | # | ||
| 834 | # USB Host Controller Drivers | ||
| 835 | # | ||
| 836 | # CONFIG_USB_EHCI_HCD is not set | ||
| 837 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 838 | CONFIG_USB_OHCI_HCD=y | ||
| 839 | # CONFIG_USB_OHCI_BIG_ENDIAN is not set | ||
| 840 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 841 | # CONFIG_USB_UHCI_HCD is not set | ||
| 842 | # CONFIG_USB_SL811_HCD is not set | ||
| 843 | |||
| 844 | # | ||
| 845 | # USB Device Class drivers | ||
| 846 | # | ||
| 847 | # CONFIG_USB_ACM is not set | ||
| 848 | # CONFIG_USB_PRINTER is not set | ||
| 675 | 849 | ||
| 676 | # | 850 | # |
| 677 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 851 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 678 | # | 852 | # |
| 679 | 853 | ||
| 680 | # | 854 | # |
| 855 | # may also be needed; see USB_STORAGE Help for more information | ||
| 856 | # | ||
| 857 | CONFIG_USB_STORAGE=y | ||
| 858 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 859 | CONFIG_USB_STORAGE_DATAFAB=y | ||
| 860 | CONFIG_USB_STORAGE_FREECOM=y | ||
| 861 | CONFIG_USB_STORAGE_ISD200=y | ||
| 862 | CONFIG_USB_STORAGE_DPCM=y | ||
| 863 | CONFIG_USB_STORAGE_USBAT=y | ||
| 864 | CONFIG_USB_STORAGE_SDDR09=y | ||
| 865 | CONFIG_USB_STORAGE_SDDR55=y | ||
| 866 | CONFIG_USB_STORAGE_JUMPSHOT=y | ||
| 867 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 868 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 869 | # CONFIG_USB_LIBUSUAL is not set | ||
| 870 | |||
| 871 | # | ||
| 872 | # USB Input Devices | ||
| 873 | # | ||
| 874 | # CONFIG_USB_HID is not set | ||
| 875 | |||
| 876 | # | ||
| 877 | # USB HID Boot Protocol drivers | ||
| 878 | # | ||
| 879 | # CONFIG_USB_KBD is not set | ||
| 880 | # CONFIG_USB_MOUSE is not set | ||
| 881 | # CONFIG_USB_AIPTEK is not set | ||
| 882 | # CONFIG_USB_WACOM is not set | ||
| 883 | # CONFIG_USB_ACECAD is not set | ||
| 884 | # CONFIG_USB_KBTAB is not set | ||
| 885 | # CONFIG_USB_POWERMATE is not set | ||
| 886 | # CONFIG_USB_TOUCHSCREEN is not set | ||
| 887 | # CONFIG_USB_YEALINK is not set | ||
| 888 | # CONFIG_USB_XPAD is not set | ||
| 889 | # CONFIG_USB_ATI_REMOTE is not set | ||
| 890 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 891 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
| 892 | # CONFIG_USB_APPLETOUCH is not set | ||
| 893 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 894 | |||
| 895 | # | ||
| 896 | # USB Imaging devices | ||
| 897 | # | ||
| 898 | # CONFIG_USB_MDC800 is not set | ||
| 899 | # CONFIG_USB_MICROTEK is not set | ||
| 900 | |||
| 901 | # | ||
| 902 | # USB Network Adapters | ||
| 903 | # | ||
| 904 | # CONFIG_USB_CATC is not set | ||
| 905 | # CONFIG_USB_KAWETH is not set | ||
| 906 | # CONFIG_USB_PEGASUS is not set | ||
| 907 | # CONFIG_USB_RTL8150 is not set | ||
| 908 | # CONFIG_USB_USBNET is not set | ||
| 909 | CONFIG_USB_MON=y | ||
| 910 | |||
| 911 | # | ||
| 912 | # USB port drivers | ||
| 913 | # | ||
| 914 | |||
| 915 | # | ||
| 916 | # USB Serial Converter support | ||
| 917 | # | ||
| 918 | # CONFIG_USB_SERIAL is not set | ||
| 919 | |||
| 920 | # | ||
| 921 | # USB Miscellaneous drivers | ||
| 922 | # | ||
| 923 | # CONFIG_USB_EMI62 is not set | ||
| 924 | # CONFIG_USB_EMI26 is not set | ||
| 925 | # CONFIG_USB_ADUTUX is not set | ||
| 926 | # CONFIG_USB_AUERSWALD is not set | ||
| 927 | # CONFIG_USB_RIO500 is not set | ||
| 928 | # CONFIG_USB_LEGOTOWER is not set | ||
| 929 | # CONFIG_USB_LCD is not set | ||
| 930 | # CONFIG_USB_LED is not set | ||
| 931 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 932 | # CONFIG_USB_CYTHERM is not set | ||
| 933 | # CONFIG_USB_PHIDGET is not set | ||
| 934 | # CONFIG_USB_IDMOUSE is not set | ||
| 935 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 936 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 937 | # CONFIG_USB_LD is not set | ||
| 938 | |||
| 939 | # | ||
| 940 | # USB DSL modem support | ||
| 941 | # | ||
| 942 | |||
| 943 | # | ||
| 681 | # USB Gadget Support | 944 | # USB Gadget Support |
| 682 | # | 945 | # |
| 683 | # CONFIG_USB_GADGET is not set | 946 | # CONFIG_USB_GADGET is not set |
| @@ -703,6 +966,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 703 | # | 966 | # |
| 704 | # InfiniBand support | 967 | # InfiniBand support |
| 705 | # | 968 | # |
| 969 | # CONFIG_INFINIBAND is not set | ||
| 706 | 970 | ||
| 707 | # | 971 | # |
| 708 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 972 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| @@ -733,10 +997,12 @@ CONFIG_EXT2_FS=y | |||
| 733 | # CONFIG_EXT2_FS_XATTR is not set | 997 | # CONFIG_EXT2_FS_XATTR is not set |
| 734 | # CONFIG_EXT2_FS_XIP is not set | 998 | # CONFIG_EXT2_FS_XIP is not set |
| 735 | # CONFIG_EXT3_FS is not set | 999 | # CONFIG_EXT3_FS is not set |
| 1000 | # CONFIG_EXT4DEV_FS is not set | ||
| 736 | # CONFIG_REISERFS_FS is not set | 1001 | # CONFIG_REISERFS_FS is not set |
| 737 | # CONFIG_JFS_FS is not set | 1002 | # CONFIG_JFS_FS is not set |
| 738 | # CONFIG_FS_POSIX_ACL is not set | 1003 | # CONFIG_FS_POSIX_ACL is not set |
| 739 | # CONFIG_XFS_FS is not set | 1004 | # CONFIG_XFS_FS is not set |
| 1005 | # CONFIG_GFS2_FS is not set | ||
| 740 | # CONFIG_OCFS2_FS is not set | 1006 | # CONFIG_OCFS2_FS is not set |
| 741 | # CONFIG_MINIX_FS is not set | 1007 | # CONFIG_MINIX_FS is not set |
| 742 | # CONFIG_ROMFS_FS is not set | 1008 | # CONFIG_ROMFS_FS is not set |
| @@ -769,8 +1035,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 769 | # | 1035 | # |
| 770 | CONFIG_PROC_FS=y | 1036 | CONFIG_PROC_FS=y |
| 771 | # CONFIG_PROC_KCORE is not set | 1037 | # CONFIG_PROC_KCORE is not set |
| 1038 | CONFIG_PROC_SYSCTL=y | ||
| 772 | CONFIG_SYSFS=y | 1039 | CONFIG_SYSFS=y |
| 773 | CONFIG_TMPFS=y | 1040 | CONFIG_TMPFS=y |
| 1041 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 774 | # CONFIG_HUGETLB_PAGE is not set | 1042 | # CONFIG_HUGETLB_PAGE is not set |
| 775 | CONFIG_RAMFS=y | 1043 | CONFIG_RAMFS=y |
| 776 | # CONFIG_CONFIGFS_FS is not set | 1044 | # CONFIG_CONFIGFS_FS is not set |
| @@ -813,7 +1081,6 @@ CONFIG_SUNRPC=y | |||
| 813 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1081 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 814 | # CONFIG_SMB_FS is not set | 1082 | # CONFIG_SMB_FS is not set |
| 815 | # CONFIG_CIFS is not set | 1083 | # CONFIG_CIFS is not set |
| 816 | # CONFIG_CIFS_DEBUG2 is not set | ||
| 817 | # CONFIG_NCP_FS is not set | 1084 | # CONFIG_NCP_FS is not set |
| 818 | # CONFIG_CODA_FS is not set | 1085 | # CONFIG_CODA_FS is not set |
| 819 | # CONFIG_AFS_FS is not set | 1086 | # CONFIG_AFS_FS is not set |
| @@ -824,7 +1091,6 @@ CONFIG_SUNRPC=y | |||
| 824 | # | 1091 | # |
| 825 | # CONFIG_PARTITION_ADVANCED is not set | 1092 | # CONFIG_PARTITION_ADVANCED is not set |
| 826 | CONFIG_MSDOS_PARTITION=y | 1093 | CONFIG_MSDOS_PARTITION=y |
| 827 | CONFIG_SGI_PARTITION=y | ||
| 828 | 1094 | ||
| 829 | # | 1095 | # |
| 830 | # Native Language Support | 1096 | # Native Language Support |
| @@ -880,6 +1146,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 880 | # | 1146 | # |
| 881 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1147 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 882 | # CONFIG_PRINTK_TIME is not set | 1148 | # CONFIG_PRINTK_TIME is not set |
| 1149 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 883 | CONFIG_MAGIC_SYSRQ=y | 1150 | CONFIG_MAGIC_SYSRQ=y |
| 884 | # CONFIG_UNUSED_SYMBOLS is not set | 1151 | # CONFIG_UNUSED_SYMBOLS is not set |
| 885 | CONFIG_DEBUG_KERNEL=y | 1152 | CONFIG_DEBUG_KERNEL=y |
| @@ -893,13 +1160,17 @@ CONFIG_DEBUG_SLAB=y | |||
| 893 | # CONFIG_DEBUG_SPINLOCK is not set | 1160 | # CONFIG_DEBUG_SPINLOCK is not set |
| 894 | CONFIG_DEBUG_MUTEXES=y | 1161 | CONFIG_DEBUG_MUTEXES=y |
| 895 | # CONFIG_DEBUG_RWSEMS is not set | 1162 | # CONFIG_DEBUG_RWSEMS is not set |
| 1163 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1164 | # CONFIG_PROVE_LOCKING is not set | ||
| 896 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1165 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 897 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1166 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 898 | # CONFIG_DEBUG_KOBJECT is not set | 1167 | # CONFIG_DEBUG_KOBJECT is not set |
| 899 | # CONFIG_DEBUG_INFO is not set | 1168 | # CONFIG_DEBUG_INFO is not set |
| 900 | # CONFIG_DEBUG_FS is not set | 1169 | # CONFIG_DEBUG_FS is not set |
| 901 | # CONFIG_DEBUG_VM is not set | 1170 | # CONFIG_DEBUG_VM is not set |
| 1171 | # CONFIG_DEBUG_LIST is not set | ||
| 902 | CONFIG_FORCED_INLINING=y | 1172 | CONFIG_FORCED_INLINING=y |
| 1173 | # CONFIG_HEADERS_CHECK is not set | ||
| 903 | # CONFIG_RCU_TORTURE_TEST is not set | 1174 | # CONFIG_RCU_TORTURE_TEST is not set |
| 904 | CONFIG_CROSSCOMPILE=y | 1175 | CONFIG_CROSSCOMPILE=y |
| 905 | CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" | 1176 | CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" |
| @@ -918,6 +1189,9 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" | |||
| 918 | # Cryptographic options | 1189 | # Cryptographic options |
| 919 | # | 1190 | # |
| 920 | CONFIG_CRYPTO=y | 1191 | CONFIG_CRYPTO=y |
| 1192 | CONFIG_CRYPTO_ALGAPI=m | ||
| 1193 | CONFIG_CRYPTO_BLKCIPHER=m | ||
| 1194 | CONFIG_CRYPTO_MANAGER=m | ||
| 921 | # CONFIG_CRYPTO_HMAC is not set | 1195 | # CONFIG_CRYPTO_HMAC is not set |
| 922 | # CONFIG_CRYPTO_NULL is not set | 1196 | # CONFIG_CRYPTO_NULL is not set |
| 923 | # CONFIG_CRYPTO_MD4 is not set | 1197 | # CONFIG_CRYPTO_MD4 is not set |
| @@ -927,6 +1201,8 @@ CONFIG_CRYPTO_MD5=m | |||
| 927 | # CONFIG_CRYPTO_SHA512 is not set | 1201 | # CONFIG_CRYPTO_SHA512 is not set |
| 928 | # CONFIG_CRYPTO_WP512 is not set | 1202 | # CONFIG_CRYPTO_WP512 is not set |
| 929 | # CONFIG_CRYPTO_TGR192 is not set | 1203 | # CONFIG_CRYPTO_TGR192 is not set |
| 1204 | CONFIG_CRYPTO_ECB=m | ||
| 1205 | CONFIG_CRYPTO_CBC=m | ||
| 930 | # CONFIG_CRYPTO_DES is not set | 1206 | # CONFIG_CRYPTO_DES is not set |
| 931 | # CONFIG_CRYPTO_BLOWFISH is not set | 1207 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 932 | # CONFIG_CRYPTO_TWOFISH is not set | 1208 | # CONFIG_CRYPTO_TWOFISH is not set |
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig index e93266b37dd9..64b9fbf44a64 100644 --- a/arch/mips/configs/pnx8550-v2pci_defconfig +++ b/arch/mips/configs/pnx8550-v2pci_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc1 | 3 | # Linux kernel version: 2.6.19-rc2 |
| 4 | # Thu Jul 6 10:04:18 2006 | 4 | # Sat Oct 14 23:12:15 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -25,8 +25,6 @@ CONFIG_MIPS=y | |||
| 25 | # CONFIG_MIPS_COBALT is not set | 25 | # CONFIG_MIPS_COBALT is not set |
| 26 | # CONFIG_MACH_DECSTATION is not set | 26 | # CONFIG_MACH_DECSTATION is not set |
| 27 | # CONFIG_MIPS_EV64120 is not set | 27 | # CONFIG_MIPS_EV64120 is not set |
| 28 | # CONFIG_MIPS_IVR is not set | ||
| 29 | # CONFIG_MIPS_ITE8172 is not set | ||
| 30 | # CONFIG_MACH_JAZZ is not set | 28 | # CONFIG_MACH_JAZZ is not set |
| 31 | # CONFIG_LASAT is not set | 29 | # CONFIG_LASAT is not set |
| 32 | # CONFIG_MIPS_ATLAS is not set | 30 | # CONFIG_MIPS_ATLAS is not set |
| @@ -40,14 +38,14 @@ CONFIG_MIPS=y | |||
| 40 | # CONFIG_MOMENCO_OCELOT_C is not set | 38 | # CONFIG_MOMENCO_OCELOT_C is not set |
| 41 | # CONFIG_MOMENCO_OCELOT_G is not set | 39 | # CONFIG_MOMENCO_OCELOT_G is not set |
| 42 | # CONFIG_MIPS_XXS1500 is not set | 40 | # CONFIG_MIPS_XXS1500 is not set |
| 43 | # CONFIG_PNX8550_V2PCI is not set | 41 | CONFIG_PNX8550_V2PCI=y |
| 44 | # CONFIG_PNX8550_JBS is not set | 42 | # CONFIG_PNX8550_JBS is not set |
| 45 | # CONFIG_DDB5477 is not set | 43 | # CONFIG_DDB5477 is not set |
| 46 | # CONFIG_MACH_VR41XX is not set | 44 | # CONFIG_MACH_VR41XX is not set |
| 47 | # CONFIG_PMC_YOSEMITE is not set | 45 | # CONFIG_PMC_YOSEMITE is not set |
| 48 | # CONFIG_QEMU is not set | 46 | # CONFIG_QEMU is not set |
| 49 | # CONFIG_MARKEINS is not set | 47 | # CONFIG_MARKEINS is not set |
| 50 | CONFIG_SGI_IP22=y | 48 | # CONFIG_SGI_IP22 is not set |
| 51 | # CONFIG_SGI_IP27 is not set | 49 | # CONFIG_SGI_IP27 is not set |
| 52 | # CONFIG_SGI_IP32 is not set | 50 | # CONFIG_SGI_IP32 is not set |
| 53 | # CONFIG_SIBYTE_BIGSUR is not set | 51 | # CONFIG_SIBYTE_BIGSUR is not set |
| @@ -67,25 +65,21 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
| 67 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 65 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 68 | CONFIG_GENERIC_HWEIGHT=y | 66 | CONFIG_GENERIC_HWEIGHT=y |
| 69 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 67 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 68 | CONFIG_GENERIC_TIME=y | ||
| 70 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 69 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 71 | CONFIG_ARC=y | ||
| 72 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 73 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 74 | CONFIG_CPU_BIG_ENDIAN=y | 72 | # CONFIG_CPU_BIG_ENDIAN is not set |
| 75 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 73 | CONFIG_CPU_LITTLE_ENDIAN=y |
| 76 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 74 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| 77 | CONFIG_IRQ_CPU=y | 75 | CONFIG_PNX8550=y |
| 78 | CONFIG_SWAP_IO_SPACE=y | 76 | CONFIG_SOC_PNX8550=y |
| 79 | CONFIG_ARC32=y | ||
| 80 | CONFIG_BOOT_ELF32=y | ||
| 81 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 77 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
| 82 | # CONFIG_ARC_CONSOLE is not set | ||
| 83 | CONFIG_ARC_PROMLIB=y | ||
| 84 | 78 | ||
| 85 | # | 79 | # |
| 86 | # CPU selection | 80 | # CPU selection |
| 87 | # | 81 | # |
| 88 | # CONFIG_CPU_MIPS32_R1 is not set | 82 | CONFIG_CPU_MIPS32_R1=y |
| 89 | # CONFIG_CPU_MIPS32_R2 is not set | 83 | # CONFIG_CPU_MIPS32_R2 is not set |
| 90 | # CONFIG_CPU_MIPS64_R1 is not set | 84 | # CONFIG_CPU_MIPS64_R1 is not set |
| 91 | # CONFIG_CPU_MIPS64_R2 is not set | 85 | # CONFIG_CPU_MIPS64_R2 is not set |
| @@ -93,7 +87,7 @@ CONFIG_ARC_PROMLIB=y | |||
| 93 | # CONFIG_CPU_TX39XX is not set | 87 | # CONFIG_CPU_TX39XX is not set |
| 94 | # CONFIG_CPU_VR41XX is not set | 88 | # CONFIG_CPU_VR41XX is not set |
| 95 | # CONFIG_CPU_R4300 is not set | 89 | # CONFIG_CPU_R4300 is not set |
| 96 | CONFIG_CPU_R4X00=y | 90 | # CONFIG_CPU_R4X00 is not set |
| 97 | # CONFIG_CPU_TX49XX is not set | 91 | # CONFIG_CPU_TX49XX is not set |
| 98 | # CONFIG_CPU_R5000 is not set | 92 | # CONFIG_CPU_R5000 is not set |
| 99 | # CONFIG_CPU_R5432 is not set | 93 | # CONFIG_CPU_R5432 is not set |
| @@ -104,12 +98,11 @@ CONFIG_CPU_R4X00=y | |||
| 104 | # CONFIG_CPU_RM7000 is not set | 98 | # CONFIG_CPU_RM7000 is not set |
| 105 | # CONFIG_CPU_RM9000 is not set | 99 | # CONFIG_CPU_RM9000 is not set |
| 106 | # CONFIG_CPU_SB1 is not set | 100 | # CONFIG_CPU_SB1 is not set |
| 107 | CONFIG_SYS_HAS_CPU_R4X00=y | 101 | CONFIG_SYS_HAS_CPU_MIPS32_R1=y |
| 108 | CONFIG_SYS_HAS_CPU_R5000=y | 102 | CONFIG_CPU_MIPS32=y |
| 103 | CONFIG_CPU_MIPSR1=y | ||
| 109 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 104 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
| 110 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
| 111 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 105 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
| 112 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | ||
| 113 | 106 | ||
| 114 | # | 107 | # |
| 115 | # Kernel type | 108 | # Kernel type |
| @@ -120,17 +113,17 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 120 | # CONFIG_PAGE_SIZE_8KB is not set | 113 | # CONFIG_PAGE_SIZE_8KB is not set |
| 121 | # CONFIG_PAGE_SIZE_16KB is not set | 114 | # CONFIG_PAGE_SIZE_16KB is not set |
| 122 | # CONFIG_PAGE_SIZE_64KB is not set | 115 | # CONFIG_PAGE_SIZE_64KB is not set |
| 123 | CONFIG_BOARD_SCACHE=y | 116 | CONFIG_CPU_HAS_PREFETCH=y |
| 124 | CONFIG_IP22_CPU_SCACHE=y | ||
| 125 | CONFIG_MIPS_MT_DISABLED=y | 117 | CONFIG_MIPS_MT_DISABLED=y |
| 126 | # CONFIG_MIPS_MT_SMTC is not set | ||
| 127 | # CONFIG_MIPS_MT_SMP is not set | 118 | # CONFIG_MIPS_MT_SMP is not set |
| 119 | # CONFIG_MIPS_MT_SMTC is not set | ||
| 128 | # CONFIG_MIPS_VPE_LOADER is not set | 120 | # CONFIG_MIPS_VPE_LOADER is not set |
| 129 | # CONFIG_64BIT_PHYS_ADDR is not set | 121 | # CONFIG_64BIT_PHYS_ADDR is not set |
| 130 | CONFIG_CPU_HAS_LLSC=y | 122 | CONFIG_CPU_HAS_LLSC=y |
| 131 | CONFIG_CPU_HAS_SYNC=y | 123 | CONFIG_CPU_HAS_SYNC=y |
| 132 | CONFIG_GENERIC_HARDIRQS=y | 124 | CONFIG_GENERIC_HARDIRQS=y |
| 133 | CONFIG_GENERIC_IRQ_PROBE=y | 125 | CONFIG_GENERIC_IRQ_PROBE=y |
| 126 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
| 134 | CONFIG_ARCH_FLATMEM_ENABLE=y | 127 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 135 | CONFIG_SELECT_MEMORY_MODEL=y | 128 | CONFIG_SELECT_MEMORY_MODEL=y |
| 136 | CONFIG_FLATMEM_MANUAL=y | 129 | CONFIG_FLATMEM_MANUAL=y |
| @@ -144,12 +137,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 144 | # CONFIG_HZ_48 is not set | 137 | # CONFIG_HZ_48 is not set |
| 145 | # CONFIG_HZ_100 is not set | 138 | # CONFIG_HZ_100 is not set |
| 146 | # CONFIG_HZ_128 is not set | 139 | # CONFIG_HZ_128 is not set |
| 147 | # CONFIG_HZ_250 is not set | 140 | CONFIG_HZ_250=y |
| 148 | # CONFIG_HZ_256 is not set | 141 | # CONFIG_HZ_256 is not set |
| 149 | CONFIG_HZ_1000=y | 142 | # CONFIG_HZ_1000 is not set |
| 150 | # CONFIG_HZ_1024 is not set | 143 | # CONFIG_HZ_1024 is not set |
| 151 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 144 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
| 152 | CONFIG_HZ=1000 | 145 | CONFIG_HZ=250 |
| 153 | CONFIG_PREEMPT_NONE=y | 146 | CONFIG_PREEMPT_NONE=y |
| 154 | # CONFIG_PREEMPT_VOLUNTARY is not set | 147 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 155 | # CONFIG_PREEMPT is not set | 148 | # CONFIG_PREEMPT is not set |
| @@ -171,16 +164,20 @@ CONFIG_LOCALVERSION="" | |||
| 171 | CONFIG_LOCALVERSION_AUTO=y | 164 | CONFIG_LOCALVERSION_AUTO=y |
| 172 | CONFIG_SWAP=y | 165 | CONFIG_SWAP=y |
| 173 | CONFIG_SYSVIPC=y | 166 | CONFIG_SYSVIPC=y |
| 167 | # CONFIG_IPC_NS is not set | ||
| 174 | # CONFIG_POSIX_MQUEUE is not set | 168 | # CONFIG_POSIX_MQUEUE is not set |
| 175 | # CONFIG_BSD_PROCESS_ACCT is not set | 169 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 176 | CONFIG_SYSCTL=y | 170 | # CONFIG_TASKSTATS is not set |
| 171 | # CONFIG_UTS_NS is not set | ||
| 177 | # CONFIG_AUDIT is not set | 172 | # CONFIG_AUDIT is not set |
| 178 | CONFIG_IKCONFIG=y | 173 | CONFIG_IKCONFIG=y |
| 179 | CONFIG_IKCONFIG_PROC=y | 174 | CONFIG_IKCONFIG_PROC=y |
| 180 | # CONFIG_RELAY is not set | 175 | # CONFIG_RELAY is not set |
| 181 | CONFIG_INITRAMFS_SOURCE="" | 176 | CONFIG_INITRAMFS_SOURCE="" |
| 182 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 177 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 178 | CONFIG_SYSCTL=y | ||
| 183 | CONFIG_EMBEDDED=y | 179 | CONFIG_EMBEDDED=y |
| 180 | # CONFIG_SYSCTL_SYSCALL is not set | ||
| 184 | CONFIG_KALLSYMS=y | 181 | CONFIG_KALLSYMS=y |
| 185 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 182 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 186 | CONFIG_HOTPLUG=y | 183 | CONFIG_HOTPLUG=y |
| @@ -188,12 +185,12 @@ CONFIG_PRINTK=y | |||
| 188 | CONFIG_BUG=y | 185 | CONFIG_BUG=y |
| 189 | CONFIG_ELF_CORE=y | 186 | CONFIG_ELF_CORE=y |
| 190 | CONFIG_BASE_FULL=y | 187 | CONFIG_BASE_FULL=y |
| 191 | CONFIG_RT_MUTEXES=y | ||
| 192 | CONFIG_FUTEX=y | 188 | CONFIG_FUTEX=y |
| 193 | CONFIG_EPOLL=y | 189 | CONFIG_EPOLL=y |
| 194 | CONFIG_SHMEM=y | 190 | CONFIG_SHMEM=y |
| 195 | CONFIG_SLAB=y | 191 | CONFIG_SLAB=y |
| 196 | CONFIG_VM_EVENT_COUNTERS=y | 192 | CONFIG_VM_EVENT_COUNTERS=y |
| 193 | CONFIG_RT_MUTEXES=y | ||
| 197 | # CONFIG_TINY_SHMEM is not set | 194 | # CONFIG_TINY_SHMEM is not set |
| 198 | CONFIG_BASE_SMALL=0 | 195 | CONFIG_BASE_SMALL=0 |
| 199 | # CONFIG_SLOB is not set | 196 | # CONFIG_SLOB is not set |
| @@ -210,6 +207,7 @@ CONFIG_KMOD=y | |||
| 210 | # | 207 | # |
| 211 | # Block layer | 208 | # Block layer |
| 212 | # | 209 | # |
| 210 | CONFIG_BLOCK=y | ||
| 213 | # CONFIG_LBD is not set | 211 | # CONFIG_LBD is not set |
| 214 | # CONFIG_BLK_DEV_IO_TRACE is not set | 212 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 215 | # CONFIG_LSF is not set | 213 | # CONFIG_LSF is not set |
| @@ -230,8 +228,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 230 | # | 228 | # |
| 231 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 229 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 232 | # | 230 | # |
| 233 | CONFIG_HW_HAS_EISA=y | 231 | CONFIG_HW_HAS_PCI=y |
| 234 | # CONFIG_EISA is not set | 232 | CONFIG_PCI=y |
| 233 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
| 235 | CONFIG_MMU=y | 234 | CONFIG_MMU=y |
| 236 | 235 | ||
| 237 | # | 236 | # |
| @@ -242,6 +241,7 @@ CONFIG_MMU=y | |||
| 242 | # | 241 | # |
| 243 | # PCI Hotplug Support | 242 | # PCI Hotplug Support |
| 244 | # | 243 | # |
| 244 | # CONFIG_HOTPLUG_PCI is not set | ||
| 245 | 245 | ||
| 246 | # | 246 | # |
| 247 | # Executable file formats | 247 | # Executable file formats |
| @@ -264,6 +264,7 @@ CONFIG_PACKET=y | |||
| 264 | CONFIG_UNIX=y | 264 | CONFIG_UNIX=y |
| 265 | CONFIG_XFRM=y | 265 | CONFIG_XFRM=y |
| 266 | # CONFIG_XFRM_USER is not set | 266 | # CONFIG_XFRM_USER is not set |
| 267 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 267 | # CONFIG_NET_KEY is not set | 268 | # CONFIG_NET_KEY is not set |
| 268 | CONFIG_INET=y | 269 | CONFIG_INET=y |
| 269 | # CONFIG_IP_MULTICAST is not set | 270 | # CONFIG_IP_MULTICAST is not set |
| @@ -282,12 +283,14 @@ CONFIG_IP_PNP=y | |||
| 282 | # CONFIG_INET_IPCOMP is not set | 283 | # CONFIG_INET_IPCOMP is not set |
| 283 | # CONFIG_INET_XFRM_TUNNEL is not set | 284 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 284 | # CONFIG_INET_TUNNEL is not set | 285 | # CONFIG_INET_TUNNEL is not set |
| 285 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 286 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 286 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 287 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 288 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 287 | CONFIG_INET_DIAG=y | 289 | CONFIG_INET_DIAG=y |
| 288 | CONFIG_INET_TCP_DIAG=y | 290 | CONFIG_INET_TCP_DIAG=y |
| 289 | # CONFIG_TCP_CONG_ADVANCED is not set | 291 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 290 | CONFIG_TCP_CONG_BIC=y | 292 | CONFIG_TCP_CONG_CUBIC=y |
| 293 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 291 | 294 | ||
| 292 | # | 295 | # |
| 293 | # IP: Virtual Server Configuration | 296 | # IP: Virtual Server Configuration |
| @@ -300,12 +303,18 @@ CONFIG_IPV6_ROUTE_INFO=y | |||
| 300 | # CONFIG_INET6_AH is not set | 303 | # CONFIG_INET6_AH is not set |
| 301 | # CONFIG_INET6_ESP is not set | 304 | # CONFIG_INET6_ESP is not set |
| 302 | # CONFIG_INET6_IPCOMP is not set | 305 | # CONFIG_INET6_IPCOMP is not set |
| 306 | # CONFIG_IPV6_MIP6 is not set | ||
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | 307 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 304 | # CONFIG_INET6_TUNNEL is not set | 308 | # CONFIG_INET6_TUNNEL is not set |
| 305 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | 309 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m |
| 306 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | 310 | CONFIG_INET6_XFRM_MODE_TUNNEL=m |
| 311 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
| 312 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 313 | CONFIG_IPV6_SIT=m | ||
| 307 | # CONFIG_IPV6_TUNNEL is not set | 314 | # CONFIG_IPV6_TUNNEL is not set |
| 308 | CONFIG_NETWORK_SECMARK=y | 315 | # CONFIG_IPV6_SUBTREES is not set |
| 316 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 317 | # CONFIG_NETWORK_SECMARK is not set | ||
| 309 | CONFIG_NETFILTER=y | 318 | CONFIG_NETFILTER=y |
| 310 | # CONFIG_NETFILTER_DEBUG is not set | 319 | # CONFIG_NETFILTER_DEBUG is not set |
| 311 | 320 | ||
| @@ -318,9 +327,9 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 318 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | 327 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m |
| 319 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 328 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 320 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 329 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
| 321 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | ||
| 322 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 330 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
| 323 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 331 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
| 332 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | ||
| 324 | CONFIG_NETFILTER_XT_MATCH_ESP=m | 333 | CONFIG_NETFILTER_XT_MATCH_ESP=m |
| 325 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | 334 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m |
| 326 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | 335 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m |
| @@ -329,10 +338,10 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m | |||
| 329 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | 338 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set |
| 330 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | 339 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m |
| 331 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | 340 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m |
| 332 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | 341 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set |
| 333 | CONFIG_NETFILTER_XT_MATCH_REALM=m | 342 | CONFIG_NETFILTER_XT_MATCH_REALM=m |
| 334 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | 343 | CONFIG_NETFILTER_XT_MATCH_SCTP=m |
| 335 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 344 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
| 336 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 345 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
| 337 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 346 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
| 338 | 347 | ||
| @@ -373,7 +382,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | |||
| 373 | # CONFIG_ATALK is not set | 382 | # CONFIG_ATALK is not set |
| 374 | # CONFIG_X25 is not set | 383 | # CONFIG_X25 is not set |
| 375 | # CONFIG_LAPB is not set | 384 | # CONFIG_LAPB is not set |
| 376 | # CONFIG_NET_DIVERT is not set | ||
| 377 | # CONFIG_ECONET is not set | 385 | # CONFIG_ECONET is not set |
| 378 | # CONFIG_WAN_ROUTER is not set | 386 | # CONFIG_WAN_ROUTER is not set |
| 379 | 387 | ||
| @@ -426,13 +434,20 @@ CONFIG_FW_LOADER=y | |||
| 426 | # | 434 | # |
| 427 | # Block devices | 435 | # Block devices |
| 428 | # | 436 | # |
| 437 | # CONFIG_BLK_CPQ_DA is not set | ||
| 438 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 439 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 440 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 429 | # CONFIG_BLK_DEV_COW_COMMON is not set | 441 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 430 | CONFIG_BLK_DEV_LOOP=y | 442 | CONFIG_BLK_DEV_LOOP=y |
| 431 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 443 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 432 | # CONFIG_BLK_DEV_NBD is not set | 444 | # CONFIG_BLK_DEV_NBD is not set |
| 445 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 446 | # CONFIG_BLK_DEV_UB is not set | ||
| 433 | CONFIG_BLK_DEV_RAM=y | 447 | CONFIG_BLK_DEV_RAM=y |
| 434 | CONFIG_BLK_DEV_RAM_COUNT=16 | 448 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 435 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 449 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
| 450 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 436 | CONFIG_BLK_DEV_INITRD=y | 451 | CONFIG_BLK_DEV_INITRD=y |
| 437 | # CONFIG_CDROM_PKTCDVD is not set | 452 | # CONFIG_CDROM_PKTCDVD is not set |
| 438 | # CONFIG_ATA_OVER_ETH is not set | 453 | # CONFIG_ATA_OVER_ETH is not set |
| @@ -441,6 +456,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 441 | # ATA/ATAPI/MFM/RLL support | 456 | # ATA/ATAPI/MFM/RLL support |
| 442 | # | 457 | # |
| 443 | CONFIG_IDE=y | 458 | CONFIG_IDE=y |
| 459 | CONFIG_IDE_MAX_HWIFS=4 | ||
| 444 | CONFIG_BLK_DEV_IDE=y | 460 | CONFIG_BLK_DEV_IDE=y |
| 445 | 461 | ||
| 446 | # | 462 | # |
| @@ -459,9 +475,41 @@ CONFIG_IDEDISK_MULTI_MODE=y | |||
| 459 | # IDE chipset support/bugfixes | 475 | # IDE chipset support/bugfixes |
| 460 | # | 476 | # |
| 461 | CONFIG_IDE_GENERIC=y | 477 | CONFIG_IDE_GENERIC=y |
| 478 | CONFIG_BLK_DEV_IDEPCI=y | ||
| 479 | CONFIG_IDEPCI_SHARE_IRQ=y | ||
| 480 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
| 481 | # CONFIG_BLK_DEV_GENERIC is not set | ||
| 482 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 483 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
| 484 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 485 | CONFIG_IDEDMA_PCI_AUTO=y | ||
| 486 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
| 487 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 488 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 489 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
| 490 | CONFIG_BLK_DEV_CMD64X=y | ||
| 491 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 492 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 493 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 494 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 495 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 496 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 497 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 498 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 499 | # CONFIG_BLK_DEV_PIIX is not set | ||
| 500 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 501 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 502 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 503 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
| 504 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 505 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 506 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 507 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 508 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 462 | # CONFIG_IDE_ARM is not set | 509 | # CONFIG_IDE_ARM is not set |
| 463 | # CONFIG_BLK_DEV_IDEDMA is not set | 510 | CONFIG_BLK_DEV_IDEDMA=y |
| 464 | # CONFIG_IDEDMA_AUTO is not set | 511 | # CONFIG_IDEDMA_IVB is not set |
| 512 | CONFIG_IDEDMA_AUTO=y | ||
| 465 | # CONFIG_BLK_DEV_HD is not set | 513 | # CONFIG_BLK_DEV_HD is not set |
| 466 | 514 | ||
| 467 | # | 515 | # |
| @@ -469,6 +517,7 @@ CONFIG_IDE_GENERIC=y | |||
| 469 | # | 517 | # |
| 470 | # CONFIG_RAID_ATTRS is not set | 518 | # CONFIG_RAID_ATTRS is not set |
| 471 | CONFIG_SCSI=y | 519 | CONFIG_SCSI=y |
| 520 | CONFIG_SCSI_NETLINK=y | ||
| 472 | CONFIG_SCSI_PROC_FS=y | 521 | CONFIG_SCSI_PROC_FS=y |
| 473 | 522 | ||
| 474 | # | 523 | # |
| @@ -489,22 +538,59 @@ CONFIG_BLK_DEV_SD=y | |||
| 489 | # CONFIG_SCSI_LOGGING is not set | 538 | # CONFIG_SCSI_LOGGING is not set |
| 490 | 539 | ||
| 491 | # | 540 | # |
| 492 | # SCSI Transport Attributes | 541 | # SCSI Transports |
| 493 | # | 542 | # |
| 494 | CONFIG_SCSI_SPI_ATTRS=m | 543 | CONFIG_SCSI_SPI_ATTRS=m |
| 495 | CONFIG_SCSI_FC_ATTRS=y | 544 | CONFIG_SCSI_FC_ATTRS=y |
| 496 | CONFIG_SCSI_ISCSI_ATTRS=m | 545 | CONFIG_SCSI_ISCSI_ATTRS=m |
| 497 | # CONFIG_SCSI_SAS_ATTRS is not set | 546 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 547 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 498 | 548 | ||
| 499 | # | 549 | # |
| 500 | # SCSI low-level drivers | 550 | # SCSI low-level drivers |
| 501 | # | 551 | # |
| 502 | CONFIG_ISCSI_TCP=m | 552 | CONFIG_ISCSI_TCP=m |
| 503 | # CONFIG_SGIWD93_SCSI is not set | 553 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
| 504 | # CONFIG_SCSI_SATA is not set | 554 | # CONFIG_SCSI_3W_9XXX is not set |
| 555 | # CONFIG_SCSI_ACARD is not set | ||
| 556 | # CONFIG_SCSI_AACRAID is not set | ||
| 557 | CONFIG_SCSI_AIC7XXX=m | ||
| 558 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 | ||
| 559 | CONFIG_AIC7XXX_RESET_DELAY_MS=15000 | ||
| 560 | # CONFIG_AIC7XXX_DEBUG_ENABLE is not set | ||
| 561 | CONFIG_AIC7XXX_DEBUG_MASK=0 | ||
| 562 | # CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set | ||
| 563 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 564 | # CONFIG_SCSI_AIC79XX is not set | ||
| 565 | # CONFIG_SCSI_AIC94XX is not set | ||
| 566 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 567 | # CONFIG_SCSI_ARCMSR is not set | ||
| 568 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 569 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 570 | # CONFIG_MEGARAID_SAS is not set | ||
| 571 | # CONFIG_SCSI_HPTIOP is not set | ||
| 572 | # CONFIG_SCSI_DMX3191D is not set | ||
| 573 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 574 | # CONFIG_SCSI_IPS is not set | ||
| 575 | # CONFIG_SCSI_INITIO is not set | ||
| 576 | # CONFIG_SCSI_INIA100 is not set | ||
| 577 | # CONFIG_SCSI_STEX is not set | ||
| 578 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 579 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 580 | # CONFIG_SCSI_QLA_FC is not set | ||
| 581 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 582 | # CONFIG_SCSI_LPFC is not set | ||
| 583 | # CONFIG_SCSI_DC395x is not set | ||
| 584 | # CONFIG_SCSI_DC390T is not set | ||
| 585 | # CONFIG_SCSI_NSP32 is not set | ||
| 505 | # CONFIG_SCSI_DEBUG is not set | 586 | # CONFIG_SCSI_DEBUG is not set |
| 506 | 587 | ||
| 507 | # | 588 | # |
| 589 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 590 | # | ||
| 591 | # CONFIG_ATA is not set | ||
| 592 | |||
| 593 | # | ||
| 508 | # Multi-device support (RAID and LVM) | 594 | # Multi-device support (RAID and LVM) |
| 509 | # | 595 | # |
| 510 | # CONFIG_MD is not set | 596 | # CONFIG_MD is not set |
| @@ -513,14 +599,19 @@ CONFIG_ISCSI_TCP=m | |||
| 513 | # Fusion MPT device support | 599 | # Fusion MPT device support |
| 514 | # | 600 | # |
| 515 | # CONFIG_FUSION is not set | 601 | # CONFIG_FUSION is not set |
| 602 | # CONFIG_FUSION_SPI is not set | ||
| 603 | # CONFIG_FUSION_FC is not set | ||
| 604 | # CONFIG_FUSION_SAS is not set | ||
| 516 | 605 | ||
| 517 | # | 606 | # |
| 518 | # IEEE 1394 (FireWire) support | 607 | # IEEE 1394 (FireWire) support |
| 519 | # | 608 | # |
| 609 | # CONFIG_IEEE1394 is not set | ||
| 520 | 610 | ||
| 521 | # | 611 | # |
| 522 | # I2O device support | 612 | # I2O device support |
| 523 | # | 613 | # |
| 614 | # CONFIG_I2O is not set | ||
| 524 | 615 | ||
| 525 | # | 616 | # |
| 526 | # Network device support | 617 | # Network device support |
| @@ -532,6 +623,11 @@ CONFIG_NETDEVICES=y | |||
| 532 | CONFIG_TUN=m | 623 | CONFIG_TUN=m |
| 533 | 624 | ||
| 534 | # | 625 | # |
| 626 | # ARCnet devices | ||
| 627 | # | ||
| 628 | # CONFIG_ARCNET is not set | ||
| 629 | |||
| 630 | # | ||
| 535 | # PHY device support | 631 | # PHY device support |
| 536 | # | 632 | # |
| 537 | # CONFIG_PHYLIB is not set | 633 | # CONFIG_PHYLIB is not set |
| @@ -541,20 +637,73 @@ CONFIG_TUN=m | |||
| 541 | # | 637 | # |
| 542 | CONFIG_NET_ETHERNET=y | 638 | CONFIG_NET_ETHERNET=y |
| 543 | CONFIG_MII=y | 639 | CONFIG_MII=y |
| 640 | # CONFIG_HAPPYMEAL is not set | ||
| 641 | # CONFIG_SUNGEM is not set | ||
| 642 | # CONFIG_CASSINI is not set | ||
| 643 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 544 | # CONFIG_DM9000 is not set | 644 | # CONFIG_DM9000 is not set |
| 545 | # CONFIG_SGISEEQ is not set | 645 | |
| 646 | # | ||
| 647 | # Tulip family network device support | ||
| 648 | # | ||
| 649 | # CONFIG_NET_TULIP is not set | ||
| 650 | # CONFIG_HP100 is not set | ||
| 651 | CONFIG_NET_PCI=y | ||
| 652 | # CONFIG_PCNET32 is not set | ||
| 653 | # CONFIG_AMD8111_ETH is not set | ||
| 654 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
| 655 | # CONFIG_B44 is not set | ||
| 656 | # CONFIG_FORCEDETH is not set | ||
| 657 | # CONFIG_DGRS is not set | ||
| 658 | # CONFIG_EEPRO100 is not set | ||
| 659 | # CONFIG_E100 is not set | ||
| 660 | # CONFIG_FEALNX is not set | ||
| 661 | CONFIG_NATSEMI=y | ||
| 662 | # CONFIG_NE2K_PCI is not set | ||
| 663 | # CONFIG_8139CP is not set | ||
| 664 | CONFIG_8139TOO=y | ||
| 665 | # CONFIG_8139TOO_PIO is not set | ||
| 666 | # CONFIG_8139TOO_TUNE_TWISTER is not set | ||
| 667 | # CONFIG_8139TOO_8129 is not set | ||
| 668 | # CONFIG_8139_OLD_RX_RESET is not set | ||
| 669 | # CONFIG_SIS900 is not set | ||
| 670 | # CONFIG_EPIC100 is not set | ||
| 671 | # CONFIG_SUNDANCE is not set | ||
| 672 | # CONFIG_TLAN is not set | ||
| 673 | # CONFIG_VIA_RHINE is not set | ||
| 674 | # CONFIG_LAN_SAA9730 is not set | ||
| 546 | 675 | ||
| 547 | # | 676 | # |
| 548 | # Ethernet (1000 Mbit) | 677 | # Ethernet (1000 Mbit) |
| 549 | # | 678 | # |
| 679 | # CONFIG_ACENIC is not set | ||
| 680 | # CONFIG_DL2K is not set | ||
| 681 | # CONFIG_E1000 is not set | ||
| 682 | # CONFIG_NS83820 is not set | ||
| 683 | # CONFIG_HAMACHI is not set | ||
| 684 | # CONFIG_YELLOWFIN is not set | ||
| 685 | # CONFIG_R8169 is not set | ||
| 686 | # CONFIG_SIS190 is not set | ||
| 687 | # CONFIG_SKGE is not set | ||
| 688 | # CONFIG_SKY2 is not set | ||
| 689 | # CONFIG_SK98LIN is not set | ||
| 690 | # CONFIG_VIA_VELOCITY is not set | ||
| 691 | # CONFIG_TIGON3 is not set | ||
| 692 | # CONFIG_BNX2 is not set | ||
| 693 | # CONFIG_QLA3XXX is not set | ||
| 550 | 694 | ||
| 551 | # | 695 | # |
| 552 | # Ethernet (10000 Mbit) | 696 | # Ethernet (10000 Mbit) |
| 553 | # | 697 | # |
| 698 | # CONFIG_CHELSIO_T1 is not set | ||
| 699 | # CONFIG_IXGB is not set | ||
| 700 | # CONFIG_S2IO is not set | ||
| 701 | # CONFIG_MYRI10GE is not set | ||
| 554 | 702 | ||
| 555 | # | 703 | # |
| 556 | # Token Ring devices | 704 | # Token Ring devices |
| 557 | # | 705 | # |
| 706 | # CONFIG_TR is not set | ||
| 558 | 707 | ||
| 559 | # | 708 | # |
| 560 | # Wireless LAN (non-hamradio) | 709 | # Wireless LAN (non-hamradio) |
| @@ -565,6 +714,8 @@ CONFIG_MII=y | |||
| 565 | # Wan interfaces | 714 | # Wan interfaces |
| 566 | # | 715 | # |
| 567 | # CONFIG_WAN is not set | 716 | # CONFIG_WAN is not set |
| 717 | # CONFIG_FDDI is not set | ||
| 718 | # CONFIG_HIPPI is not set | ||
| 568 | CONFIG_PPP=m | 719 | CONFIG_PPP=m |
| 569 | # CONFIG_PPP_MULTILINK is not set | 720 | # CONFIG_PPP_MULTILINK is not set |
| 570 | # CONFIG_PPP_FILTER is not set | 721 | # CONFIG_PPP_FILTER is not set |
| @@ -575,6 +726,8 @@ CONFIG_PPP_DEFLATE=m | |||
| 575 | CONFIG_PPP_MPPE=m | 726 | CONFIG_PPP_MPPE=m |
| 576 | # CONFIG_PPPOE is not set | 727 | # CONFIG_PPPOE is not set |
| 577 | # CONFIG_SLIP is not set | 728 | # CONFIG_SLIP is not set |
| 729 | CONFIG_SLHC=m | ||
| 730 | # CONFIG_NET_FC is not set | ||
| 578 | # CONFIG_SHAPER is not set | 731 | # CONFIG_SHAPER is not set |
| 579 | # CONFIG_NETCONSOLE is not set | 732 | # CONFIG_NETCONSOLE is not set |
| 580 | # CONFIG_NETPOLL is not set | 733 | # CONFIG_NETPOLL is not set |
| @@ -594,6 +747,7 @@ CONFIG_PPP_MPPE=m | |||
| 594 | # Input device support | 747 | # Input device support |
| 595 | # | 748 | # |
| 596 | CONFIG_INPUT=y | 749 | CONFIG_INPUT=y |
| 750 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 597 | 751 | ||
| 598 | # | 752 | # |
| 599 | # Userland interfaces | 753 | # Userland interfaces |
| @@ -616,6 +770,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 616 | # CONFIG_KEYBOARD_LKKBD is not set | 770 | # CONFIG_KEYBOARD_LKKBD is not set |
| 617 | # CONFIG_KEYBOARD_XTKBD is not set | 771 | # CONFIG_KEYBOARD_XTKBD is not set |
| 618 | # CONFIG_KEYBOARD_NEWTON is not set | 772 | # CONFIG_KEYBOARD_NEWTON is not set |
| 773 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 619 | CONFIG_INPUT_MOUSE=y | 774 | CONFIG_INPUT_MOUSE=y |
| 620 | CONFIG_MOUSE_PS2=y | 775 | CONFIG_MOUSE_PS2=y |
| 621 | # CONFIG_MOUSE_SERIAL is not set | 776 | # CONFIG_MOUSE_SERIAL is not set |
| @@ -630,6 +785,7 @@ CONFIG_MOUSE_PS2=y | |||
| 630 | CONFIG_SERIO=y | 785 | CONFIG_SERIO=y |
| 631 | CONFIG_SERIO_I8042=y | 786 | CONFIG_SERIO_I8042=y |
| 632 | CONFIG_SERIO_SERPORT=y | 787 | CONFIG_SERIO_SERPORT=y |
| 788 | # CONFIG_SERIO_PCIPS2 is not set | ||
| 633 | CONFIG_SERIO_LIBPS2=y | 789 | CONFIG_SERIO_LIBPS2=y |
| 634 | # CONFIG_SERIO_RAW is not set | 790 | # CONFIG_SERIO_RAW is not set |
| 635 | # CONFIG_GAMEPORT is not set | 791 | # CONFIG_GAMEPORT is not set |
| @@ -640,7 +796,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 640 | CONFIG_VT=y | 796 | CONFIG_VT=y |
| 641 | # CONFIG_VT_CONSOLE is not set | 797 | # CONFIG_VT_CONSOLE is not set |
| 642 | CONFIG_HW_CONSOLE=y | 798 | CONFIG_HW_CONSOLE=y |
| 643 | CONFIG_VT_HW_CONSOLE_BINDING=y | 799 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 644 | CONFIG_SERIAL_NONSTANDARD=y | 800 | CONFIG_SERIAL_NONSTANDARD=y |
| 645 | # CONFIG_COMPUTONE is not set | 801 | # CONFIG_COMPUTONE is not set |
| 646 | # CONFIG_ROCKETPORT is not set | 802 | # CONFIG_ROCKETPORT is not set |
| @@ -650,6 +806,7 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
| 650 | # CONFIG_MOXA_SMARTIO is not set | 806 | # CONFIG_MOXA_SMARTIO is not set |
| 651 | # CONFIG_ISI is not set | 807 | # CONFIG_ISI is not set |
| 652 | # CONFIG_SYNCLINKMP is not set | 808 | # CONFIG_SYNCLINKMP is not set |
| 809 | # CONFIG_SYNCLINK_GT is not set | ||
| 653 | # CONFIG_N_HDLC is not set | 810 | # CONFIG_N_HDLC is not set |
| 654 | # CONFIG_RISCOM8 is not set | 811 | # CONFIG_RISCOM8 is not set |
| 655 | # CONFIG_SPECIALIX is not set | 812 | # CONFIG_SPECIALIX is not set |
| @@ -665,7 +822,8 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
| 665 | # | 822 | # |
| 666 | # Non-8250 serial port support | 823 | # Non-8250 serial port support |
| 667 | # | 824 | # |
| 668 | # CONFIG_SERIAL_IP22_ZILOG is not set | 825 | # CONFIG_SERIAL_IP3106 is not set |
| 826 | # CONFIG_SERIAL_JSM is not set | ||
| 669 | CONFIG_UNIX98_PTYS=y | 827 | CONFIG_UNIX98_PTYS=y |
| 670 | CONFIG_LEGACY_PTYS=y | 828 | CONFIG_LEGACY_PTYS=y |
| 671 | CONFIG_LEGACY_PTY_COUNT=256 | 829 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -679,16 +837,17 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 679 | # Watchdog Cards | 837 | # Watchdog Cards |
| 680 | # | 838 | # |
| 681 | # CONFIG_WATCHDOG is not set | 839 | # CONFIG_WATCHDOG is not set |
| 682 | # CONFIG_HW_RANDOM is not set | 840 | CONFIG_HW_RANDOM=y |
| 683 | # CONFIG_RTC is not set | 841 | # CONFIG_RTC is not set |
| 684 | # CONFIG_SGI_DS1286 is not set | ||
| 685 | # CONFIG_GEN_RTC is not set | 842 | # CONFIG_GEN_RTC is not set |
| 686 | # CONFIG_DTLK is not set | 843 | # CONFIG_DTLK is not set |
| 687 | # CONFIG_R3964 is not set | 844 | # CONFIG_R3964 is not set |
| 845 | # CONFIG_APPLICOM is not set | ||
| 688 | 846 | ||
| 689 | # | 847 | # |
| 690 | # Ftape, the floppy tape device driver | 848 | # Ftape, the floppy tape device driver |
| 691 | # | 849 | # |
| 850 | # CONFIG_DRM is not set | ||
| 692 | # CONFIG_RAW_DRIVER is not set | 851 | # CONFIG_RAW_DRIVER is not set |
| 693 | 852 | ||
| 694 | # | 853 | # |
| @@ -709,14 +868,30 @@ CONFIG_I2C_CHARDEV=m | |||
| 709 | CONFIG_I2C_ALGOBIT=m | 868 | CONFIG_I2C_ALGOBIT=m |
| 710 | # CONFIG_I2C_ALGOPCF is not set | 869 | # CONFIG_I2C_ALGOPCF is not set |
| 711 | # CONFIG_I2C_ALGOPCA is not set | 870 | # CONFIG_I2C_ALGOPCA is not set |
| 712 | # CONFIG_I2C_ALGO_SGI is not set | ||
| 713 | 871 | ||
| 714 | # | 872 | # |
| 715 | # I2C Hardware Bus support | 873 | # I2C Hardware Bus support |
| 716 | # | 874 | # |
| 875 | # CONFIG_I2C_ALI1535 is not set | ||
| 876 | # CONFIG_I2C_ALI1563 is not set | ||
| 877 | # CONFIG_I2C_ALI15X3 is not set | ||
| 878 | # CONFIG_I2C_AMD756 is not set | ||
| 879 | # CONFIG_I2C_AMD8111 is not set | ||
| 880 | # CONFIG_I2C_I801 is not set | ||
| 881 | # CONFIG_I2C_I810 is not set | ||
| 882 | # CONFIG_I2C_PIIX4 is not set | ||
| 883 | # CONFIG_I2C_NFORCE2 is not set | ||
| 717 | # CONFIG_I2C_OCORES is not set | 884 | # CONFIG_I2C_OCORES is not set |
| 718 | # CONFIG_I2C_PARPORT_LIGHT is not set | 885 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 886 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 887 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 888 | # CONFIG_I2C_SIS5595 is not set | ||
| 889 | # CONFIG_I2C_SIS630 is not set | ||
| 890 | # CONFIG_I2C_SIS96X is not set | ||
| 719 | # CONFIG_I2C_STUB is not set | 891 | # CONFIG_I2C_STUB is not set |
| 892 | # CONFIG_I2C_VIA is not set | ||
| 893 | # CONFIG_I2C_VIAPRO is not set | ||
| 894 | # CONFIG_I2C_VOODOO3 is not set | ||
| 720 | # CONFIG_I2C_PCA_ISA is not set | 895 | # CONFIG_I2C_PCA_ISA is not set |
| 721 | 896 | ||
| 722 | # | 897 | # |
| @@ -776,9 +951,13 @@ CONFIG_HWMON=y | |||
| 776 | # CONFIG_SENSORS_LM92 is not set | 951 | # CONFIG_SENSORS_LM92 is not set |
| 777 | # CONFIG_SENSORS_MAX1619 is not set | 952 | # CONFIG_SENSORS_MAX1619 is not set |
| 778 | # CONFIG_SENSORS_PC87360 is not set | 953 | # CONFIG_SENSORS_PC87360 is not set |
| 954 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 779 | # CONFIG_SENSORS_SMSC47M1 is not set | 955 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 780 | # CONFIG_SENSORS_SMSC47M192 is not set | 956 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 781 | # CONFIG_SENSORS_SMSC47B397 is not set | 957 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 958 | # CONFIG_SENSORS_VIA686A is not set | ||
| 959 | # CONFIG_SENSORS_VT1211 is not set | ||
| 960 | # CONFIG_SENSORS_VT8231 is not set | ||
| 782 | # CONFIG_SENSORS_W83781D is not set | 961 | # CONFIG_SENSORS_W83781D is not set |
| 783 | # CONFIG_SENSORS_W83791D is not set | 962 | # CONFIG_SENSORS_W83791D is not set |
| 784 | # CONFIG_SENSORS_W83792D is not set | 963 | # CONFIG_SENSORS_W83792D is not set |
| @@ -790,23 +969,25 @@ CONFIG_HWMON=y | |||
| 790 | # | 969 | # |
| 791 | # Misc devices | 970 | # Misc devices |
| 792 | # | 971 | # |
| 972 | # CONFIG_TIFM_CORE is not set | ||
| 793 | 973 | ||
| 794 | # | 974 | # |
| 795 | # Multimedia devices | 975 | # Multimedia devices |
| 796 | # | 976 | # |
| 797 | # CONFIG_VIDEO_DEV is not set | 977 | # CONFIG_VIDEO_DEV is not set |
| 798 | CONFIG_VIDEO_V4L2=y | ||
| 799 | 978 | ||
| 800 | # | 979 | # |
| 801 | # Digital Video Broadcasting Devices | 980 | # Digital Video Broadcasting Devices |
| 802 | # | 981 | # |
| 803 | # CONFIG_DVB is not set | 982 | # CONFIG_DVB is not set |
| 983 | # CONFIG_USB_DABUSB is not set | ||
| 804 | 984 | ||
| 805 | # | 985 | # |
| 806 | # Graphics support | 986 | # Graphics support |
| 807 | # | 987 | # |
| 808 | # CONFIG_FIRMWARE_EDID is not set | 988 | CONFIG_FIRMWARE_EDID=y |
| 809 | CONFIG_FB=y | 989 | CONFIG_FB=y |
| 990 | # CONFIG_FB_DDC is not set | ||
| 810 | # CONFIG_FB_CFB_FILLRECT is not set | 991 | # CONFIG_FB_CFB_FILLRECT is not set |
| 811 | # CONFIG_FB_CFB_COPYAREA is not set | 992 | # CONFIG_FB_CFB_COPYAREA is not set |
| 812 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 993 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
| @@ -814,14 +995,32 @@ CONFIG_FB=y | |||
| 814 | # CONFIG_FB_BACKLIGHT is not set | 995 | # CONFIG_FB_BACKLIGHT is not set |
| 815 | # CONFIG_FB_MODE_HELPERS is not set | 996 | # CONFIG_FB_MODE_HELPERS is not set |
| 816 | # CONFIG_FB_TILEBLITTING is not set | 997 | # CONFIG_FB_TILEBLITTING is not set |
| 998 | # CONFIG_FB_CIRRUS is not set | ||
| 999 | # CONFIG_FB_PM2 is not set | ||
| 1000 | # CONFIG_FB_CYBER2000 is not set | ||
| 1001 | # CONFIG_FB_ASILIANT is not set | ||
| 1002 | # CONFIG_FB_IMSTT is not set | ||
| 817 | # CONFIG_FB_S1D13XXX is not set | 1003 | # CONFIG_FB_S1D13XXX is not set |
| 1004 | # CONFIG_FB_NVIDIA is not set | ||
| 1005 | # CONFIG_FB_RIVA is not set | ||
| 1006 | # CONFIG_FB_MATROX is not set | ||
| 1007 | # CONFIG_FB_RADEON is not set | ||
| 1008 | # CONFIG_FB_ATY128 is not set | ||
| 1009 | # CONFIG_FB_ATY is not set | ||
| 1010 | # CONFIG_FB_SAVAGE is not set | ||
| 1011 | # CONFIG_FB_SIS is not set | ||
| 1012 | # CONFIG_FB_NEOMAGIC is not set | ||
| 1013 | # CONFIG_FB_KYRO is not set | ||
| 1014 | # CONFIG_FB_3DFX is not set | ||
| 1015 | # CONFIG_FB_VOODOO1 is not set | ||
| 1016 | # CONFIG_FB_SMIVGX is not set | ||
| 1017 | # CONFIG_FB_TRIDENT is not set | ||
| 818 | # CONFIG_FB_VIRTUAL is not set | 1018 | # CONFIG_FB_VIRTUAL is not set |
| 819 | 1019 | ||
| 820 | # | 1020 | # |
| 821 | # Console display driver support | 1021 | # Console display driver support |
| 822 | # | 1022 | # |
| 823 | # CONFIG_VGA_CONSOLE is not set | 1023 | # CONFIG_VGA_CONSOLE is not set |
| 824 | # CONFIG_SGI_NEWPORT_CONSOLE is not set | ||
| 825 | CONFIG_DUMMY_CONSOLE=y | 1024 | CONFIG_DUMMY_CONSOLE=y |
| 826 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | 1025 | # CONFIG_FRAMEBUFFER_CONSOLE is not set |
| 827 | 1026 | ||
| @@ -839,15 +1038,129 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 839 | # | 1038 | # |
| 840 | # USB support | 1039 | # USB support |
| 841 | # | 1040 | # |
| 842 | # CONFIG_USB_ARCH_HAS_HCD is not set | 1041 | CONFIG_USB_ARCH_HAS_HCD=y |
| 843 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 1042 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 844 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 1043 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1044 | CONFIG_USB=y | ||
| 1045 | # CONFIG_USB_DEBUG is not set | ||
| 1046 | |||
| 1047 | # | ||
| 1048 | # Miscellaneous USB options | ||
| 1049 | # | ||
| 1050 | CONFIG_USB_DEVICEFS=y | ||
| 1051 | # CONFIG_USB_BANDWIDTH is not set | ||
| 1052 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 1053 | # CONFIG_USB_OTG is not set | ||
| 1054 | |||
| 1055 | # | ||
| 1056 | # USB Host Controller Drivers | ||
| 1057 | # | ||
| 1058 | # CONFIG_USB_EHCI_HCD is not set | ||
| 1059 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 1060 | # CONFIG_USB_OHCI_HCD is not set | ||
| 1061 | # CONFIG_USB_UHCI_HCD is not set | ||
| 1062 | # CONFIG_USB_SL811_HCD is not set | ||
| 1063 | |||
| 1064 | # | ||
| 1065 | # USB Device Class drivers | ||
| 1066 | # | ||
| 1067 | # CONFIG_USB_ACM is not set | ||
| 1068 | # CONFIG_USB_PRINTER is not set | ||
| 845 | 1069 | ||
| 846 | # | 1070 | # |
| 847 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1071 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 848 | # | 1072 | # |
| 849 | 1073 | ||
| 850 | # | 1074 | # |
| 1075 | # may also be needed; see USB_STORAGE Help for more information | ||
| 1076 | # | ||
| 1077 | CONFIG_USB_STORAGE=y | ||
| 1078 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 1079 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 1080 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 1081 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 1082 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 1083 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 1084 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 1085 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 1086 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 1087 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1088 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1089 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1090 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1091 | |||
| 1092 | # | ||
| 1093 | # USB Input Devices | ||
| 1094 | # | ||
| 1095 | CONFIG_USB_HID=y | ||
| 1096 | CONFIG_USB_HIDINPUT=y | ||
| 1097 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 1098 | # CONFIG_HID_FF is not set | ||
| 1099 | CONFIG_USB_HIDDEV=y | ||
| 1100 | # CONFIG_USB_AIPTEK is not set | ||
| 1101 | # CONFIG_USB_WACOM is not set | ||
| 1102 | # CONFIG_USB_ACECAD is not set | ||
| 1103 | # CONFIG_USB_KBTAB is not set | ||
| 1104 | # CONFIG_USB_POWERMATE is not set | ||
| 1105 | # CONFIG_USB_TOUCHSCREEN is not set | ||
| 1106 | # CONFIG_USB_YEALINK is not set | ||
| 1107 | # CONFIG_USB_XPAD is not set | ||
| 1108 | # CONFIG_USB_ATI_REMOTE is not set | ||
| 1109 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 1110 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
| 1111 | # CONFIG_USB_APPLETOUCH is not set | ||
| 1112 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1113 | |||
| 1114 | # | ||
| 1115 | # USB Imaging devices | ||
| 1116 | # | ||
| 1117 | # CONFIG_USB_MDC800 is not set | ||
| 1118 | # CONFIG_USB_MICROTEK is not set | ||
| 1119 | |||
| 1120 | # | ||
| 1121 | # USB Network Adapters | ||
| 1122 | # | ||
| 1123 | # CONFIG_USB_CATC is not set | ||
| 1124 | # CONFIG_USB_KAWETH is not set | ||
| 1125 | # CONFIG_USB_PEGASUS is not set | ||
| 1126 | # CONFIG_USB_RTL8150 is not set | ||
| 1127 | # CONFIG_USB_USBNET is not set | ||
| 1128 | CONFIG_USB_MON=y | ||
| 1129 | |||
| 1130 | # | ||
| 1131 | # USB port drivers | ||
| 1132 | # | ||
| 1133 | |||
| 1134 | # | ||
| 1135 | # USB Serial Converter support | ||
| 1136 | # | ||
| 1137 | # CONFIG_USB_SERIAL is not set | ||
| 1138 | |||
| 1139 | # | ||
| 1140 | # USB Miscellaneous drivers | ||
| 1141 | # | ||
| 1142 | # CONFIG_USB_EMI62 is not set | ||
| 1143 | # CONFIG_USB_EMI26 is not set | ||
| 1144 | # CONFIG_USB_ADUTUX is not set | ||
| 1145 | # CONFIG_USB_AUERSWALD is not set | ||
| 1146 | # CONFIG_USB_RIO500 is not set | ||
| 1147 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1148 | # CONFIG_USB_LCD is not set | ||
| 1149 | # CONFIG_USB_LED is not set | ||
| 1150 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1151 | # CONFIG_USB_CYTHERM is not set | ||
| 1152 | # CONFIG_USB_PHIDGET is not set | ||
| 1153 | # CONFIG_USB_IDMOUSE is not set | ||
| 1154 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1155 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1156 | # CONFIG_USB_LD is not set | ||
| 1157 | # CONFIG_USB_TEST is not set | ||
| 1158 | |||
| 1159 | # | ||
| 1160 | # USB DSL modem support | ||
| 1161 | # | ||
| 1162 | |||
| 1163 | # | ||
| 851 | # USB Gadget Support | 1164 | # USB Gadget Support |
| 852 | # | 1165 | # |
| 853 | # CONFIG_USB_GADGET is not set | 1166 | # CONFIG_USB_GADGET is not set |
| @@ -873,6 +1186,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 873 | # | 1186 | # |
| 874 | # InfiniBand support | 1187 | # InfiniBand support |
| 875 | # | 1188 | # |
| 1189 | # CONFIG_INFINIBAND is not set | ||
| 876 | 1190 | ||
| 877 | # | 1191 | # |
| 878 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1192 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
| @@ -906,6 +1220,7 @@ CONFIG_EXT3_FS=y | |||
| 906 | CONFIG_EXT3_FS_XATTR=y | 1220 | CONFIG_EXT3_FS_XATTR=y |
| 907 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1221 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 908 | # CONFIG_EXT3_FS_SECURITY is not set | 1222 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1223 | # CONFIG_EXT4DEV_FS is not set | ||
| 909 | CONFIG_JBD=y | 1224 | CONFIG_JBD=y |
| 910 | # CONFIG_JBD_DEBUG is not set | 1225 | # CONFIG_JBD_DEBUG is not set |
| 911 | CONFIG_FS_MBCACHE=y | 1226 | CONFIG_FS_MBCACHE=y |
| @@ -917,6 +1232,7 @@ CONFIG_XFS_FS=m | |||
| 917 | # CONFIG_XFS_SECURITY is not set | 1232 | # CONFIG_XFS_SECURITY is not set |
| 918 | # CONFIG_XFS_POSIX_ACL is not set | 1233 | # CONFIG_XFS_POSIX_ACL is not set |
| 919 | # CONFIG_XFS_RT is not set | 1234 | # CONFIG_XFS_RT is not set |
| 1235 | # CONFIG_GFS2_FS is not set | ||
| 920 | # CONFIG_OCFS2_FS is not set | 1236 | # CONFIG_OCFS2_FS is not set |
| 921 | # CONFIG_MINIX_FS is not set | 1237 | # CONFIG_MINIX_FS is not set |
| 922 | # CONFIG_ROMFS_FS is not set | 1238 | # CONFIG_ROMFS_FS is not set |
| @@ -949,8 +1265,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 949 | # | 1265 | # |
| 950 | CONFIG_PROC_FS=y | 1266 | CONFIG_PROC_FS=y |
| 951 | # CONFIG_PROC_KCORE is not set | 1267 | # CONFIG_PROC_KCORE is not set |
| 1268 | CONFIG_PROC_SYSCTL=y | ||
| 952 | CONFIG_SYSFS=y | 1269 | CONFIG_SYSFS=y |
| 953 | CONFIG_TMPFS=y | 1270 | CONFIG_TMPFS=y |
| 1271 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 954 | # CONFIG_HUGETLB_PAGE is not set | 1272 | # CONFIG_HUGETLB_PAGE is not set |
| 955 | CONFIG_RAMFS=y | 1273 | CONFIG_RAMFS=y |
| 956 | # CONFIG_CONFIGFS_FS is not set | 1274 | # CONFIG_CONFIGFS_FS is not set |
| @@ -994,7 +1312,6 @@ CONFIG_SUNRPC=y | |||
| 994 | CONFIG_SMB_FS=m | 1312 | CONFIG_SMB_FS=m |
| 995 | # CONFIG_SMB_NLS_DEFAULT is not set | 1313 | # CONFIG_SMB_NLS_DEFAULT is not set |
| 996 | # CONFIG_CIFS is not set | 1314 | # CONFIG_CIFS is not set |
| 997 | # CONFIG_CIFS_DEBUG2 is not set | ||
| 998 | # CONFIG_NCP_FS is not set | 1315 | # CONFIG_NCP_FS is not set |
| 999 | # CONFIG_CODA_FS is not set | 1316 | # CONFIG_CODA_FS is not set |
| 1000 | # CONFIG_AFS_FS is not set | 1317 | # CONFIG_AFS_FS is not set |
| @@ -1005,7 +1322,6 @@ CONFIG_SMB_FS=m | |||
| 1005 | # | 1322 | # |
| 1006 | # CONFIG_PARTITION_ADVANCED is not set | 1323 | # CONFIG_PARTITION_ADVANCED is not set |
| 1007 | CONFIG_MSDOS_PARTITION=y | 1324 | CONFIG_MSDOS_PARTITION=y |
| 1008 | CONFIG_SGI_PARTITION=y | ||
| 1009 | 1325 | ||
| 1010 | # | 1326 | # |
| 1011 | # Native Language Support | 1327 | # Native Language Support |
| @@ -1061,11 +1377,13 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1061 | # | 1377 | # |
| 1062 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1378 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1063 | # CONFIG_PRINTK_TIME is not set | 1379 | # CONFIG_PRINTK_TIME is not set |
| 1380 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1064 | # CONFIG_MAGIC_SYSRQ is not set | 1381 | # CONFIG_MAGIC_SYSRQ is not set |
| 1065 | # CONFIG_UNUSED_SYMBOLS is not set | 1382 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1066 | # CONFIG_DEBUG_KERNEL is not set | 1383 | # CONFIG_DEBUG_KERNEL is not set |
| 1067 | CONFIG_LOG_BUF_SHIFT=14 | 1384 | CONFIG_LOG_BUF_SHIFT=14 |
| 1068 | # CONFIG_DEBUG_FS is not set | 1385 | # CONFIG_DEBUG_FS is not set |
| 1386 | # CONFIG_HEADERS_CHECK is not set | ||
| 1069 | CONFIG_CROSSCOMPILE=y | 1387 | CONFIG_CROSSCOMPILE=y |
| 1070 | CONFIG_CMDLINE="" | 1388 | CONFIG_CMDLINE="" |
| 1071 | 1389 | ||
| @@ -1079,6 +1397,9 @@ CONFIG_CMDLINE="" | |||
| 1079 | # Cryptographic options | 1397 | # Cryptographic options |
| 1080 | # | 1398 | # |
| 1081 | CONFIG_CRYPTO=y | 1399 | CONFIG_CRYPTO=y |
| 1400 | CONFIG_CRYPTO_ALGAPI=m | ||
| 1401 | CONFIG_CRYPTO_BLKCIPHER=m | ||
| 1402 | CONFIG_CRYPTO_MANAGER=m | ||
| 1082 | # CONFIG_CRYPTO_HMAC is not set | 1403 | # CONFIG_CRYPTO_HMAC is not set |
| 1083 | # CONFIG_CRYPTO_NULL is not set | 1404 | # CONFIG_CRYPTO_NULL is not set |
| 1084 | # CONFIG_CRYPTO_MD4 is not set | 1405 | # CONFIG_CRYPTO_MD4 is not set |
| @@ -1088,6 +1409,8 @@ CONFIG_CRYPTO_SHA1=m | |||
| 1088 | # CONFIG_CRYPTO_SHA512 is not set | 1409 | # CONFIG_CRYPTO_SHA512 is not set |
| 1089 | # CONFIG_CRYPTO_WP512 is not set | 1410 | # CONFIG_CRYPTO_WP512 is not set |
| 1090 | # CONFIG_CRYPTO_TGR192 is not set | 1411 | # CONFIG_CRYPTO_TGR192 is not set |
| 1412 | CONFIG_CRYPTO_ECB=m | ||
| 1413 | CONFIG_CRYPTO_CBC=m | ||
| 1091 | # CONFIG_CRYPTO_DES is not set | 1414 | # CONFIG_CRYPTO_DES is not set |
| 1092 | # CONFIG_CRYPTO_BLOWFISH is not set | 1415 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 1093 | # CONFIG_CRYPTO_TWOFISH is not set | 1416 | # CONFIG_CRYPTO_TWOFISH is not set |
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index ad7271b3f266..f7e8194809a1 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.18-rc1 | 3 | # Linux kernel version: 2.6.19-rc2 |
| 4 | # Thu Jul 6 10:04:21 2006 | 4 | # Wed Oct 18 12:57:11 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -25,8 +25,6 @@ CONFIG_MIPS=y | |||
| 25 | # CONFIG_MIPS_COBALT is not set | 25 | # CONFIG_MIPS_COBALT is not set |
| 26 | # CONFIG_MACH_DECSTATION is not set | 26 | # CONFIG_MACH_DECSTATION is not set |
| 27 | # CONFIG_MIPS_EV64120 is not set | 27 | # CONFIG_MIPS_EV64120 is not set |
| 28 | # CONFIG_MIPS_IVR is not set | ||
| 29 | # CONFIG_MIPS_ITE8172 is not set | ||
| 30 | # CONFIG_MACH_JAZZ is not set | 28 | # CONFIG_MACH_JAZZ is not set |
| 31 | # CONFIG_LASAT is not set | 29 | # CONFIG_LASAT is not set |
| 32 | # CONFIG_MIPS_ATLAS is not set | 30 | # CONFIG_MIPS_ATLAS is not set |
| @@ -72,11 +70,11 @@ CONFIG_TANBAC_TB0287=y | |||
| 72 | # CONFIG_VICTOR_MPC30X is not set | 70 | # CONFIG_VICTOR_MPC30X is not set |
| 73 | # CONFIG_ZAO_CAPCELLA is not set | 71 | # CONFIG_ZAO_CAPCELLA is not set |
| 74 | CONFIG_PCI_VR41XX=y | 72 | CONFIG_PCI_VR41XX=y |
| 75 | # CONFIG_VRC4173 is not set | ||
| 76 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 73 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 77 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 74 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 78 | CONFIG_GENERIC_HWEIGHT=y | 75 | CONFIG_GENERIC_HWEIGHT=y |
| 79 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 76 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 77 | CONFIG_GENERIC_TIME=y | ||
| 80 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 78 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 81 | CONFIG_DMA_NONCOHERENT=y | 79 | CONFIG_DMA_NONCOHERENT=y |
| 82 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 80 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| @@ -123,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y | |||
| 123 | # CONFIG_PAGE_SIZE_16KB is not set | 121 | # CONFIG_PAGE_SIZE_16KB is not set |
| 124 | # CONFIG_PAGE_SIZE_64KB is not set | 122 | # CONFIG_PAGE_SIZE_64KB is not set |
| 125 | CONFIG_MIPS_MT_DISABLED=y | 123 | CONFIG_MIPS_MT_DISABLED=y |
| 126 | # CONFIG_MIPS_MT_SMTC is not set | ||
| 127 | # CONFIG_MIPS_MT_SMP is not set | 124 | # CONFIG_MIPS_MT_SMP is not set |
| 125 | # CONFIG_MIPS_MT_SMTC is not set | ||
| 128 | # CONFIG_MIPS_VPE_LOADER is not set | 126 | # CONFIG_MIPS_VPE_LOADER is not set |
| 129 | CONFIG_CPU_HAS_SYNC=y | 127 | CONFIG_CPU_HAS_SYNC=y |
| 130 | CONFIG_GENERIC_HARDIRQS=y | 128 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -169,15 +167,19 @@ CONFIG_LOCALVERSION="" | |||
| 169 | CONFIG_LOCALVERSION_AUTO=y | 167 | CONFIG_LOCALVERSION_AUTO=y |
| 170 | CONFIG_SWAP=y | 168 | CONFIG_SWAP=y |
| 171 | CONFIG_SYSVIPC=y | 169 | CONFIG_SYSVIPC=y |
| 170 | # CONFIG_IPC_NS is not set | ||
| 172 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
| 173 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 174 | CONFIG_SYSCTL=y | 173 | # CONFIG_TASKSTATS is not set |
| 174 | # CONFIG_UTS_NS is not set | ||
| 175 | # CONFIG_AUDIT is not set | 175 | # CONFIG_AUDIT is not set |
| 176 | # CONFIG_IKCONFIG is not set | 176 | # CONFIG_IKCONFIG is not set |
| 177 | # CONFIG_RELAY is not set | 177 | # CONFIG_RELAY is not set |
| 178 | CONFIG_INITRAMFS_SOURCE="" | 178 | CONFIG_INITRAMFS_SOURCE="" |
| 179 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 179 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 180 | CONFIG_SYSCTL=y | ||
| 180 | CONFIG_EMBEDDED=y | 181 | CONFIG_EMBEDDED=y |
| 182 | # CONFIG_SYSCTL_SYSCALL is not set | ||
| 181 | CONFIG_KALLSYMS=y | 183 | CONFIG_KALLSYMS=y |
| 182 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 184 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 183 | # CONFIG_HOTPLUG is not set | 185 | # CONFIG_HOTPLUG is not set |
| @@ -185,12 +187,12 @@ CONFIG_PRINTK=y | |||
| 185 | CONFIG_BUG=y | 187 | CONFIG_BUG=y |
| 186 | CONFIG_ELF_CORE=y | 188 | CONFIG_ELF_CORE=y |
| 187 | CONFIG_BASE_FULL=y | 189 | CONFIG_BASE_FULL=y |
| 188 | CONFIG_RT_MUTEXES=y | ||
| 189 | CONFIG_FUTEX=y | 190 | CONFIG_FUTEX=y |
| 190 | CONFIG_EPOLL=y | 191 | CONFIG_EPOLL=y |
| 191 | CONFIG_SHMEM=y | 192 | CONFIG_SHMEM=y |
| 192 | CONFIG_SLAB=y | 193 | CONFIG_SLAB=y |
| 193 | CONFIG_VM_EVENT_COUNTERS=y | 194 | CONFIG_VM_EVENT_COUNTERS=y |
| 195 | CONFIG_RT_MUTEXES=y | ||
| 194 | # CONFIG_TINY_SHMEM is not set | 196 | # CONFIG_TINY_SHMEM is not set |
| 195 | CONFIG_BASE_SMALL=0 | 197 | CONFIG_BASE_SMALL=0 |
| 196 | # CONFIG_SLOB is not set | 198 | # CONFIG_SLOB is not set |
| @@ -208,6 +210,7 @@ CONFIG_KMOD=y | |||
| 208 | # | 210 | # |
| 209 | # Block layer | 211 | # Block layer |
| 210 | # | 212 | # |
| 213 | CONFIG_BLOCK=y | ||
| 211 | # CONFIG_LBD is not set | 214 | # CONFIG_LBD is not set |
| 212 | # CONFIG_BLK_DEV_IO_TRACE is not set | 215 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 213 | # CONFIG_LSF is not set | 216 | # CONFIG_LSF is not set |
| @@ -230,17 +233,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 230 | # | 233 | # |
| 231 | CONFIG_HW_HAS_PCI=y | 234 | CONFIG_HW_HAS_PCI=y |
| 232 | CONFIG_PCI=y | 235 | CONFIG_PCI=y |
| 236 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | ||
| 233 | CONFIG_MMU=y | 237 | CONFIG_MMU=y |
| 234 | 238 | ||
| 235 | # | 239 | # |
| 236 | # PCCARD (PCMCIA/CardBus) support | 240 | # PCCARD (PCMCIA/CardBus) support |
| 237 | # | 241 | # |
| 238 | # CONFIG_PCCARD is not set | ||
| 239 | 242 | ||
| 240 | # | 243 | # |
| 241 | # PCI Hotplug Support | 244 | # PCI Hotplug Support |
| 242 | # | 245 | # |
| 243 | # CONFIG_HOTPLUG_PCI is not set | ||
| 244 | 246 | ||
| 245 | # | 247 | # |
| 246 | # Executable file formats | 248 | # Executable file formats |
| @@ -263,6 +265,7 @@ CONFIG_PACKET=y | |||
| 263 | CONFIG_UNIX=y | 265 | CONFIG_UNIX=y |
| 264 | CONFIG_XFRM=y | 266 | CONFIG_XFRM=y |
| 265 | # CONFIG_XFRM_USER is not set | 267 | # CONFIG_XFRM_USER is not set |
| 268 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 266 | # CONFIG_NET_KEY is not set | 269 | # CONFIG_NET_KEY is not set |
| 267 | CONFIG_INET=y | 270 | CONFIG_INET=y |
| 268 | CONFIG_IP_MULTICAST=y | 271 | CONFIG_IP_MULTICAST=y |
| @@ -291,13 +294,10 @@ CONFIG_SYN_COOKIES=y | |||
| 291 | CONFIG_INET_TUNNEL=m | 294 | CONFIG_INET_TUNNEL=m |
| 292 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 295 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 293 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 296 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 297 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 294 | CONFIG_INET_DIAG=y | 298 | CONFIG_INET_DIAG=y |
| 295 | CONFIG_INET_TCP_DIAG=y | 299 | CONFIG_INET_TCP_DIAG=y |
| 296 | CONFIG_TCP_CONG_ADVANCED=y | 300 | CONFIG_TCP_CONG_ADVANCED=y |
| 297 | |||
| 298 | # | ||
| 299 | # TCP congestion control | ||
| 300 | # | ||
| 301 | CONFIG_TCP_CONG_BIC=y | 301 | CONFIG_TCP_CONG_BIC=y |
| 302 | CONFIG_TCP_CONG_CUBIC=m | 302 | CONFIG_TCP_CONG_CUBIC=m |
| 303 | CONFIG_TCP_CONG_WESTWOOD=m | 303 | CONFIG_TCP_CONG_WESTWOOD=m |
| @@ -308,7 +308,13 @@ CONFIG_TCP_CONG_HTCP=m | |||
| 308 | # CONFIG_TCP_CONG_SCALABLE is not set | 308 | # CONFIG_TCP_CONG_SCALABLE is not set |
| 309 | # CONFIG_TCP_CONG_LP is not set | 309 | # CONFIG_TCP_CONG_LP is not set |
| 310 | # CONFIG_TCP_CONG_VENO is not set | 310 | # CONFIG_TCP_CONG_VENO is not set |
| 311 | # CONFIG_TCP_CONG_COMPOUND is not set | 311 | CONFIG_DEFAULT_BIC=y |
| 312 | # CONFIG_DEFAULT_CUBIC is not set | ||
| 313 | # CONFIG_DEFAULT_HTCP is not set | ||
| 314 | # CONFIG_DEFAULT_VEGAS is not set | ||
| 315 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
| 316 | # CONFIG_DEFAULT_RENO is not set | ||
| 317 | CONFIG_DEFAULT_TCP_CONG="bic" | ||
| 312 | # CONFIG_IPV6 is not set | 318 | # CONFIG_IPV6 is not set |
| 313 | # CONFIG_INET6_XFRM_TUNNEL is not set | 319 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 314 | # CONFIG_INET6_TUNNEL is not set | 320 | # CONFIG_INET6_TUNNEL is not set |
| @@ -338,7 +344,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 338 | # CONFIG_ATALK is not set | 344 | # CONFIG_ATALK is not set |
| 339 | # CONFIG_X25 is not set | 345 | # CONFIG_X25 is not set |
| 340 | # CONFIG_LAPB is not set | 346 | # CONFIG_LAPB is not set |
| 341 | # CONFIG_NET_DIVERT is not set | ||
| 342 | # CONFIG_ECONET is not set | 347 | # CONFIG_ECONET is not set |
| 343 | # CONFIG_WAN_ROUTER is not set | 348 | # CONFIG_WAN_ROUTER is not set |
| 344 | 349 | ||
| @@ -355,6 +360,7 @@ CONFIG_NETWORK_SECMARK=y | |||
| 355 | # CONFIG_IRDA is not set | 360 | # CONFIG_IRDA is not set |
| 356 | # CONFIG_BT is not set | 361 | # CONFIG_BT is not set |
| 357 | # CONFIG_IEEE80211 is not set | 362 | # CONFIG_IEEE80211 is not set |
| 363 | CONFIG_FIB_RULES=y | ||
| 358 | 364 | ||
| 359 | # | 365 | # |
| 360 | # Device Drivers | 366 | # Device Drivers |
| @@ -365,7 +371,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 365 | # | 371 | # |
| 366 | CONFIG_STANDALONE=y | 372 | CONFIG_STANDALONE=y |
| 367 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 373 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 368 | # CONFIG_FW_LOADER is not set | ||
| 369 | # CONFIG_SYS_HYPERVISOR is not set | 374 | # CONFIG_SYS_HYPERVISOR is not set |
| 370 | 375 | ||
| 371 | # | 376 | # |
| @@ -403,6 +408,7 @@ CONFIG_BLK_DEV_NBD=m | |||
| 403 | CONFIG_BLK_DEV_RAM=y | 408 | CONFIG_BLK_DEV_RAM=y |
| 404 | CONFIG_BLK_DEV_RAM_COUNT=16 | 409 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 405 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 410 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 411 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
| 406 | # CONFIG_BLK_DEV_INITRD is not set | 412 | # CONFIG_BLK_DEV_INITRD is not set |
| 407 | # CONFIG_CDROM_PKTCDVD is not set | 413 | # CONFIG_CDROM_PKTCDVD is not set |
| 408 | # CONFIG_ATA_OVER_ETH is not set | 414 | # CONFIG_ATA_OVER_ETH is not set |
| @@ -410,65 +416,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
| 410 | # | 416 | # |
| 411 | # ATA/ATAPI/MFM/RLL support | 417 | # ATA/ATAPI/MFM/RLL support |
| 412 | # | 418 | # |
| 413 | CONFIG_IDE=y | 419 | # CONFIG_IDE is not set |
| 414 | CONFIG_BLK_DEV_IDE=y | ||
| 415 | |||
| 416 | # | ||
| 417 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
| 418 | # | ||
| 419 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
| 420 | CONFIG_BLK_DEV_IDEDISK=y | ||
| 421 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
| 422 | # CONFIG_BLK_DEV_IDECD is not set | ||
| 423 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 424 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 425 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 426 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 427 | |||
| 428 | # | ||
| 429 | # IDE chipset support/bugfixes | ||
| 430 | # | ||
| 431 | CONFIG_IDE_GENERIC=y | ||
| 432 | CONFIG_BLK_DEV_IDEPCI=y | ||
| 433 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
| 434 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
| 435 | # CONFIG_BLK_DEV_GENERIC is not set | ||
| 436 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 437 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
| 438 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 439 | # CONFIG_IDEDMA_PCI_AUTO is not set | ||
| 440 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 441 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 442 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
| 443 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 444 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 445 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 446 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 447 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 448 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 449 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 450 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 451 | # CONFIG_BLK_DEV_PIIX is not set | ||
| 452 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 453 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 454 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 455 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
| 456 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 457 | CONFIG_BLK_DEV_SIIMAGE=y | ||
| 458 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 459 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 460 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 461 | # CONFIG_IDE_ARM is not set | ||
| 462 | CONFIG_BLK_DEV_IDEDMA=y | ||
| 463 | # CONFIG_IDEDMA_IVB is not set | ||
| 464 | # CONFIG_IDEDMA_AUTO is not set | ||
| 465 | # CONFIG_BLK_DEV_HD is not set | ||
| 466 | 420 | ||
| 467 | # | 421 | # |
| 468 | # SCSI device support | 422 | # SCSI device support |
| 469 | # | 423 | # |
| 470 | # CONFIG_RAID_ATTRS is not set | 424 | # CONFIG_RAID_ATTRS is not set |
| 471 | CONFIG_SCSI=y | 425 | CONFIG_SCSI=y |
| 426 | # CONFIG_SCSI_NETLINK is not set | ||
| 472 | CONFIG_SCSI_PROC_FS=y | 427 | CONFIG_SCSI_PROC_FS=y |
| 473 | 428 | ||
| 474 | # | 429 | # |
| @@ -489,12 +444,13 @@ CONFIG_BLK_DEV_SD=y | |||
| 489 | # CONFIG_SCSI_LOGGING is not set | 444 | # CONFIG_SCSI_LOGGING is not set |
| 490 | 445 | ||
| 491 | # | 446 | # |
| 492 | # SCSI Transport Attributes | 447 | # SCSI Transports |
| 493 | # | 448 | # |
| 494 | # CONFIG_SCSI_SPI_ATTRS is not set | 449 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 495 | # CONFIG_SCSI_FC_ATTRS is not set | 450 | # CONFIG_SCSI_FC_ATTRS is not set |
| 496 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 451 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 497 | # CONFIG_SCSI_SAS_ATTRS is not set | 452 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 453 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 498 | 454 | ||
| 499 | # | 455 | # |
| 500 | # SCSI low-level drivers | 456 | # SCSI low-level drivers |
| @@ -507,21 +463,24 @@ CONFIG_BLK_DEV_SD=y | |||
| 507 | # CONFIG_SCSI_AIC7XXX is not set | 463 | # CONFIG_SCSI_AIC7XXX is not set |
| 508 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 464 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
| 509 | # CONFIG_SCSI_AIC79XX is not set | 465 | # CONFIG_SCSI_AIC79XX is not set |
| 466 | # CONFIG_SCSI_AIC94XX is not set | ||
| 510 | # CONFIG_SCSI_DPT_I2O is not set | 467 | # CONFIG_SCSI_DPT_I2O is not set |
| 468 | # CONFIG_SCSI_ARCMSR is not set | ||
| 511 | # CONFIG_MEGARAID_NEWGEN is not set | 469 | # CONFIG_MEGARAID_NEWGEN is not set |
| 512 | # CONFIG_MEGARAID_LEGACY is not set | 470 | # CONFIG_MEGARAID_LEGACY is not set |
| 513 | # CONFIG_MEGARAID_SAS is not set | 471 | # CONFIG_MEGARAID_SAS is not set |
| 514 | # CONFIG_SCSI_SATA is not set | ||
| 515 | # CONFIG_SCSI_HPTIOP is not set | 472 | # CONFIG_SCSI_HPTIOP is not set |
| 516 | # CONFIG_SCSI_DMX3191D is not set | 473 | # CONFIG_SCSI_DMX3191D is not set |
| 517 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 474 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
| 518 | # CONFIG_SCSI_IPS is not set | 475 | # CONFIG_SCSI_IPS is not set |
| 519 | # CONFIG_SCSI_INITIO is not set | 476 | # CONFIG_SCSI_INITIO is not set |
| 520 | # CONFIG_SCSI_INIA100 is not set | 477 | # CONFIG_SCSI_INIA100 is not set |
| 478 | # CONFIG_SCSI_STEX is not set | ||
| 521 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 479 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 522 | # CONFIG_SCSI_IPR is not set | 480 | # CONFIG_SCSI_IPR is not set |
| 523 | # CONFIG_SCSI_QLOGIC_1280 is not set | 481 | # CONFIG_SCSI_QLOGIC_1280 is not set |
| 524 | # CONFIG_SCSI_QLA_FC is not set | 482 | # CONFIG_SCSI_QLA_FC is not set |
| 483 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 525 | # CONFIG_SCSI_LPFC is not set | 484 | # CONFIG_SCSI_LPFC is not set |
| 526 | # CONFIG_SCSI_DC395x is not set | 485 | # CONFIG_SCSI_DC395x is not set |
| 527 | # CONFIG_SCSI_DC390T is not set | 486 | # CONFIG_SCSI_DC390T is not set |
| @@ -529,6 +488,59 @@ CONFIG_BLK_DEV_SD=y | |||
| 529 | # CONFIG_SCSI_DEBUG is not set | 488 | # CONFIG_SCSI_DEBUG is not set |
| 530 | 489 | ||
| 531 | # | 490 | # |
| 491 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 492 | # | ||
| 493 | CONFIG_ATA=y | ||
| 494 | # CONFIG_SATA_AHCI is not set | ||
| 495 | # CONFIG_SATA_SVW is not set | ||
| 496 | # CONFIG_ATA_PIIX is not set | ||
| 497 | # CONFIG_SATA_MV is not set | ||
| 498 | # CONFIG_SATA_NV is not set | ||
| 499 | # CONFIG_PDC_ADMA is not set | ||
| 500 | # CONFIG_SATA_QSTOR is not set | ||
| 501 | # CONFIG_SATA_PROMISE is not set | ||
| 502 | # CONFIG_SATA_SX4 is not set | ||
| 503 | # CONFIG_SATA_SIL is not set | ||
| 504 | # CONFIG_SATA_SIL24 is not set | ||
| 505 | # CONFIG_SATA_SIS is not set | ||
| 506 | # CONFIG_SATA_ULI is not set | ||
| 507 | # CONFIG_SATA_VIA is not set | ||
| 508 | # CONFIG_SATA_VITESSE is not set | ||
| 509 | # CONFIG_PATA_ALI is not set | ||
| 510 | # CONFIG_PATA_AMD is not set | ||
| 511 | # CONFIG_PATA_ARTOP is not set | ||
| 512 | # CONFIG_PATA_ATIIXP is not set | ||
| 513 | # CONFIG_PATA_CMD64X is not set | ||
| 514 | # CONFIG_PATA_CS5520 is not set | ||
| 515 | # CONFIG_PATA_CS5530 is not set | ||
| 516 | # CONFIG_PATA_CYPRESS is not set | ||
| 517 | # CONFIG_PATA_EFAR is not set | ||
| 518 | # CONFIG_ATA_GENERIC is not set | ||
| 519 | # CONFIG_PATA_HPT366 is not set | ||
| 520 | # CONFIG_PATA_HPT37X is not set | ||
| 521 | # CONFIG_PATA_HPT3X2N is not set | ||
| 522 | # CONFIG_PATA_HPT3X3 is not set | ||
| 523 | # CONFIG_PATA_IT821X is not set | ||
| 524 | # CONFIG_PATA_JMICRON is not set | ||
| 525 | # CONFIG_PATA_TRIFLEX is not set | ||
| 526 | # CONFIG_PATA_MPIIX is not set | ||
| 527 | # CONFIG_PATA_OLDPIIX is not set | ||
| 528 | # CONFIG_PATA_NETCELL is not set | ||
| 529 | # CONFIG_PATA_NS87410 is not set | ||
| 530 | # CONFIG_PATA_OPTI is not set | ||
| 531 | # CONFIG_PATA_OPTIDMA is not set | ||
| 532 | # CONFIG_PATA_PDC_OLD is not set | ||
| 533 | # CONFIG_PATA_RADISYS is not set | ||
| 534 | # CONFIG_PATA_RZ1000 is not set | ||
| 535 | # CONFIG_PATA_SC1200 is not set | ||
| 536 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 537 | # CONFIG_PATA_PDC2027X is not set | ||
| 538 | CONFIG_PATA_SIL680=y | ||
| 539 | # CONFIG_PATA_SIS is not set | ||
| 540 | # CONFIG_PATA_VIA is not set | ||
| 541 | # CONFIG_PATA_WINBOND is not set | ||
| 542 | |||
| 543 | # | ||
| 532 | # Multi-device support (RAID and LVM) | 544 | # Multi-device support (RAID and LVM) |
| 533 | # | 545 | # |
| 534 | # CONFIG_MD is not set | 546 | # CONFIG_MD is not set |
| @@ -632,6 +644,7 @@ CONFIG_R8169=y | |||
| 632 | # CONFIG_SK98LIN is not set | 644 | # CONFIG_SK98LIN is not set |
| 633 | # CONFIG_TIGON3 is not set | 645 | # CONFIG_TIGON3 is not set |
| 634 | # CONFIG_BNX2 is not set | 646 | # CONFIG_BNX2 is not set |
| 647 | # CONFIG_QLA3XXX is not set | ||
| 635 | 648 | ||
| 636 | # | 649 | # |
| 637 | # Ethernet (10000 Mbit) | 650 | # Ethernet (10000 Mbit) |
| @@ -679,6 +692,7 @@ CONFIG_R8169=y | |||
| 679 | # Input device support | 692 | # Input device support |
| 680 | # | 693 | # |
| 681 | CONFIG_INPUT=y | 694 | CONFIG_INPUT=y |
| 695 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 682 | 696 | ||
| 683 | # | 697 | # |
| 684 | # Userland interfaces | 698 | # Userland interfaces |
| @@ -758,7 +772,6 @@ CONFIG_GPIO_VR41XX=y | |||
| 758 | # TPM devices | 772 | # TPM devices |
| 759 | # | 773 | # |
| 760 | # CONFIG_TCG_TPM is not set | 774 | # CONFIG_TCG_TPM is not set |
| 761 | # CONFIG_TELCLOCK is not set | ||
| 762 | 775 | ||
| 763 | # | 776 | # |
| 764 | # I2C support | 777 | # I2C support |
| @@ -784,12 +797,12 @@ CONFIG_GPIO_VR41XX=y | |||
| 784 | # | 797 | # |
| 785 | # Misc devices | 798 | # Misc devices |
| 786 | # | 799 | # |
| 800 | # CONFIG_TIFM_CORE is not set | ||
| 787 | 801 | ||
| 788 | # | 802 | # |
| 789 | # Multimedia devices | 803 | # Multimedia devices |
| 790 | # | 804 | # |
| 791 | # CONFIG_VIDEO_DEV is not set | 805 | # CONFIG_VIDEO_DEV is not set |
| 792 | CONFIG_VIDEO_V4L2=y | ||
| 793 | 806 | ||
| 794 | # | 807 | # |
| 795 | # Digital Video Broadcasting Devices | 808 | # Digital Video Broadcasting Devices |
| @@ -897,13 +910,13 @@ CONFIG_USB_STORAGE=m | |||
| 897 | # CONFIG_USB_STORAGE_DEBUG is not set | 910 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 898 | # CONFIG_USB_STORAGE_DATAFAB is not set | 911 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 899 | # CONFIG_USB_STORAGE_FREECOM is not set | 912 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 900 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 901 | # CONFIG_USB_STORAGE_DPCM is not set | 913 | # CONFIG_USB_STORAGE_DPCM is not set |
| 902 | # CONFIG_USB_STORAGE_USBAT is not set | 914 | # CONFIG_USB_STORAGE_USBAT is not set |
| 903 | # CONFIG_USB_STORAGE_SDDR09 is not set | 915 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 904 | # CONFIG_USB_STORAGE_SDDR55 is not set | 916 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 905 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 917 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 906 | # CONFIG_USB_STORAGE_ALAUDA is not set | 918 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 919 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 907 | # CONFIG_USB_LIBUSUAL is not set | 920 | # CONFIG_USB_LIBUSUAL is not set |
| 908 | 921 | ||
| 909 | # | 922 | # |
| @@ -932,6 +945,7 @@ CONFIG_USB_HIDINPUT=y | |||
| 932 | # CONFIG_USB_ATI_REMOTE2 is not set | 945 | # CONFIG_USB_ATI_REMOTE2 is not set |
| 933 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 946 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 934 | # CONFIG_USB_APPLETOUCH is not set | 947 | # CONFIG_USB_APPLETOUCH is not set |
| 948 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 935 | 949 | ||
| 936 | # | 950 | # |
| 937 | # USB Imaging devices | 951 | # USB Imaging devices |
| @@ -963,16 +977,17 @@ CONFIG_USB_MON=y | |||
| 963 | # | 977 | # |
| 964 | # CONFIG_USB_EMI62 is not set | 978 | # CONFIG_USB_EMI62 is not set |
| 965 | # CONFIG_USB_EMI26 is not set | 979 | # CONFIG_USB_EMI26 is not set |
| 980 | # CONFIG_USB_ADUTUX is not set | ||
| 966 | # CONFIG_USB_AUERSWALD is not set | 981 | # CONFIG_USB_AUERSWALD is not set |
| 967 | # CONFIG_USB_RIO500 is not set | 982 | # CONFIG_USB_RIO500 is not set |
| 968 | # CONFIG_USB_LEGOTOWER is not set | 983 | # CONFIG_USB_LEGOTOWER is not set |
| 969 | # CONFIG_USB_LCD is not set | 984 | # CONFIG_USB_LCD is not set |
| 970 | # CONFIG_USB_LED is not set | 985 | # CONFIG_USB_LED is not set |
| 971 | # CONFIG_USB_CY7C63 is not set | 986 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 972 | # CONFIG_USB_CYTHERM is not set | 987 | # CONFIG_USB_CYTHERM is not set |
| 973 | # CONFIG_USB_PHIDGETKIT is not set | 988 | # CONFIG_USB_PHIDGET is not set |
| 974 | # CONFIG_USB_PHIDGETSERVO is not set | ||
| 975 | # CONFIG_USB_IDMOUSE is not set | 989 | # CONFIG_USB_IDMOUSE is not set |
| 990 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 976 | # CONFIG_USB_APPLEDISPLAY is not set | 991 | # CONFIG_USB_APPLEDISPLAY is not set |
| 977 | # CONFIG_USB_SISUSBVGA is not set | 992 | # CONFIG_USB_SISUSBVGA is not set |
| 978 | # CONFIG_USB_LD is not set | 993 | # CONFIG_USB_LD is not set |
| @@ -1041,6 +1056,7 @@ CONFIG_EXT3_FS=y | |||
| 1041 | CONFIG_EXT3_FS_XATTR=y | 1056 | CONFIG_EXT3_FS_XATTR=y |
| 1042 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1057 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1043 | # CONFIG_EXT3_FS_SECURITY is not set | 1058 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1059 | # CONFIG_EXT4DEV_FS is not set | ||
| 1044 | CONFIG_JBD=y | 1060 | CONFIG_JBD=y |
| 1045 | # CONFIG_JBD_DEBUG is not set | 1061 | # CONFIG_JBD_DEBUG is not set |
| 1046 | CONFIG_FS_MBCACHE=y | 1062 | CONFIG_FS_MBCACHE=y |
| @@ -1052,6 +1068,7 @@ CONFIG_XFS_QUOTA=y | |||
| 1052 | # CONFIG_XFS_SECURITY is not set | 1068 | # CONFIG_XFS_SECURITY is not set |
| 1053 | CONFIG_XFS_POSIX_ACL=y | 1069 | CONFIG_XFS_POSIX_ACL=y |
| 1054 | # CONFIG_XFS_RT is not set | 1070 | # CONFIG_XFS_RT is not set |
| 1071 | # CONFIG_GFS2_FS is not set | ||
| 1055 | # CONFIG_OCFS2_FS is not set | 1072 | # CONFIG_OCFS2_FS is not set |
| 1056 | # CONFIG_MINIX_FS is not set | 1073 | # CONFIG_MINIX_FS is not set |
| 1057 | CONFIG_ROMFS_FS=m | 1074 | CONFIG_ROMFS_FS=m |
| @@ -1082,8 +1099,10 @@ CONFIG_AUTOFS4_FS=y | |||
| 1082 | # | 1099 | # |
| 1083 | CONFIG_PROC_FS=y | 1100 | CONFIG_PROC_FS=y |
| 1084 | CONFIG_PROC_KCORE=y | 1101 | CONFIG_PROC_KCORE=y |
| 1102 | CONFIG_PROC_SYSCTL=y | ||
| 1085 | CONFIG_SYSFS=y | 1103 | CONFIG_SYSFS=y |
| 1086 | CONFIG_TMPFS=y | 1104 | CONFIG_TMPFS=y |
| 1105 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1087 | # CONFIG_HUGETLB_PAGE is not set | 1106 | # CONFIG_HUGETLB_PAGE is not set |
| 1088 | CONFIG_RAMFS=y | 1107 | CONFIG_RAMFS=y |
| 1089 | # CONFIG_CONFIGFS_FS is not set | 1108 | # CONFIG_CONFIGFS_FS is not set |
| @@ -1123,7 +1142,6 @@ CONFIG_SUNRPC=y | |||
| 1123 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1142 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1124 | # CONFIG_SMB_FS is not set | 1143 | # CONFIG_SMB_FS is not set |
| 1125 | # CONFIG_CIFS is not set | 1144 | # CONFIG_CIFS is not set |
| 1126 | # CONFIG_CIFS_DEBUG2 is not set | ||
| 1127 | # CONFIG_NCP_FS is not set | 1145 | # CONFIG_NCP_FS is not set |
| 1128 | # CONFIG_CODA_FS is not set | 1146 | # CONFIG_CODA_FS is not set |
| 1129 | # CONFIG_AFS_FS is not set | 1147 | # CONFIG_AFS_FS is not set |
| @@ -1150,11 +1168,13 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1150 | # | 1168 | # |
| 1151 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1169 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1152 | # CONFIG_PRINTK_TIME is not set | 1170 | # CONFIG_PRINTK_TIME is not set |
| 1171 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1153 | # CONFIG_MAGIC_SYSRQ is not set | 1172 | # CONFIG_MAGIC_SYSRQ is not set |
| 1154 | # CONFIG_UNUSED_SYMBOLS is not set | 1173 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1155 | # CONFIG_DEBUG_KERNEL is not set | 1174 | # CONFIG_DEBUG_KERNEL is not set |
| 1156 | CONFIG_LOG_BUF_SHIFT=14 | 1175 | CONFIG_LOG_BUF_SHIFT=14 |
| 1157 | # CONFIG_DEBUG_FS is not set | 1176 | # CONFIG_DEBUG_FS is not set |
| 1177 | # CONFIG_HEADERS_CHECK is not set | ||
| 1158 | CONFIG_CROSSCOMPILE=y | 1178 | CONFIG_CROSSCOMPILE=y |
| 1159 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 1179 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
| 1160 | 1180 | ||
| @@ -1170,10 +1190,6 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | |||
| 1170 | # CONFIG_CRYPTO is not set | 1190 | # CONFIG_CRYPTO is not set |
| 1171 | 1191 | ||
| 1172 | # | 1192 | # |
| 1173 | # Hardware crypto devices | ||
| 1174 | # | ||
| 1175 | |||
| 1176 | # | ||
| 1177 | # Library routines | 1193 | # Library routines |
| 1178 | # | 1194 | # |
| 1179 | # CONFIG_CRC_CCITT is not set | 1195 | # CONFIG_CRC_CCITT is not set |
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 53f4171fc188..7a3ebbeba1f3 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
| @@ -1055,7 +1055,9 @@ asmlinkage long sys32_newuname(struct new_utsname __user * name) | |||
| 1055 | asmlinkage int sys32_personality(unsigned long personality) | 1055 | asmlinkage int sys32_personality(unsigned long personality) |
| 1056 | { | 1056 | { |
| 1057 | int ret; | 1057 | int ret; |
| 1058 | if (current->personality == PER_LINUX32 && personality == PER_LINUX) | 1058 | personality &= 0xffffffff; |
| 1059 | if (personality(current->personality) == PER_LINUX32 && | ||
| 1060 | personality == PER_LINUX) | ||
| 1059 | personality = PER_LINUX32; | 1061 | personality = PER_LINUX32; |
| 1060 | ret = sys_personality(personality); | 1062 | ret = sys_personality(personality); |
| 1061 | if (ret == PER_LINUX32) | 1063 | if (ret == PER_LINUX32) |
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 9f307eb1a31e..ec8209f3a0c6 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c | |||
| @@ -358,10 +358,8 @@ static int __init frame_info_init(void) | |||
| 358 | unsigned long size = 0; | 358 | unsigned long size = 0; |
| 359 | #ifdef CONFIG_KALLSYMS | 359 | #ifdef CONFIG_KALLSYMS |
| 360 | unsigned long ofs; | 360 | unsigned long ofs; |
| 361 | char *modname; | ||
| 362 | char namebuf[KSYM_NAME_LEN + 1]; | ||
| 363 | 361 | ||
| 364 | kallsyms_lookup((unsigned long)schedule, &size, &ofs, &modname, namebuf); | 362 | kallsyms_lookup_size_offset((unsigned long)schedule, &size, &ofs); |
| 365 | #endif | 363 | #endif |
| 366 | schedule_mfi.func = schedule; | 364 | schedule_mfi.func = schedule; |
| 367 | schedule_mfi.func_size = size; | 365 | schedule_mfi.func_size = size; |
| @@ -403,8 +401,6 @@ unsigned long unwind_stack(struct task_struct *task, unsigned long *sp, | |||
| 403 | { | 401 | { |
| 404 | unsigned long stack_page; | 402 | unsigned long stack_page; |
| 405 | struct mips_frame_info info; | 403 | struct mips_frame_info info; |
| 406 | char *modname; | ||
| 407 | char namebuf[KSYM_NAME_LEN + 1]; | ||
| 408 | unsigned long size, ofs; | 404 | unsigned long size, ofs; |
| 409 | int leaf; | 405 | int leaf; |
| 410 | extern void ret_from_irq(void); | 406 | extern void ret_from_irq(void); |
| @@ -433,7 +429,7 @@ unsigned long unwind_stack(struct task_struct *task, unsigned long *sp, | |||
| 433 | } | 429 | } |
| 434 | return 0; | 430 | return 0; |
| 435 | } | 431 | } |
| 436 | if (!kallsyms_lookup(pc, &size, &ofs, &modname, namebuf)) | 432 | if (!kallsyms_lookup_size_offset(pc, &size, &ofs)) |
| 437 | return 0; | 433 | return 0; |
| 438 | /* | 434 | /* |
| 439 | * Return ra if an exception occured at the first instruction | 435 | * Return ra if an exception occured at the first instruction |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 61362e6fa9ec..720fac3435d5 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
| @@ -652,7 +652,8 @@ einval: li v0, -EINVAL | |||
| 652 | sys sys_vmsplice 4 | 652 | sys sys_vmsplice 4 |
| 653 | sys sys_move_pages 6 | 653 | sys sys_move_pages 6 |
| 654 | sys sys_set_robust_list 2 | 654 | sys sys_set_robust_list 2 |
| 655 | sys sys_get_robust_list 3 | 655 | sys sys_get_robust_list 3 /* 4310 */ |
| 656 | sys sys_ni_syscall 0 | ||
| 656 | .endm | 657 | .endm |
| 657 | 658 | ||
| 658 | /* We pre-compute the number of _instruction_ bytes needed to | 659 | /* We pre-compute the number of _instruction_ bytes needed to |
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 6c7b5ed0ea6e..3a34f62c8b1b 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
| @@ -468,3 +468,4 @@ sys_call_table: | |||
| 468 | PTR sys_move_pages | 468 | PTR sys_move_pages |
| 469 | PTR sys_set_robust_list | 469 | PTR sys_set_robust_list |
| 470 | PTR sys_get_robust_list | 470 | PTR sys_get_robust_list |
| 471 | PTR sys_ni_syscall /* 5270 */ | ||
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 6d9f18727ac5..67b92a1d6c72 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -280,7 +280,7 @@ EXPORT(sysn32_call_table) | |||
| 280 | PTR sys_sync | 280 | PTR sys_sync |
| 281 | PTR sys_acct | 281 | PTR sys_acct |
| 282 | PTR sys32_settimeofday | 282 | PTR sys32_settimeofday |
| 283 | PTR sys_mount /* 6160 */ | 283 | PTR compat_sys_mount /* 6160 */ |
| 284 | PTR sys_umount | 284 | PTR sys_umount |
| 285 | PTR sys_swapon | 285 | PTR sys_swapon |
| 286 | PTR sys_swapoff | 286 | PTR sys_swapoff |
| @@ -394,3 +394,4 @@ EXPORT(sysn32_call_table) | |||
| 394 | PTR sys_move_pages | 394 | PTR sys_move_pages |
| 395 | PTR compat_sys_set_robust_list | 395 | PTR compat_sys_set_robust_list |
| 396 | PTR compat_sys_get_robust_list | 396 | PTR compat_sys_get_robust_list |
| 397 | PTR sys_ni_syscall | ||
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 2e6d0673163e..2875c4a3fa58 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -226,7 +226,7 @@ sys_call_table: | |||
| 226 | PTR sys_ni_syscall /* was sys_stat */ | 226 | PTR sys_ni_syscall /* was sys_stat */ |
| 227 | PTR sys_lseek | 227 | PTR sys_lseek |
| 228 | PTR sys_getpid /* 4020 */ | 228 | PTR sys_getpid /* 4020 */ |
| 229 | PTR sys_mount | 229 | PTR compat_sys_mount |
| 230 | PTR sys_oldumount | 230 | PTR sys_oldumount |
| 231 | PTR sys_setuid | 231 | PTR sys_setuid |
| 232 | PTR sys_getuid | 232 | PTR sys_getuid |
| @@ -516,4 +516,5 @@ sys_call_table: | |||
| 516 | PTR compat_sys_move_pages | 516 | PTR compat_sys_move_pages |
| 517 | PTR compat_sys_set_robust_list | 517 | PTR compat_sys_set_robust_list |
| 518 | PTR compat_sys_get_robust_list /* 4310 */ | 518 | PTR compat_sys_get_robust_list /* 4310 */ |
| 519 | PTR sys_ni_syscall | ||
| 519 | .size sys_call_table,.-sys_call_table | 520 | .size sys_call_table,.-sys_call_table |
diff --git a/arch/mips/kernel/stacktrace.c b/arch/mips/kernel/stacktrace.c index 4aabe526a68e..a586aba337a7 100644 --- a/arch/mips/kernel/stacktrace.c +++ b/arch/mips/kernel/stacktrace.c | |||
| @@ -57,7 +57,7 @@ static void save_context_stack(struct stack_trace *trace, | |||
| 57 | pc = unwind_stack(task, &sp, pc, &ra); | 57 | pc = unwind_stack(task, &sp, pc, &ra); |
| 58 | } while (pc); | 58 | } while (pc); |
| 59 | #else | 59 | #else |
| 60 | save_raw_context_stack(sp); | 60 | save_raw_context_stack(trace, sp); |
| 61 | #endif | 61 | #endif |
| 62 | } | 62 | } |
| 63 | 63 | ||
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index 6f8a9fe7c1e3..c079e2ae02a1 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
| @@ -187,7 +187,7 @@ out: | |||
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | /* | 189 | /* |
| 190 | * Estimate CPU frequency. Sets mips_counter_frequency as a side-effect | 190 | * Estimate CPU frequency. Sets mips_hpt_frequency as a side-effect |
| 191 | */ | 191 | */ |
| 192 | static unsigned int __init estimate_cpu_frequency(void) | 192 | static unsigned int __init estimate_cpu_frequency(void) |
| 193 | { | 193 | { |
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c index 6244d0e2c7de..90ad5bf3e2f1 100644 --- a/arch/mips/mips-boards/malta/malta_int.c +++ b/arch/mips/mips-boards/malta/malta_int.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <asm/i8259.h> | 32 | #include <asm/i8259.h> |
| 33 | #include <asm/irq_cpu.h> | 33 | #include <asm/irq_cpu.h> |
| 34 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 35 | #include <asm/irq_regs.h> | ||
| 35 | #include <asm/mips-boards/malta.h> | 36 | #include <asm/mips-boards/malta.h> |
| 36 | #include <asm/mips-boards/maltaint.h> | 37 | #include <asm/mips-boards/maltaint.h> |
| 37 | #include <asm/mips-boards/piix4.h> | 38 | #include <asm/mips-boards/piix4.h> |
| @@ -131,7 +132,7 @@ static void corehi_irqdispatch(void) | |||
| 131 | unsigned int intedge, intsteer, pcicmd, pcibadaddr; | 132 | unsigned int intedge, intsteer, pcicmd, pcibadaddr; |
| 132 | unsigned int pcimstat, intisr, inten, intpol; | 133 | unsigned int pcimstat, intisr, inten, intpol; |
| 133 | unsigned int intrcause,datalo,datahi; | 134 | unsigned int intrcause,datalo,datahi; |
| 134 | struct pt_regs *regs; | 135 | struct pt_regs *regs = get_irq_regs(); |
| 135 | 136 | ||
| 136 | printk("CoreHI interrupt, shouldn't happen, so we die here!!!\n"); | 137 | printk("CoreHI interrupt, shouldn't happen, so we die here!!!\n"); |
| 137 | printk("epc : %08lx\nStatus: %08lx\n" | 138 | printk("epc : %08lx\nStatus: %08lx\n" |
diff --git a/arch/mips/mips-boards/sim/sim_time.c b/arch/mips/mips-boards/sim/sim_time.c index c566b9bd0427..24a4ed00cc0a 100644 --- a/arch/mips/mips-boards/sim/sim_time.c +++ b/arch/mips/mips-boards/sim/sim_time.c | |||
| @@ -102,7 +102,7 @@ irqreturn_t sim_timer_interrupt(int irq, void *dev_id) | |||
| 102 | 102 | ||
| 103 | 103 | ||
| 104 | /* | 104 | /* |
| 105 | * Estimate CPU frequency. Sets mips_counter_frequency as a side-effect | 105 | * Estimate CPU frequency. Sets mips_hpt_frequency as a side-effect |
| 106 | */ | 106 | */ |
| 107 | static unsigned int __init estimate_cpu_frequency(void) | 107 | static unsigned int __init estimate_cpu_frequency(void) |
| 108 | { | 108 | { |
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 88b72c9a8495..2de4d3c367a2 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -30,11 +30,34 @@ | |||
| 30 | #include <asm/cachectl.h> | 30 | #include <asm/cachectl.h> |
| 31 | #include <asm/cpu.h> | 31 | #include <asm/cpu.h> |
| 32 | #include <asm/dma.h> | 32 | #include <asm/dma.h> |
| 33 | #include <asm/kmap_types.h> | ||
| 33 | #include <asm/mmu_context.h> | 34 | #include <asm/mmu_context.h> |
| 34 | #include <asm/sections.h> | 35 | #include <asm/sections.h> |
| 35 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
| 36 | #include <asm/pgalloc.h> | 37 | #include <asm/pgalloc.h> |
| 37 | #include <asm/tlb.h> | 38 | #include <asm/tlb.h> |
| 39 | #include <asm/fixmap.h> | ||
| 40 | |||
| 41 | /* Atomicity and interruptability */ | ||
| 42 | #ifdef CONFIG_MIPS_MT_SMTC | ||
| 43 | |||
| 44 | #include <asm/mipsmtregs.h> | ||
| 45 | |||
| 46 | #define ENTER_CRITICAL(flags) \ | ||
| 47 | { \ | ||
| 48 | unsigned int mvpflags; \ | ||
| 49 | local_irq_save(flags);\ | ||
| 50 | mvpflags = dvpe() | ||
| 51 | #define EXIT_CRITICAL(flags) \ | ||
| 52 | evpe(mvpflags); \ | ||
| 53 | local_irq_restore(flags); \ | ||
| 54 | } | ||
| 55 | #else | ||
| 56 | |||
| 57 | #define ENTER_CRITICAL(flags) local_irq_save(flags) | ||
| 58 | #define EXIT_CRITICAL(flags) local_irq_restore(flags) | ||
| 59 | |||
| 60 | #endif /* CONFIG_MIPS_MT_SMTC */ | ||
| 38 | 61 | ||
| 39 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | 62 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); |
| 40 | 63 | ||
| @@ -80,13 +103,142 @@ unsigned long setup_zero_pages(void) | |||
| 80 | return 1UL << order; | 103 | return 1UL << order; |
| 81 | } | 104 | } |
| 82 | 105 | ||
| 83 | #ifdef CONFIG_HIGHMEM | 106 | /* |
| 84 | pte_t *kmap_pte; | 107 | * These are almost like kmap_atomic / kunmap_atmic except they take an |
| 85 | pgprot_t kmap_prot; | 108 | * additional address argument as the hint. |
| 109 | */ | ||
| 86 | 110 | ||
| 87 | #define kmap_get_fixmap_pte(vaddr) \ | 111 | #define kmap_get_fixmap_pte(vaddr) \ |
| 88 | pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), (vaddr)) | 112 | pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), (vaddr)) |
| 89 | 113 | ||
| 114 | #ifdef CONFIG_MIPS_MT_SMTC | ||
| 115 | static pte_t *kmap_coherent_pte; | ||
| 116 | static void __init kmap_coherent_init(void) | ||
| 117 | { | ||
| 118 | unsigned long vaddr; | ||
| 119 | |||
| 120 | /* cache the first coherent kmap pte */ | ||
| 121 | vaddr = __fix_to_virt(FIX_CMAP_BEGIN); | ||
| 122 | kmap_coherent_pte = kmap_get_fixmap_pte(vaddr); | ||
| 123 | } | ||
| 124 | #else | ||
| 125 | static inline void kmap_coherent_init(void) {} | ||
| 126 | #endif | ||
| 127 | |||
| 128 | static inline void *kmap_coherent(struct page *page, unsigned long addr) | ||
| 129 | { | ||
| 130 | enum fixed_addresses idx; | ||
| 131 | unsigned long vaddr, flags, entrylo; | ||
| 132 | unsigned long old_ctx; | ||
| 133 | pte_t pte; | ||
| 134 | int tlbidx; | ||
| 135 | |||
| 136 | inc_preempt_count(); | ||
| 137 | idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); | ||
| 138 | #ifdef CONFIG_MIPS_MT_SMTC | ||
| 139 | idx += FIX_N_COLOURS * smp_processor_id(); | ||
| 140 | #endif | ||
| 141 | vaddr = __fix_to_virt(FIX_CMAP_END - idx); | ||
| 142 | pte = mk_pte(page, PAGE_KERNEL); | ||
| 143 | #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) | ||
| 144 | entrylo = pte.pte_high; | ||
| 145 | #else | ||
| 146 | entrylo = pte_val(pte) >> 6; | ||
| 147 | #endif | ||
| 148 | |||
| 149 | ENTER_CRITICAL(flags); | ||
| 150 | old_ctx = read_c0_entryhi(); | ||
| 151 | write_c0_entryhi(vaddr & (PAGE_MASK << 1)); | ||
| 152 | write_c0_entrylo0(entrylo); | ||
| 153 | write_c0_entrylo1(entrylo); | ||
| 154 | #ifdef CONFIG_MIPS_MT_SMTC | ||
| 155 | set_pte(kmap_coherent_pte - (FIX_CMAP_END - idx), pte); | ||
| 156 | /* preload TLB instead of local_flush_tlb_one() */ | ||
| 157 | mtc0_tlbw_hazard(); | ||
| 158 | tlb_probe(); | ||
| 159 | tlb_probe_hazard(); | ||
| 160 | tlbidx = read_c0_index(); | ||
| 161 | mtc0_tlbw_hazard(); | ||
| 162 | if (tlbidx < 0) | ||
| 163 | tlb_write_random(); | ||
| 164 | else | ||
| 165 | tlb_write_indexed(); | ||
| 166 | #else | ||
| 167 | tlbidx = read_c0_wired(); | ||
| 168 | write_c0_wired(tlbidx + 1); | ||
| 169 | write_c0_index(tlbidx); | ||
| 170 | mtc0_tlbw_hazard(); | ||
| 171 | tlb_write_indexed(); | ||
| 172 | #endif | ||
| 173 | tlbw_use_hazard(); | ||
| 174 | write_c0_entryhi(old_ctx); | ||
| 175 | EXIT_CRITICAL(flags); | ||
| 176 | |||
| 177 | return (void*) vaddr; | ||
| 178 | } | ||
| 179 | |||
| 180 | #define UNIQUE_ENTRYHI(idx) (CKSEG0 + ((idx) << (PAGE_SHIFT + 1))) | ||
| 181 | |||
| 182 | static inline void kunmap_coherent(struct page *page) | ||
| 183 | { | ||
| 184 | #ifndef CONFIG_MIPS_MT_SMTC | ||
| 185 | unsigned int wired; | ||
| 186 | unsigned long flags, old_ctx; | ||
| 187 | |||
| 188 | ENTER_CRITICAL(flags); | ||
| 189 | old_ctx = read_c0_entryhi(); | ||
| 190 | wired = read_c0_wired() - 1; | ||
| 191 | write_c0_wired(wired); | ||
| 192 | write_c0_index(wired); | ||
| 193 | write_c0_entryhi(UNIQUE_ENTRYHI(wired)); | ||
| 194 | write_c0_entrylo0(0); | ||
| 195 | write_c0_entrylo1(0); | ||
| 196 | mtc0_tlbw_hazard(); | ||
| 197 | tlb_write_indexed(); | ||
| 198 | tlbw_use_hazard(); | ||
| 199 | write_c0_entryhi(old_ctx); | ||
| 200 | EXIT_CRITICAL(flags); | ||
| 201 | #endif | ||
| 202 | dec_preempt_count(); | ||
| 203 | preempt_check_resched(); | ||
| 204 | } | ||
| 205 | |||
| 206 | void copy_to_user_page(struct vm_area_struct *vma, | ||
| 207 | struct page *page, unsigned long vaddr, void *dst, const void *src, | ||
| 208 | unsigned long len) | ||
| 209 | { | ||
| 210 | if (cpu_has_dc_aliases) { | ||
| 211 | void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); | ||
| 212 | memcpy(vto, src, len); | ||
| 213 | kunmap_coherent(page); | ||
| 214 | } else | ||
| 215 | memcpy(dst, src, len); | ||
| 216 | if ((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc) | ||
| 217 | flush_cache_page(vma, vaddr, page_to_pfn(page)); | ||
| 218 | } | ||
| 219 | |||
| 220 | EXPORT_SYMBOL(copy_to_user_page); | ||
| 221 | |||
| 222 | void copy_from_user_page(struct vm_area_struct *vma, | ||
| 223 | struct page *page, unsigned long vaddr, void *dst, const void *src, | ||
| 224 | unsigned long len) | ||
| 225 | { | ||
| 226 | if (cpu_has_dc_aliases) { | ||
| 227 | void *vfrom = | ||
| 228 | kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); | ||
| 229 | memcpy(dst, vfrom, len); | ||
| 230 | kunmap_coherent(page); | ||
| 231 | } else | ||
| 232 | memcpy(dst, src, len); | ||
| 233 | } | ||
| 234 | |||
| 235 | EXPORT_SYMBOL(copy_from_user_page); | ||
| 236 | |||
| 237 | |||
| 238 | #ifdef CONFIG_HIGHMEM | ||
| 239 | pte_t *kmap_pte; | ||
| 240 | pgprot_t kmap_prot; | ||
| 241 | |||
| 90 | static void __init kmap_init(void) | 242 | static void __init kmap_init(void) |
| 91 | { | 243 | { |
| 92 | unsigned long kmap_vstart; | 244 | unsigned long kmap_vstart; |
| @@ -97,11 +249,12 @@ static void __init kmap_init(void) | |||
| 97 | 249 | ||
| 98 | kmap_prot = PAGE_KERNEL; | 250 | kmap_prot = PAGE_KERNEL; |
| 99 | } | 251 | } |
| 252 | #endif /* CONFIG_HIGHMEM */ | ||
| 100 | 253 | ||
| 101 | #ifdef CONFIG_32BIT | ||
| 102 | void __init fixrange_init(unsigned long start, unsigned long end, | 254 | void __init fixrange_init(unsigned long start, unsigned long end, |
| 103 | pgd_t *pgd_base) | 255 | pgd_t *pgd_base) |
| 104 | { | 256 | { |
| 257 | #if defined(CONFIG_HIGHMEM) || defined(CONFIG_MIPS_MT_SMTC) | ||
| 105 | pgd_t *pgd; | 258 | pgd_t *pgd; |
| 106 | pud_t *pud; | 259 | pud_t *pud; |
| 107 | pmd_t *pmd; | 260 | pmd_t *pmd; |
| @@ -122,7 +275,7 @@ void __init fixrange_init(unsigned long start, unsigned long end, | |||
| 122 | for (; (k < PTRS_PER_PMD) && (vaddr != end); pmd++, k++) { | 275 | for (; (k < PTRS_PER_PMD) && (vaddr != end); pmd++, k++) { |
| 123 | if (pmd_none(*pmd)) { | 276 | if (pmd_none(*pmd)) { |
| 124 | pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE); | 277 | pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE); |
| 125 | set_pmd(pmd, __pmd(pte)); | 278 | set_pmd(pmd, __pmd((unsigned long)pte)); |
| 126 | if (pte != pte_offset_kernel(pmd, 0)) | 279 | if (pte != pte_offset_kernel(pmd, 0)) |
| 127 | BUG(); | 280 | BUG(); |
| 128 | } | 281 | } |
| @@ -132,9 +285,8 @@ void __init fixrange_init(unsigned long start, unsigned long end, | |||
| 132 | } | 285 | } |
| 133 | j = 0; | 286 | j = 0; |
| 134 | } | 287 | } |
| 288 | #endif | ||
| 135 | } | 289 | } |
| 136 | #endif /* CONFIG_32BIT */ | ||
| 137 | #endif /* CONFIG_HIGHMEM */ | ||
| 138 | 290 | ||
| 139 | #ifndef CONFIG_NEED_MULTIPLE_NODES | 291 | #ifndef CONFIG_NEED_MULTIPLE_NODES |
| 140 | extern void pagetable_init(void); | 292 | extern void pagetable_init(void); |
| @@ -175,6 +327,7 @@ void __init paging_init(void) | |||
| 175 | #ifdef CONFIG_HIGHMEM | 327 | #ifdef CONFIG_HIGHMEM |
| 176 | kmap_init(); | 328 | kmap_init(); |
| 177 | #endif | 329 | #endif |
| 330 | kmap_coherent_init(); | ||
| 178 | 331 | ||
| 179 | max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; | 332 | max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; |
| 180 | low = max_low_pfn; | 333 | low = max_low_pfn; |
diff --git a/arch/mips/mm/ioremap.c b/arch/mips/mm/ioremap.c index 3101d1db5592..cea7d0ea36e4 100644 --- a/arch/mips/mm/ioremap.c +++ b/arch/mips/mm/ioremap.c | |||
| @@ -176,7 +176,7 @@ void __iomem * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags) | |||
| 176 | 176 | ||
| 177 | #define IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == CKSEG1) | 177 | #define IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == CKSEG1) |
| 178 | 178 | ||
| 179 | void __iounmap(volatile void __iomem *addr) | 179 | void __iounmap(const volatile void __iomem *addr) |
| 180 | { | 180 | { |
| 181 | struct vm_struct *p; | 181 | struct vm_struct *p; |
| 182 | 182 | ||
diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c index 4bdaa05f485b..4a61e624b0ec 100644 --- a/arch/mips/mm/pgtable-32.c +++ b/arch/mips/mm/pgtable-32.c | |||
| @@ -31,9 +31,10 @@ void pgd_init(unsigned long page) | |||
| 31 | 31 | ||
| 32 | void __init pagetable_init(void) | 32 | void __init pagetable_init(void) |
| 33 | { | 33 | { |
| 34 | #ifdef CONFIG_HIGHMEM | ||
| 35 | unsigned long vaddr; | 34 | unsigned long vaddr; |
| 36 | pgd_t *pgd, *pgd_base; | 35 | pgd_t *pgd_base; |
| 36 | #ifdef CONFIG_HIGHMEM | ||
| 37 | pgd_t *pgd; | ||
| 37 | pud_t *pud; | 38 | pud_t *pud; |
| 38 | pmd_t *pmd; | 39 | pmd_t *pmd; |
| 39 | pte_t *pte; | 40 | pte_t *pte; |
| @@ -44,7 +45,6 @@ void __init pagetable_init(void) | |||
| 44 | pgd_init((unsigned long)swapper_pg_dir | 45 | pgd_init((unsigned long)swapper_pg_dir |
| 45 | + sizeof(pgd_t) * USER_PTRS_PER_PGD); | 46 | + sizeof(pgd_t) * USER_PTRS_PER_PGD); |
| 46 | 47 | ||
| 47 | #ifdef CONFIG_HIGHMEM | ||
| 48 | pgd_base = swapper_pg_dir; | 48 | pgd_base = swapper_pg_dir; |
| 49 | 49 | ||
| 50 | /* | 50 | /* |
| @@ -53,6 +53,7 @@ void __init pagetable_init(void) | |||
| 53 | vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; | 53 | vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; |
| 54 | fixrange_init(vaddr, 0, pgd_base); | 54 | fixrange_init(vaddr, 0, pgd_base); |
| 55 | 55 | ||
| 56 | #ifdef CONFIG_HIGHMEM | ||
| 56 | /* | 57 | /* |
| 57 | * Permanent kmaps: | 58 | * Permanent kmaps: |
| 58 | */ | 59 | */ |
diff --git a/arch/mips/mm/pgtable-64.c b/arch/mips/mm/pgtable-64.c index 44b5e97fff65..8d600d307d5d 100644 --- a/arch/mips/mm/pgtable-64.c +++ b/arch/mips/mm/pgtable-64.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 11 | #include <asm/fixmap.h> | ||
| 11 | #include <asm/pgtable.h> | 12 | #include <asm/pgtable.h> |
| 12 | 13 | ||
| 13 | void pgd_init(unsigned long page) | 14 | void pgd_init(unsigned long page) |
| @@ -52,7 +53,17 @@ void pmd_init(unsigned long addr, unsigned long pagetable) | |||
| 52 | 53 | ||
| 53 | void __init pagetable_init(void) | 54 | void __init pagetable_init(void) |
| 54 | { | 55 | { |
| 56 | unsigned long vaddr; | ||
| 57 | pgd_t *pgd_base; | ||
| 58 | |||
| 55 | /* Initialize the entire pgd. */ | 59 | /* Initialize the entire pgd. */ |
| 56 | pgd_init((unsigned long)swapper_pg_dir); | 60 | pgd_init((unsigned long)swapper_pg_dir); |
| 57 | pmd_init((unsigned long)invalid_pmd_table, (unsigned long)invalid_pte_table); | 61 | pmd_init((unsigned long)invalid_pmd_table, (unsigned long)invalid_pte_table); |
| 62 | |||
| 63 | pgd_base = swapper_pg_dir; | ||
| 64 | /* | ||
| 65 | * Fixed mappings: | ||
| 66 | */ | ||
| 67 | vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; | ||
| 68 | fixrange_init(vaddr, 0, pgd_base); | ||
| 58 | } | 69 | } |
diff --git a/arch/mips/oprofile/op_impl.h b/arch/mips/oprofile/op_impl.h index 354e54496406..fa6b4aae7523 100644 --- a/arch/mips/oprofile/op_impl.h +++ b/arch/mips/oprofile/op_impl.h | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | #ifndef OP_IMPL_H | 10 | #ifndef OP_IMPL_H |
| 11 | #define OP_IMPL_H 1 | 11 | #define OP_IMPL_H 1 |
| 12 | 12 | ||
| 13 | struct pt_regs; | ||
| 14 | |||
| 15 | extern int null_perf_irq(void); | 13 | extern int null_perf_irq(void); |
| 16 | extern int (*perf_irq)(void); | 14 | extern int (*perf_irq)(void); |
| 17 | 15 | ||
diff --git a/arch/mips/oprofile/op_model_rm9000.c b/arch/mips/oprofile/op_model_rm9000.c index b7063fefa65b..7dc9bf6f1321 100644 --- a/arch/mips/oprofile/op_model_rm9000.c +++ b/arch/mips/oprofile/op_model_rm9000.c | |||
| @@ -80,8 +80,7 @@ static void rm9000_cpu_stop(void *args) | |||
| 80 | write_c0_perfcontrol(0); | 80 | write_c0_perfcontrol(0); |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id, | 83 | static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id) |
| 84 | struct pt_regs *regs) | ||
| 85 | { | 84 | { |
| 86 | unsigned int control = read_c0_perfcontrol(); | 85 | unsigned int control = read_c0_perfcontrol(); |
| 87 | uint32_t counter1, counter2; | 86 | uint32_t counter1, counter2; |
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c index fd0932b2d521..db8084411538 100644 --- a/arch/mips/sgi-ip32/ip32-reset.c +++ b/arch/mips/sgi-ip32/ip32-reset.c | |||
| @@ -135,7 +135,7 @@ static inline void ip32_power_button(void) | |||
| 135 | add_timer(&power_timer); | 135 | add_timer(&power_timer); |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | static irqreturn_t ip32_rtc_int(int irq, void *dev_id, struct pt_regs *regs) | 138 | static irqreturn_t ip32_rtc_int(int irq, void *dev_id) |
| 139 | { | 139 | { |
| 140 | volatile unsigned char reg_c; | 140 | volatile unsigned char reg_c; |
| 141 | 141 | ||
diff --git a/arch/mips/sibyte/sb1250/bcm1250_tbprof.c b/arch/mips/sibyte/sb1250/bcm1250_tbprof.c index 992e0d8dbb67..d1a906e683b2 100644 --- a/arch/mips/sibyte/sb1250/bcm1250_tbprof.c +++ b/arch/mips/sibyte/sb1250/bcm1250_tbprof.c | |||
| @@ -88,7 +88,7 @@ static void arm_tb(void) | |||
| 88 | sbp.tb_armed = 1; | 88 | sbp.tb_armed = 1; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | static irqreturn_t sbprof_tb_intr(int irq, void *dev_id, struct pt_regs *regs) | 91 | static irqreturn_t sbprof_tb_intr(int irq, void *dev_id) |
| 92 | { | 92 | { |
| 93 | int i; | 93 | int i; |
| 94 | DBG(printk(DEVNAME ": tb_intr\n")); | 94 | DBG(printk(DEVNAME ": tb_intr\n")); |
| @@ -138,7 +138,7 @@ static irqreturn_t sbprof_tb_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
| 138 | return IRQ_HANDLED; | 138 | return IRQ_HANDLED; |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | static irqreturn_t sbprof_pc_intr(int irq, void *dev_id, struct pt_regs *regs) | 141 | static irqreturn_t sbprof_pc_intr(int irq, void *dev_id) |
| 142 | { | 142 | { |
| 143 | printk(DEVNAME ": unexpected pc_intr"); | 143 | printk(DEVNAME ": unexpected pc_intr"); |
| 144 | return IRQ_NONE; | 144 | return IRQ_NONE; |
diff --git a/arch/mips/sibyte/sb1250/bus_watcher.c b/arch/mips/sibyte/sb1250/bus_watcher.c index bb90649fbc48..45274bd3cd8b 100644 --- a/arch/mips/sibyte/sb1250/bus_watcher.c +++ b/arch/mips/sibyte/sb1250/bus_watcher.c | |||
| @@ -171,7 +171,7 @@ static void create_proc_decoder(struct bw_stats_struct *stats) | |||
| 171 | * notes: possible re-entry due to multiple sources | 171 | * notes: possible re-entry due to multiple sources |
| 172 | * should check/indicate saturation | 172 | * should check/indicate saturation |
| 173 | */ | 173 | */ |
| 174 | static irqreturn_t sibyte_bw_int(int irq, void *data, struct pt_regs *regs) | 174 | static irqreturn_t sibyte_bw_int(int irq, void *data) |
| 175 | { | 175 | { |
| 176 | struct bw_stats_struct *stats = data; | 176 | struct bw_stats_struct *stats = data; |
| 177 | unsigned long cntr; | 177 | unsigned long cntr; |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 8b6910465578..2bd9b7fb0f6c 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -751,6 +751,15 @@ config ARCH_MEMORY_PROBE | |||
| 751 | def_bool y | 751 | def_bool y |
| 752 | depends on MEMORY_HOTPLUG | 752 | depends on MEMORY_HOTPLUG |
| 753 | 753 | ||
| 754 | # Some NUMA nodes have memory ranges that span | ||
| 755 | # other nodes. Even though a pfn is valid and | ||
| 756 | # between a node's start and end pfns, it may not | ||
| 757 | # reside on that node. See memmap_init_zone() | ||
| 758 | # for details. | ||
| 759 | config NODES_SPAN_OTHER_NODES | ||
| 760 | def_bool y | ||
| 761 | depends on NEED_MULTIPLE_NODES | ||
| 762 | |||
| 754 | config PPC_64K_PAGES | 763 | config PPC_64K_PAGES |
| 755 | bool "64k page size" | 764 | bool "64k page size" |
| 756 | depends on PPC64 | 765 | depends on PPC64 |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 9828663652e9..d2833c1a1f3d 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
| @@ -184,6 +184,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 184 | CONFIG_MIGRATION=y | 184 | CONFIG_MIGRATION=y |
| 185 | CONFIG_RESOURCES_64BIT=y | 185 | CONFIG_RESOURCES_64BIT=y |
| 186 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 186 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
| 187 | CONFIG_NODES_SPAN_OTHER_NODES=y | ||
| 187 | # CONFIG_PPC_64K_PAGES is not set | 188 | # CONFIG_PPC_64K_PAGES is not set |
| 188 | CONFIG_SCHED_SMT=y | 189 | CONFIG_SCHED_SMT=y |
| 189 | CONFIG_PROC_DEVICETREE=y | 190 | CONFIG_PROC_DEVICETREE=y |
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c index d822c7c18e1f..d3dfb2a36d47 100644 --- a/arch/sparc64/kernel/of_device.c +++ b/arch/sparc64/kernel/of_device.c | |||
| @@ -131,8 +131,13 @@ static int of_device_resume(struct device * dev) | |||
| 131 | void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name) | 131 | void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name) |
| 132 | { | 132 | { |
| 133 | unsigned long ret = res->start + offset; | 133 | unsigned long ret = res->start + offset; |
| 134 | struct resource *r; | ||
| 134 | 135 | ||
| 135 | if (!request_region(ret, size, name)) | 136 | if (res->flags & IORESOURCE_MEM) |
| 137 | r = request_mem_region(ret, size, name); | ||
| 138 | else | ||
| 139 | r = request_region(ret, size, name); | ||
| 140 | if (!r) | ||
| 136 | ret = 0; | 141 | ret = 0; |
| 137 | 142 | ||
| 138 | return (void __iomem *) ret; | 143 | return (void __iomem *) ret; |
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c index de7f7850a844..94bb681f2323 100644 --- a/arch/sparc64/kernel/pci_sabre.c +++ b/arch/sparc64/kernel/pci_sabre.c | |||
| @@ -1465,5 +1465,5 @@ void sabre_init(struct device_node *dp, char *model_name) | |||
| 1465 | /* | 1465 | /* |
| 1466 | * Look for APB underneath. | 1466 | * Look for APB underneath. |
| 1467 | */ | 1467 | */ |
| 1468 | sabre_pbm_init(p, dp, vdma[0], vdma[1]); | 1468 | sabre_pbm_init(p, dp, vdma[0], vdma[0] + vdma[1]); |
| 1469 | } | 1469 | } |
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 78fb619bdb73..5ac1f2963ae3 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | config DEFCONFIG_LIST | ||
| 2 | string | ||
| 3 | option defconfig_list | ||
| 4 | default "arch/$ARCH/defconfig" | ||
| 5 | |||
| 1 | # UML uses the generic IRQ sugsystem | 6 | # UML uses the generic IRQ sugsystem |
| 2 | config GENERIC_HARDIRQS | 7 | config GENERIC_HARDIRQS |
| 3 | bool | 8 | bool |
| @@ -52,6 +57,7 @@ menu "UML-specific options" | |||
| 52 | config MODE_TT | 57 | config MODE_TT |
| 53 | bool "Tracing thread support (DEPRECATED)" | 58 | bool "Tracing thread support (DEPRECATED)" |
| 54 | default n | 59 | default n |
| 60 | depends on BROKEN | ||
| 55 | help | 61 | help |
| 56 | This option controls whether tracing thread support is compiled | 62 | This option controls whether tracing thread support is compiled |
| 57 | into UML. This option is largely obsolete, given that skas0 provides | 63 | into UML. This option is largely obsolete, given that skas0 provides |
diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char index 62d87b71179b..e03e40c7aac3 100644 --- a/arch/um/Kconfig.char +++ b/arch/um/Kconfig.char | |||
| @@ -190,6 +190,11 @@ config HOSTAUDIO | |||
| 190 | tristate | 190 | tristate |
| 191 | default UML_SOUND | 191 | default UML_SOUND |
| 192 | 192 | ||
| 193 | #It is selected elsewhere, so kconfig would warn without this. | ||
| 194 | config HW_RANDOM | ||
| 195 | tristate | ||
| 196 | default n | ||
| 197 | |||
| 193 | config UML_RANDOM | 198 | config UML_RANDOM |
| 194 | tristate "Hardware random number generator" | 199 | tristate "Hardware random number generator" |
| 195 | help | 200 | help |
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h index 7a5b4afde692..c6a308464acb 100644 --- a/arch/um/drivers/cow_sys.h +++ b/arch/um/drivers/cow_sys.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #include "user_util.h" | 5 | #include "user_util.h" |
| 6 | #include "os.h" | 6 | #include "os.h" |
| 7 | #include "user.h" | 7 | #include "user.h" |
| 8 | #include "um_malloc.h" | ||
| 8 | 9 | ||
| 9 | static inline void *cow_malloc(int size) | 10 | static inline void *cow_malloc(int size) |
| 10 | { | 11 | { |
diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c index 77954ea77043..310af0f1e49e 100644 --- a/arch/um/drivers/daemon_user.c +++ b/arch/um/drivers/daemon_user.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include "user_util.h" | 17 | #include "user_util.h" |
| 18 | #include "user.h" | 18 | #include "user.h" |
| 19 | #include "os.h" | 19 | #include "os.h" |
| 20 | #include "um_malloc.h" | ||
| 20 | 21 | ||
| 21 | #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER) | 22 | #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER) |
| 22 | 23 | ||
diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c index 108b7dafbd0e..218aa0e9b792 100644 --- a/arch/um/drivers/fd.c +++ b/arch/um/drivers/fd.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include "user_util.h" | 12 | #include "user_util.h" |
| 13 | #include "chan_user.h" | 13 | #include "chan_user.h" |
| 14 | #include "os.h" | 14 | #include "os.h" |
| 15 | #include "um_malloc.h" | ||
| 15 | 16 | ||
| 16 | struct fd_chan { | 17 | struct fd_chan { |
| 17 | int fd; | 18 | int fd; |
diff --git a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c index 4d2bd39a85bc..8138f5ea1bf7 100644 --- a/arch/um/drivers/mcast_user.c +++ b/arch/um/drivers/mcast_user.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include "user_util.h" | 23 | #include "user_util.h" |
| 24 | #include "user.h" | 24 | #include "user.h" |
| 25 | #include "os.h" | 25 | #include "os.h" |
| 26 | #include "um_malloc.h" | ||
| 26 | 27 | ||
| 27 | #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER) | 28 | #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER) |
| 28 | 29 | ||
diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c index 9a3b5daf6250..df3516e47d4d 100644 --- a/arch/um/drivers/mmapper_kern.c +++ b/arch/um/drivers/mmapper_kern.c | |||
| @@ -95,7 +95,8 @@ static const struct file_operations mmapper_fops = { | |||
| 95 | .release = mmapper_release, | 95 | .release = mmapper_release, |
| 96 | }; | 96 | }; |
| 97 | 97 | ||
| 98 | static const struct miscdevice mmapper_dev = { | 98 | /* No locking needed - only used (and modified) by below initcall and exitcall. */ |
| 99 | static struct miscdevice mmapper_dev = { | ||
| 99 | .minor = MISC_DYNAMIC_MINOR, | 100 | .minor = MISC_DYNAMIC_MINOR, |
| 100 | .name = "mmapper", | 101 | .name = "mmapper", |
| 101 | .fops = &mmapper_fops | 102 | .fops = &mmapper_fops |
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c index f3a3f8a29c7a..0ffd7ac295d4 100644 --- a/arch/um/drivers/net_user.c +++ b/arch/um/drivers/net_user.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include "kern_util.h" | 18 | #include "kern_util.h" |
| 19 | #include "net_user.h" | 19 | #include "net_user.h" |
| 20 | #include "os.h" | 20 | #include "os.h" |
| 21 | #include "um_malloc.h" | ||
| 21 | 22 | ||
| 22 | int tap_open_common(void *dev, char *gate_addr) | 23 | int tap_open_common(void *dev, char *gate_addr) |
| 23 | { | 24 | { |
diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c index 2ef641ded960..11921a7baa7b 100644 --- a/arch/um/drivers/pcap_user.c +++ b/arch/um/drivers/pcap_user.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include "net_user.h" | 12 | #include "net_user.h" |
| 13 | #include "pcap_user.h" | 13 | #include "pcap_user.h" |
| 14 | #include "user.h" | 14 | #include "user.h" |
| 15 | #include "um_malloc.h" | ||
| 15 | 16 | ||
| 16 | #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER) | 17 | #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER) |
| 17 | 18 | ||
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c index f2e8fc42ecc2..bc6afaf74c1a 100644 --- a/arch/um/drivers/port_user.c +++ b/arch/um/drivers/port_user.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include "chan_user.h" | 19 | #include "chan_user.h" |
| 20 | #include "port.h" | 20 | #include "port.h" |
| 21 | #include "os.h" | 21 | #include "os.h" |
| 22 | #include "um_malloc.h" | ||
| 22 | 23 | ||
| 23 | struct port_chan { | 24 | struct port_chan { |
| 24 | int raw; | 25 | int raw; |
diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c index abec620e8380..829a5eca8c07 100644 --- a/arch/um/drivers/pty.c +++ b/arch/um/drivers/pty.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include "user_util.h" | 13 | #include "user_util.h" |
| 14 | #include "kern_util.h" | 14 | #include "kern_util.h" |
| 15 | #include "os.h" | 15 | #include "os.h" |
| 16 | #include "um_malloc.h" | ||
| 16 | 17 | ||
| 17 | struct pty_chan { | 18 | struct pty_chan { |
| 18 | void (*announce)(char *dev_name, int dev); | 19 | void (*announce)(char *dev_name, int dev); |
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c index 8460285c69a5..7eddacc53b6e 100644 --- a/arch/um/drivers/slip_user.c +++ b/arch/um/drivers/slip_user.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include "slip.h" | 15 | #include "slip.h" |
| 16 | #include "slip_common.h" | 16 | #include "slip_common.h" |
| 17 | #include "os.h" | 17 | #include "os.h" |
| 18 | #include "um_malloc.h" | ||
| 18 | 19 | ||
| 19 | void slip_user_init(void *data, void *dev) | 20 | void slip_user_init(void *data, void *dev) |
| 20 | { | 21 | { |
diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c index 11de3ac1eb5c..d95d64309eaf 100644 --- a/arch/um/drivers/tty.c +++ b/arch/um/drivers/tty.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include "user_util.h" | 11 | #include "user_util.h" |
| 12 | #include "user.h" | 12 | #include "user.h" |
| 13 | #include "os.h" | 13 | #include "os.h" |
| 14 | #include "um_malloc.h" | ||
| 14 | 15 | ||
| 15 | struct tty_chan { | 16 | struct tty_chan { |
| 16 | char *dev; | 17 | char *dev; |
diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c index 386f8b952982..850221d9b4c9 100644 --- a/arch/um/drivers/xterm.c +++ b/arch/um/drivers/xterm.c | |||
| @@ -136,8 +136,6 @@ int xterm_open(int input, int output, int primary, void *d, | |||
| 136 | return(pid); | 136 | return(pid); |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | if(data->stack == 0) free_stack(stack, 0); | ||
| 140 | |||
| 141 | if (data->direct_rcv) { | 139 | if (data->direct_rcv) { |
| 142 | new = os_rcv_fd(fd, &data->helper_pid); | 140 | new = os_rcv_fd(fd, &data->helper_pid); |
| 143 | } else { | 141 | } else { |
diff --git a/arch/um/include/um_malloc.h b/arch/um/include/um_malloc.h new file mode 100644 index 000000000000..0363a9b53f8d --- /dev/null +++ b/arch/um/include/um_malloc.h | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2005 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | ||
| 3 | * Licensed under the GPL | ||
| 4 | */ | ||
| 5 | |||
| 6 | #ifndef __UM_MALLOC_H__ | ||
| 7 | #define __UM_MALLOC_H__ | ||
| 8 | |||
| 9 | extern void *um_kmalloc(int size); | ||
| 10 | extern void *um_kmalloc_atomic(int size); | ||
| 11 | extern void kfree(const void *ptr); | ||
| 12 | |||
| 13 | extern void *um_vmalloc(int size); | ||
| 14 | extern void *um_vmalloc_atomic(int size); | ||
| 15 | extern void vfree(void *ptr); | ||
| 16 | |||
| 17 | #endif /* __UM_MALLOC_H__ */ | ||
diff --git a/arch/um/include/user.h b/arch/um/include/user.h index 39f8c8801076..acadce3f271f 100644 --- a/arch/um/include/user.h +++ b/arch/um/include/user.h | |||
| @@ -11,17 +11,11 @@ extern void panic(const char *fmt, ...) | |||
| 11 | extern int printk(const char *fmt, ...) | 11 | extern int printk(const char *fmt, ...) |
| 12 | __attribute__ ((format (printf, 1, 2))); | 12 | __attribute__ ((format (printf, 1, 2))); |
| 13 | extern void schedule(void); | 13 | extern void schedule(void); |
| 14 | extern void *um_kmalloc(int size); | ||
| 15 | extern void *um_kmalloc_atomic(int size); | ||
| 16 | extern void kfree(void *ptr); | ||
| 17 | extern int in_aton(char *str); | 14 | extern int in_aton(char *str); |
| 18 | extern int open_gdb_chan(void); | 15 | extern int open_gdb_chan(void); |
| 19 | /* These use size_t, however unsigned long is correct on both i386 and x86_64. */ | 16 | /* These use size_t, however unsigned long is correct on both i386 and x86_64. */ |
| 20 | extern unsigned long strlcpy(char *, const char *, unsigned long); | 17 | extern unsigned long strlcpy(char *, const char *, unsigned long); |
| 21 | extern unsigned long strlcat(char *, const char *, unsigned long); | 18 | extern unsigned long strlcat(char *, const char *, unsigned long); |
| 22 | extern void *um_vmalloc(int size); | ||
| 23 | extern void *um_vmalloc_atomic(int size); | ||
| 24 | extern void vfree(void *ptr); | ||
| 25 | 19 | ||
| 26 | #endif | 20 | #endif |
| 27 | 21 | ||
diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h index 802d7842514d..06625fefef33 100644 --- a/arch/um/include/user_util.h +++ b/arch/um/include/user_util.h | |||
| @@ -52,7 +52,6 @@ extern int linux_main(int argc, char **argv); | |||
| 52 | extern void set_cmdline(char *cmd); | 52 | extern void set_cmdline(char *cmd); |
| 53 | extern void input_cb(void (*proc)(void *), void *arg, int arg_len); | 53 | extern void input_cb(void (*proc)(void *), void *arg, int arg_len); |
| 54 | extern int get_pty(void); | 54 | extern int get_pty(void); |
| 55 | extern void *um_kmalloc(int size); | ||
| 56 | extern int switcheroo(int fd, int prot, void *from, void *to, int size); | 55 | extern int switcheroo(int fd, int prot, void *from, void *to, int size); |
| 57 | extern void do_exec(int old_pid, int new_pid); | 56 | extern void do_exec(int old_pid, int new_pid); |
| 58 | extern void tracer_panic(char *msg, ...) | 57 | extern void tracer_panic(char *msg, ...) |
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index ef259569fd8c..5c1e611f628d 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include "irq_kern.h" | 31 | #include "irq_kern.h" |
| 32 | #include "os.h" | 32 | #include "os.h" |
| 33 | #include "sigio.h" | 33 | #include "sigio.h" |
| 34 | #include "um_malloc.h" | ||
| 34 | #include "misc_constants.h" | 35 | #include "misc_constants.h" |
| 35 | 36 | ||
| 36 | /* | 37 | /* |
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index fe6c64abda5b..348b272bb766 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include "mode.h" | 46 | #include "mode.h" |
| 47 | #include "mode_kern.h" | 47 | #include "mode_kern.h" |
| 48 | #include "choose-mode.h" | 48 | #include "choose-mode.h" |
| 49 | #include "um_malloc.h" | ||
| 49 | 50 | ||
| 50 | /* This is a per-cpu array. A processor only modifies its entry and it only | 51 | /* This is a per-cpu array. A processor only modifies its entry and it only |
| 51 | * cares about its entry, so it's OK if another processor is modifying its | 52 | * cares about its entry, so it's OK if another processor is modifying its |
diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c index f559bdf746e6..863981ba1468 100644 --- a/arch/um/os-Linux/drivers/ethertap_user.c +++ b/arch/um/os-Linux/drivers/ethertap_user.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include "net_user.h" | 20 | #include "net_user.h" |
| 21 | #include "etap.h" | 21 | #include "etap.h" |
| 22 | #include "os.h" | 22 | #include "os.h" |
| 23 | #include "um_malloc.h" | ||
| 23 | 24 | ||
| 24 | #define MAX_PACKET ETH_MAX_PACKET | 25 | #define MAX_PACKET ETH_MAX_PACKET |
| 25 | 26 | ||
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c index cd15b9df5b5c..d13299cfa318 100644 --- a/arch/um/os-Linux/helper.c +++ b/arch/um/os-Linux/helper.c | |||
| @@ -35,22 +35,23 @@ static int helper_child(void *arg) | |||
| 35 | char **argv = data->argv; | 35 | char **argv = data->argv; |
| 36 | int errval; | 36 | int errval; |
| 37 | 37 | ||
| 38 | if(helper_pause){ | 38 | if (helper_pause){ |
| 39 | signal(SIGHUP, helper_hup); | 39 | signal(SIGHUP, helper_hup); |
| 40 | pause(); | 40 | pause(); |
| 41 | } | 41 | } |
| 42 | if(data->pre_exec != NULL) | 42 | if (data->pre_exec != NULL) |
| 43 | (*data->pre_exec)(data->pre_data); | 43 | (*data->pre_exec)(data->pre_data); |
| 44 | execvp(argv[0], argv); | 44 | execvp(argv[0], argv); |
| 45 | errval = -errno; | 45 | errval = -errno; |
| 46 | printk("helper_child - execve of '%s' failed - errno = %d\n", argv[0], errno); | 46 | printk("helper_child - execve of '%s' failed - errno = %d\n", argv[0], errno); |
| 47 | os_write_file(data->fd, &errval, sizeof(errval)); | 47 | os_write_file(data->fd, &errval, sizeof(errval)); |
| 48 | kill(os_getpid(), SIGKILL); | 48 | kill(os_getpid(), SIGKILL); |
| 49 | return(0); | 49 | return 0; |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | /* Returns either the pid of the child process we run or -E* on failure. | 52 | /* Returns either the pid of the child process we run or -E* on failure. |
| 53 | * XXX The alloc_stack here breaks if this is called in the tracing thread */ | 53 | * XXX The alloc_stack here breaks if this is called in the tracing thread, so |
| 54 | * we need to receive a preallocated stack (a local buffer is ok). */ | ||
| 54 | int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, | 55 | int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, |
| 55 | unsigned long *stack_out) | 56 | unsigned long *stack_out) |
| 56 | { | 57 | { |
| @@ -58,20 +59,21 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, | |||
| 58 | unsigned long stack, sp; | 59 | unsigned long stack, sp; |
| 59 | int pid, fds[2], ret, n; | 60 | int pid, fds[2], ret, n; |
| 60 | 61 | ||
| 61 | if((stack_out != NULL) && (*stack_out != 0)) | 62 | if ((stack_out != NULL) && (*stack_out != 0)) |
| 62 | stack = *stack_out; | 63 | stack = *stack_out; |
| 63 | else stack = alloc_stack(0, __cant_sleep()); | 64 | else |
| 64 | if(stack == 0) | 65 | stack = alloc_stack(0, __cant_sleep()); |
| 66 | if (stack == 0) | ||
| 65 | return -ENOMEM; | 67 | return -ENOMEM; |
| 66 | 68 | ||
| 67 | ret = os_pipe(fds, 1, 0); | 69 | ret = os_pipe(fds, 1, 0); |
| 68 | if(ret < 0){ | 70 | if (ret < 0) { |
| 69 | printk("run_helper : pipe failed, ret = %d\n", -ret); | 71 | printk("run_helper : pipe failed, ret = %d\n", -ret); |
| 70 | goto out_free; | 72 | goto out_free; |
| 71 | } | 73 | } |
| 72 | 74 | ||
| 73 | ret = os_set_exec_close(fds[1], 1); | 75 | ret = os_set_exec_close(fds[1], 1); |
| 74 | if(ret < 0){ | 76 | if (ret < 0) { |
| 75 | printk("run_helper : setting FD_CLOEXEC failed, ret = %d\n", | 77 | printk("run_helper : setting FD_CLOEXEC failed, ret = %d\n", |
| 76 | -ret); | 78 | -ret); |
| 77 | goto out_close; | 79 | goto out_close; |
| @@ -83,7 +85,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, | |||
| 83 | data.argv = argv; | 85 | data.argv = argv; |
| 84 | data.fd = fds[1]; | 86 | data.fd = fds[1]; |
| 85 | pid = clone(helper_child, (void *) sp, CLONE_VM | SIGCHLD, &data); | 87 | pid = clone(helper_child, (void *) sp, CLONE_VM | SIGCHLD, &data); |
| 86 | if(pid < 0){ | 88 | if (pid < 0) { |
| 87 | ret = -errno; | 89 | ret = -errno; |
| 88 | printk("run_helper : clone failed, errno = %d\n", errno); | 90 | printk("run_helper : clone failed, errno = %d\n", errno); |
| 89 | goto out_close; | 91 | goto out_close; |
| @@ -95,10 +97,10 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, | |||
| 95 | /* Read the errno value from the child, if the exec failed, or get 0 if | 97 | /* Read the errno value from the child, if the exec failed, or get 0 if |
| 96 | * the exec succeeded because the pipe fd was set as close-on-exec. */ | 98 | * the exec succeeded because the pipe fd was set as close-on-exec. */ |
| 97 | n = os_read_file(fds[0], &ret, sizeof(ret)); | 99 | n = os_read_file(fds[0], &ret, sizeof(ret)); |
| 98 | if(n == 0) | 100 | if (n == 0) { |
| 99 | ret = pid; | 101 | ret = pid; |
| 100 | else { | 102 | } else { |
| 101 | if(n < 0){ | 103 | if (n < 0) { |
| 102 | printk("run_helper : read on pipe failed, ret = %d\n", | 104 | printk("run_helper : read on pipe failed, ret = %d\n", |
| 103 | -n); | 105 | -n); |
| 104 | ret = n; | 106 | ret = n; |
| @@ -112,10 +114,9 @@ out_close: | |||
| 112 | close(fds[1]); | 114 | close(fds[1]); |
| 113 | close(fds[0]); | 115 | close(fds[0]); |
| 114 | out_free: | 116 | out_free: |
| 115 | if(stack_out == NULL) | 117 | if ((stack_out == NULL) || (*stack_out == 0)) |
| 116 | free_stack(stack, 0); | 118 | free_stack(stack, 0); |
| 117 | else *stack_out = stack; | 119 | return ret; |
| 118 | return(ret); | ||
| 119 | } | 120 | } |
| 120 | 121 | ||
| 121 | int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, | 122 | int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, |
| @@ -125,31 +126,32 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, | |||
| 125 | int pid, status, err; | 126 | int pid, status, err; |
| 126 | 127 | ||
| 127 | stack = alloc_stack(stack_order, __cant_sleep()); | 128 | stack = alloc_stack(stack_order, __cant_sleep()); |
| 128 | if(stack == 0) return(-ENOMEM); | 129 | if (stack == 0) |
| 130 | return -ENOMEM; | ||
| 129 | 131 | ||
| 130 | sp = stack + (page_size() << stack_order) - sizeof(void *); | 132 | sp = stack + (page_size() << stack_order) - sizeof(void *); |
| 131 | pid = clone(proc, (void *) sp, flags | SIGCHLD, arg); | 133 | pid = clone(proc, (void *) sp, flags | SIGCHLD, arg); |
| 132 | if(pid < 0){ | 134 | if (pid < 0) { |
| 133 | err = -errno; | 135 | err = -errno; |
| 134 | printk("run_helper_thread : clone failed, errno = %d\n", | 136 | printk("run_helper_thread : clone failed, errno = %d\n", |
| 135 | errno); | 137 | errno); |
| 136 | return err; | 138 | return err; |
| 137 | } | 139 | } |
| 138 | if(stack_out == NULL){ | 140 | if (stack_out == NULL) { |
| 139 | CATCH_EINTR(pid = waitpid(pid, &status, 0)); | 141 | CATCH_EINTR(pid = waitpid(pid, &status, 0)); |
| 140 | if(pid < 0){ | 142 | if (pid < 0) { |
| 141 | err = -errno; | 143 | err = -errno; |
| 142 | printk("run_helper_thread - wait failed, errno = %d\n", | 144 | printk("run_helper_thread - wait failed, errno = %d\n", |
| 143 | errno); | 145 | errno); |
| 144 | pid = err; | 146 | pid = err; |
| 145 | } | 147 | } |
| 146 | if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) | 148 | if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) |
| 147 | printk("run_helper_thread - thread returned status " | 149 | printk("run_helper_thread - thread returned status " |
| 148 | "0x%x\n", status); | 150 | "0x%x\n", status); |
| 149 | free_stack(stack, stack_order); | 151 | free_stack(stack, stack_order); |
| 150 | } | 152 | } else |
| 151 | else *stack_out = stack; | 153 | *stack_out = stack; |
| 152 | return(pid); | 154 | return pid; |
| 153 | } | 155 | } |
| 154 | 156 | ||
| 155 | int helper_wait(int pid) | 157 | int helper_wait(int pid) |
| @@ -157,9 +159,9 @@ int helper_wait(int pid) | |||
| 157 | int ret; | 159 | int ret; |
| 158 | 160 | ||
| 159 | CATCH_EINTR(ret = waitpid(pid, NULL, WNOHANG)); | 161 | CATCH_EINTR(ret = waitpid(pid, NULL, WNOHANG)); |
| 160 | if(ret < 0){ | 162 | if (ret < 0) { |
| 161 | ret = -errno; | 163 | ret = -errno; |
| 162 | printk("helper_wait : waitpid failed, errno = %d\n", errno); | 164 | printk("helper_wait : waitpid failed, errno = %d\n", errno); |
| 163 | } | 165 | } |
| 164 | return(ret); | 166 | return ret; |
| 165 | } | 167 | } |
diff --git a/arch/um/os-Linux/irq.c b/arch/um/os-Linux/irq.c index a97206df5b52..d46b818c1311 100644 --- a/arch/um/os-Linux/irq.c +++ b/arch/um/os-Linux/irq.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include "sigio.h" | 18 | #include "sigio.h" |
| 19 | #include "irq_user.h" | 19 | #include "irq_user.h" |
| 20 | #include "os.h" | 20 | #include "os.h" |
| 21 | #include "um_malloc.h" | ||
| 21 | 22 | ||
| 22 | static struct pollfd *pollfds = NULL; | 23 | static struct pollfd *pollfds = NULL; |
| 23 | static int pollfds_num = 0; | 24 | static int pollfds_num = 0; |
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c index d1c5670787dc..685feaab65d2 100644 --- a/arch/um/os-Linux/main.c +++ b/arch/um/os-Linux/main.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include "choose-mode.h" | 23 | #include "choose-mode.h" |
| 24 | #include "uml-config.h" | 24 | #include "uml-config.h" |
| 25 | #include "os.h" | 25 | #include "os.h" |
| 26 | #include "um_malloc.h" | ||
| 26 | 27 | ||
| 27 | /* Set in set_stklim, which is called from main and __wrap_malloc. | 28 | /* Set in set_stklim, which is called from main and __wrap_malloc. |
| 28 | * __wrap_malloc only calls it if main hasn't started. | 29 | * __wrap_malloc only calls it if main hasn't started. |
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c index f6457765b17d..925a65240cfe 100644 --- a/arch/um/os-Linux/sigio.c +++ b/arch/um/os-Linux/sigio.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include "user_util.h" | 19 | #include "user_util.h" |
| 20 | #include "sigio.h" | 20 | #include "sigio.h" |
| 21 | #include "os.h" | 21 | #include "os.h" |
| 22 | #include "um_malloc.h" | ||
| 22 | 23 | ||
| 23 | /* Protected by sigio_lock(), also used by sigio_cleanup, which is an | 24 | /* Protected by sigio_lock(), also used by sigio_cleanup, which is an |
| 24 | * exitcall. | 25 | * exitcall. |
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c index 38be096e750f..2115b8beb541 100644 --- a/arch/um/os-Linux/time.c +++ b/arch/um/os-Linux/time.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include "process.h" | 16 | #include "process.h" |
| 17 | #include "kern_constants.h" | 17 | #include "kern_constants.h" |
| 18 | #include "os.h" | 18 | #include "os.h" |
| 19 | #include "uml-config.h" | ||
| 19 | 20 | ||
| 20 | int set_interval(int is_virtual) | 21 | int set_interval(int is_virtual) |
| 21 | { | 22 | { |
| @@ -30,7 +31,7 @@ int set_interval(int is_virtual) | |||
| 30 | return 0; | 31 | return 0; |
| 31 | } | 32 | } |
| 32 | 33 | ||
| 33 | #ifdef CONFIG_MODE_TT | 34 | #ifdef UML_CONFIG_MODE_TT |
| 34 | void enable_timer(void) | 35 | void enable_timer(void) |
| 35 | { | 36 | { |
| 36 | set_interval(1); | 37 | set_interval(1); |
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index 1c0f18d4f887..13972148058d 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile | |||
| @@ -54,6 +54,10 @@ endif | |||
| 54 | cflags-y += $(call cc-option,-funit-at-a-time) | 54 | cflags-y += $(call cc-option,-funit-at-a-time) |
| 55 | # prevent gcc from generating any FP code by mistake | 55 | # prevent gcc from generating any FP code by mistake |
| 56 | cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) | 56 | cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) |
| 57 | # this works around some issues with generating unwind tables in older gccs | ||
| 58 | # newer gccs do it by default | ||
| 59 | cflags-y += -maccumulate-outgoing-args | ||
| 60 | |||
| 57 | # do binutils support CFI? | 61 | # do binutils support CFI? |
| 58 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | 62 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) |
| 59 | AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | 63 | AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) |
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index 47bfba6e9dc4..0f5d44e86be5 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86_64/defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19-rc1 | 3 | # Linux kernel version: 2.6.19-rc2-git4 |
| 4 | # Thu Oct 5 13:04:43 2006 | 4 | # Sat Oct 21 03:38:52 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_X86_64=y | 6 | CONFIG_X86_64=y |
| 7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
| @@ -335,8 +335,8 @@ CONFIG_IPV6=y | |||
| 335 | # CONFIG_INET6_XFRM_MODE_TUNNEL is not set | 335 | # CONFIG_INET6_XFRM_MODE_TUNNEL is not set |
| 336 | # CONFIG_INET6_XFRM_MODE_BEET is not set | 336 | # CONFIG_INET6_XFRM_MODE_BEET is not set |
| 337 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 337 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 338 | CONFIG_IPV6_SIT=y | ||
| 338 | # CONFIG_IPV6_TUNNEL is not set | 339 | # CONFIG_IPV6_TUNNEL is not set |
| 339 | # CONFIG_IPV6_SUBTREES is not set | ||
| 340 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 340 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 341 | # CONFIG_NETWORK_SECMARK is not set | 341 | # CONFIG_NETWORK_SECMARK is not set |
| 342 | # CONFIG_NETFILTER is not set | 342 | # CONFIG_NETFILTER is not set |
| @@ -438,6 +438,13 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 438 | # CONFIG_ATA_OVER_ETH is not set | 438 | # CONFIG_ATA_OVER_ETH is not set |
| 439 | 439 | ||
| 440 | # | 440 | # |
| 441 | # Misc devices | ||
| 442 | # | ||
| 443 | # CONFIG_IBM_ASM is not set | ||
| 444 | # CONFIG_SGI_IOC4 is not set | ||
| 445 | # CONFIG_TIFM_CORE is not set | ||
| 446 | |||
| 447 | # | ||
| 441 | # ATA/ATAPI/MFM/RLL support | 448 | # ATA/ATAPI/MFM/RLL support |
| 442 | # | 449 | # |
| 443 | CONFIG_IDE=y | 450 | CONFIG_IDE=y |
| @@ -1008,6 +1015,7 @@ CONFIG_I2C_ISA=m | |||
| 1008 | # | 1015 | # |
| 1009 | # Dallas's 1-wire bus | 1016 | # Dallas's 1-wire bus |
| 1010 | # | 1017 | # |
| 1018 | # CONFIG_W1 is not set | ||
| 1011 | 1019 | ||
| 1012 | # | 1020 | # |
| 1013 | # Hardware Monitoring support | 1021 | # Hardware Monitoring support |
| @@ -1059,12 +1067,6 @@ CONFIG_SENSORS_SMSC47B397=m | |||
| 1059 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1067 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 1060 | 1068 | ||
| 1061 | # | 1069 | # |
| 1062 | # Misc devices | ||
| 1063 | # | ||
| 1064 | # CONFIG_IBM_ASM is not set | ||
| 1065 | # CONFIG_TIFM_CORE is not set | ||
| 1066 | |||
| 1067 | # | ||
| 1068 | # Multimedia devices | 1070 | # Multimedia devices |
| 1069 | # | 1071 | # |
| 1070 | # CONFIG_VIDEO_DEV is not set | 1072 | # CONFIG_VIDEO_DEV is not set |
| @@ -1196,7 +1198,6 @@ CONFIG_USB_HIDINPUT=y | |||
| 1196 | # CONFIG_USB_ATI_REMOTE2 is not set | 1198 | # CONFIG_USB_ATI_REMOTE2 is not set |
| 1197 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1199 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
| 1198 | # CONFIG_USB_APPLETOUCH is not set | 1200 | # CONFIG_USB_APPLETOUCH is not set |
| 1199 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1200 | 1201 | ||
| 1201 | # | 1202 | # |
| 1202 | # USB Imaging devices | 1203 | # USB Imaging devices |
| @@ -1242,6 +1243,7 @@ CONFIG_USB_MON=y | |||
| 1242 | # CONFIG_USB_APPLEDISPLAY is not set | 1243 | # CONFIG_USB_APPLEDISPLAY is not set |
| 1243 | # CONFIG_USB_SISUSBVGA is not set | 1244 | # CONFIG_USB_SISUSBVGA is not set |
| 1244 | # CONFIG_USB_LD is not set | 1245 | # CONFIG_USB_LD is not set |
| 1246 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1245 | # CONFIG_USB_TEST is not set | 1247 | # CONFIG_USB_TEST is not set |
| 1246 | 1248 | ||
| 1247 | # | 1249 | # |
| @@ -1318,6 +1320,7 @@ CONFIG_EXT3_FS=y | |||
| 1318 | CONFIG_EXT3_FS_XATTR=y | 1320 | CONFIG_EXT3_FS_XATTR=y |
| 1319 | CONFIG_EXT3_FS_POSIX_ACL=y | 1321 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1320 | # CONFIG_EXT3_FS_SECURITY is not set | 1322 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1323 | # CONFIG_EXT4DEV_FS is not set | ||
| 1321 | CONFIG_JBD=y | 1324 | CONFIG_JBD=y |
| 1322 | # CONFIG_JBD_DEBUG is not set | 1325 | # CONFIG_JBD_DEBUG is not set |
| 1323 | CONFIG_FS_MBCACHE=y | 1326 | CONFIG_FS_MBCACHE=y |
| @@ -1341,6 +1344,7 @@ CONFIG_DNOTIFY=y | |||
| 1341 | # CONFIG_AUTOFS_FS is not set | 1344 | # CONFIG_AUTOFS_FS is not set |
| 1342 | CONFIG_AUTOFS4_FS=y | 1345 | CONFIG_AUTOFS4_FS=y |
| 1343 | # CONFIG_FUSE_FS is not set | 1346 | # CONFIG_FUSE_FS is not set |
| 1347 | CONFIG_GENERIC_ACL=y | ||
| 1344 | 1348 | ||
| 1345 | # | 1349 | # |
| 1346 | # CD-ROM/DVD Filesystems | 1350 | # CD-ROM/DVD Filesystems |
| @@ -1418,7 +1422,6 @@ CONFIG_SUNRPC=y | |||
| 1418 | # CONFIG_CODA_FS is not set | 1422 | # CONFIG_CODA_FS is not set |
| 1419 | # CONFIG_AFS_FS is not set | 1423 | # CONFIG_AFS_FS is not set |
| 1420 | # CONFIG_9P_FS is not set | 1424 | # CONFIG_9P_FS is not set |
| 1421 | CONFIG_GENERIC_ACL=y | ||
| 1422 | 1425 | ||
| 1423 | # | 1426 | # |
| 1424 | # Partition Types | 1427 | # Partition Types |
| @@ -1471,10 +1474,6 @@ CONFIG_NLS_ISO8859_15=y | |||
| 1471 | CONFIG_NLS_UTF8=y | 1474 | CONFIG_NLS_UTF8=y |
| 1472 | 1475 | ||
| 1473 | # | 1476 | # |
| 1474 | # Distributed Lock Manager | ||
| 1475 | # | ||
| 1476 | |||
| 1477 | # | ||
| 1478 | # Instrumentation Support | 1477 | # Instrumentation Support |
| 1479 | # | 1478 | # |
| 1480 | CONFIG_PROFILING=y | 1479 | CONFIG_PROFILING=y |
| @@ -1512,6 +1511,7 @@ CONFIG_DEBUG_FS=y | |||
| 1512 | CONFIG_UNWIND_INFO=y | 1511 | CONFIG_UNWIND_INFO=y |
| 1513 | CONFIG_STACK_UNWIND=y | 1512 | CONFIG_STACK_UNWIND=y |
| 1514 | # CONFIG_FORCED_INLINING is not set | 1513 | # CONFIG_FORCED_INLINING is not set |
| 1514 | # CONFIG_HEADERS_CHECK is not set | ||
| 1515 | # CONFIG_RCU_TORTURE_TEST is not set | 1515 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1516 | # CONFIG_LKDTM is not set | 1516 | # CONFIG_LKDTM is not set |
| 1517 | # CONFIG_DEBUG_RODATA is not set | 1517 | # CONFIG_DEBUG_RODATA is not set |
diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c index b3f0908668ec..a75c829c2b02 100644 --- a/arch/x86_64/kernel/e820.c +++ b/arch/x86_64/kernel/e820.c | |||
| @@ -54,13 +54,13 @@ static inline int bad_addr(unsigned long *addrp, unsigned long size) | |||
| 54 | 54 | ||
| 55 | /* various gunk below that needed for SMP startup */ | 55 | /* various gunk below that needed for SMP startup */ |
| 56 | if (addr < 0x8000) { | 56 | if (addr < 0x8000) { |
| 57 | *addrp = 0x8000; | 57 | *addrp = PAGE_ALIGN(0x8000); |
| 58 | return 1; | 58 | return 1; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | /* direct mapping tables of the kernel */ | 61 | /* direct mapping tables of the kernel */ |
| 62 | if (last >= table_start<<PAGE_SHIFT && addr < table_end<<PAGE_SHIFT) { | 62 | if (last >= table_start<<PAGE_SHIFT && addr < table_end<<PAGE_SHIFT) { |
| 63 | *addrp = table_end << PAGE_SHIFT; | 63 | *addrp = PAGE_ALIGN(table_end << PAGE_SHIFT); |
| 64 | return 1; | 64 | return 1; |
| 65 | } | 65 | } |
| 66 | 66 | ||
| @@ -68,18 +68,18 @@ static inline int bad_addr(unsigned long *addrp, unsigned long size) | |||
| 68 | #ifdef CONFIG_BLK_DEV_INITRD | 68 | #ifdef CONFIG_BLK_DEV_INITRD |
| 69 | if (LOADER_TYPE && INITRD_START && last >= INITRD_START && | 69 | if (LOADER_TYPE && INITRD_START && last >= INITRD_START && |
| 70 | addr < INITRD_START+INITRD_SIZE) { | 70 | addr < INITRD_START+INITRD_SIZE) { |
| 71 | *addrp = INITRD_START + INITRD_SIZE; | 71 | *addrp = PAGE_ALIGN(INITRD_START + INITRD_SIZE); |
| 72 | return 1; | 72 | return 1; |
| 73 | } | 73 | } |
| 74 | #endif | 74 | #endif |
| 75 | /* kernel code */ | 75 | /* kernel code */ |
| 76 | if (last >= __pa_symbol(&_text) && last < __pa_symbol(&_end)) { | 76 | if (last >= __pa_symbol(&_text) && addr < __pa_symbol(&_end)) { |
| 77 | *addrp = __pa_symbol(&_end); | 77 | *addrp = PAGE_ALIGN(__pa_symbol(&_end)); |
| 78 | return 1; | 78 | return 1; |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | if (last >= ebda_addr && addr < ebda_addr + ebda_size) { | 81 | if (last >= ebda_addr && addr < ebda_addr + ebda_size) { |
| 82 | *addrp = ebda_addr + ebda_size; | 82 | *addrp = PAGE_ALIGN(ebda_addr + ebda_size); |
| 83 | return 1; | 83 | return 1; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| @@ -152,7 +152,7 @@ unsigned long __init find_e820_area(unsigned long start, unsigned long end, unsi | |||
| 152 | continue; | 152 | continue; |
| 153 | while (bad_addr(&addr, size) && addr+size <= ei->addr+ei->size) | 153 | while (bad_addr(&addr, size) && addr+size <= ei->addr+ei->size) |
| 154 | ; | 154 | ; |
| 155 | last = addr + size; | 155 | last = PAGE_ALIGN(addr) + size; |
| 156 | if (last > ei->addr + ei->size) | 156 | if (last > ei->addr + ei->size) |
| 157 | continue; | 157 | continue; |
| 158 | if (last > end) | 158 | if (last > end) |
diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86_64/kernel/early-quirks.c index 208e38a372c1..2b1245d86258 100644 --- a/arch/x86_64/kernel/early-quirks.c +++ b/arch/x86_64/kernel/early-quirks.c | |||
| @@ -61,10 +61,11 @@ static void nvidia_bugs(void) | |||
| 61 | 61 | ||
| 62 | static void ati_bugs(void) | 62 | static void ati_bugs(void) |
| 63 | { | 63 | { |
| 64 | #if 1 /* for testing */ | 64 | if (timer_over_8254 == 1) { |
| 65 | printk("ATI board detected\n"); | 65 | timer_over_8254 = 0; |
| 66 | #endif | 66 | printk(KERN_INFO |
| 67 | /* No bugs right now */ | 67 | "ATI board detected. Disabling timer routing over 8254.\n"); |
| 68 | } | ||
| 68 | } | 69 | } |
| 69 | 70 | ||
| 70 | struct chipset { | 71 | struct chipset { |
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index 38a7b2d528e2..7d401b00d822 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S | |||
| @@ -315,6 +315,8 @@ tracesys: | |||
| 315 | LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */ | 315 | LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */ |
| 316 | RESTORE_REST | 316 | RESTORE_REST |
| 317 | cmpq $__NR_syscall_max,%rax | 317 | cmpq $__NR_syscall_max,%rax |
| 318 | movq $-ENOSYS,%rcx | ||
| 319 | cmova %rcx,%rax | ||
| 318 | ja 1f | 320 | ja 1f |
| 319 | movq %r10,%rcx /* fixup for C */ | 321 | movq %r10,%rcx /* fixup for C */ |
| 320 | call *sys_call_table(,%rax,8) | 322 | call *sys_call_table(,%rax,8) |
| @@ -535,8 +537,6 @@ END(stub_rt_sigreturn) | |||
| 535 | 1: incl %gs:pda_irqcount | 537 | 1: incl %gs:pda_irqcount |
| 536 | cmoveq %gs:pda_irqstackptr,%rsp | 538 | cmoveq %gs:pda_irqstackptr,%rsp |
| 537 | push %rbp # backlink for old unwinder | 539 | push %rbp # backlink for old unwinder |
| 538 | CFI_ADJUST_CFA_OFFSET 8 | ||
| 539 | CFI_REL_OFFSET rbp,0 | ||
| 540 | /* | 540 | /* |
| 541 | * We entered an interrupt context - irqs are off: | 541 | * We entered an interrupt context - irqs are off: |
| 542 | */ | 542 | */ |
| @@ -980,11 +980,6 @@ ENTRY(kernel_thread) | |||
| 980 | call do_fork | 980 | call do_fork |
| 981 | movq %rax,RAX(%rsp) | 981 | movq %rax,RAX(%rsp) |
| 982 | xorl %edi,%edi | 982 | xorl %edi,%edi |
| 983 | test %rax,%rax | ||
| 984 | jnz 1f | ||
| 985 | /* terminate stack in child */ | ||
| 986 | movq %rdi,RIP(%rsp) | ||
| 987 | 1: | ||
| 988 | 983 | ||
| 989 | /* | 984 | /* |
| 990 | * It isn't worth to check for reschedule here, | 985 | * It isn't worth to check for reschedule here, |
| @@ -1176,7 +1171,6 @@ ENTRY(call_softirq) | |||
| 1176 | incl %gs:pda_irqcount | 1171 | incl %gs:pda_irqcount |
| 1177 | cmove %gs:pda_irqstackptr,%rsp | 1172 | cmove %gs:pda_irqstackptr,%rsp |
| 1178 | push %rbp # backlink for old unwinder | 1173 | push %rbp # backlink for old unwinder |
| 1179 | CFI_ADJUST_CFA_OFFSET 8 | ||
| 1180 | call __do_softirq | 1174 | call __do_softirq |
| 1181 | leaveq | 1175 | leaveq |
| 1182 | CFI_DEF_CFA_REGISTER rsp | 1176 | CFI_DEF_CFA_REGISTER rsp |
diff --git a/arch/x86_64/kernel/genapic_flat.c b/arch/x86_64/kernel/genapic_flat.c index 0dfc223c1839..7c01db8fa9d1 100644 --- a/arch/x86_64/kernel/genapic_flat.c +++ b/arch/x86_64/kernel/genapic_flat.c | |||
| @@ -153,7 +153,7 @@ struct genapic apic_flat = { | |||
| 153 | 153 | ||
| 154 | static cpumask_t physflat_target_cpus(void) | 154 | static cpumask_t physflat_target_cpus(void) |
| 155 | { | 155 | { |
| 156 | return cpumask_of_cpu(0); | 156 | return cpu_online_map; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | static cpumask_t physflat_vector_allocation_domain(int cpu) | 159 | static cpumask_t physflat_vector_allocation_domain(int cpu) |
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 49e94f7994c5..b000017e4b5d 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c | |||
| @@ -57,7 +57,7 @@ static int no_timer_check; | |||
| 57 | 57 | ||
| 58 | static int disable_timer_pin_1 __initdata; | 58 | static int disable_timer_pin_1 __initdata; |
| 59 | 59 | ||
| 60 | int timer_over_8254 __initdata = 0; | 60 | int timer_over_8254 __initdata = 1; |
| 61 | 61 | ||
| 62 | /* Where if anywhere is the i8259 connect in external int mode */ | 62 | /* Where if anywhere is the i8259 connect in external int mode */ |
| 63 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; | 63 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; |
| @@ -651,12 +651,12 @@ next: | |||
| 651 | if (vector == IA32_SYSCALL_VECTOR) | 651 | if (vector == IA32_SYSCALL_VECTOR) |
| 652 | goto next; | 652 | goto next; |
| 653 | for_each_cpu_mask(new_cpu, domain) | 653 | for_each_cpu_mask(new_cpu, domain) |
| 654 | if (per_cpu(vector_irq, cpu)[vector] != -1) | 654 | if (per_cpu(vector_irq, new_cpu)[vector] != -1) |
| 655 | goto next; | 655 | goto next; |
| 656 | /* Found one! */ | 656 | /* Found one! */ |
| 657 | for_each_cpu_mask(new_cpu, domain) { | 657 | for_each_cpu_mask(new_cpu, domain) { |
| 658 | pos[cpu].vector = vector; | 658 | pos[new_cpu].vector = vector; |
| 659 | pos[cpu].offset = offset; | 659 | pos[new_cpu].offset = offset; |
| 660 | } | 660 | } |
| 661 | if (old_vector >= 0) { | 661 | if (old_vector >= 0) { |
| 662 | int old_cpu; | 662 | int old_cpu; |
| @@ -1255,12 +1255,15 @@ static int ioapic_retrigger_irq(unsigned int irq) | |||
| 1255 | { | 1255 | { |
| 1256 | cpumask_t mask; | 1256 | cpumask_t mask; |
| 1257 | unsigned vector; | 1257 | unsigned vector; |
| 1258 | unsigned long flags; | ||
| 1258 | 1259 | ||
| 1260 | spin_lock_irqsave(&vector_lock, flags); | ||
| 1259 | vector = irq_vector[irq]; | 1261 | vector = irq_vector[irq]; |
| 1260 | cpus_clear(mask); | 1262 | cpus_clear(mask); |
| 1261 | cpu_set(vector >> 8, mask); | 1263 | cpu_set(first_cpu(irq_domain[irq]), mask); |
| 1262 | 1264 | ||
| 1263 | send_IPI_mask(mask, vector & 0xff); | 1265 | send_IPI_mask(mask, vector); |
| 1266 | spin_unlock_irqrestore(&vector_lock, flags); | ||
| 1264 | 1267 | ||
| 1265 | return 1; | 1268 | return 1; |
| 1266 | } | 1269 | } |
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c index b3296cc2f2f2..37a770859e71 100644 --- a/arch/x86_64/kernel/pci-calgary.c +++ b/arch/x86_64/kernel/pci-calgary.c | |||
| @@ -52,7 +52,8 @@ | |||
| 52 | #define ONE_BASED_CHASSIS_NUM 1 | 52 | #define ONE_BASED_CHASSIS_NUM 1 |
| 53 | 53 | ||
| 54 | /* register offsets inside the host bridge space */ | 54 | /* register offsets inside the host bridge space */ |
| 55 | #define PHB_CSR_OFFSET 0x0110 | 55 | #define CALGARY_CONFIG_REG 0x0108 |
| 56 | #define PHB_CSR_OFFSET 0x0110 /* Channel Status */ | ||
| 56 | #define PHB_PLSSR_OFFSET 0x0120 | 57 | #define PHB_PLSSR_OFFSET 0x0120 |
| 57 | #define PHB_CONFIG_RW_OFFSET 0x0160 | 58 | #define PHB_CONFIG_RW_OFFSET 0x0160 |
| 58 | #define PHB_IOBASE_BAR_LOW 0x0170 | 59 | #define PHB_IOBASE_BAR_LOW 0x0170 |
| @@ -83,6 +84,8 @@ | |||
| 83 | #define TAR_VALID 0x0000000000000008UL | 84 | #define TAR_VALID 0x0000000000000008UL |
| 84 | /* CSR (Channel/DMA Status Register) */ | 85 | /* CSR (Channel/DMA Status Register) */ |
| 85 | #define CSR_AGENT_MASK 0xffe0ffff | 86 | #define CSR_AGENT_MASK 0xffe0ffff |
| 87 | /* CCR (Calgary Configuration Register) */ | ||
| 88 | #define CCR_2SEC_TIMEOUT 0x000000000000000EUL | ||
| 86 | 89 | ||
| 87 | #define MAX_NUM_OF_PHBS 8 /* how many PHBs in total? */ | 90 | #define MAX_NUM_OF_PHBS 8 /* how many PHBs in total? */ |
| 88 | #define MAX_NUM_CHASSIS 8 /* max number of chassis */ | 91 | #define MAX_NUM_CHASSIS 8 /* max number of chassis */ |
| @@ -732,6 +735,38 @@ static void calgary_watchdog(unsigned long data) | |||
| 732 | } | 735 | } |
| 733 | } | 736 | } |
| 734 | 737 | ||
| 738 | static void __init calgary_increase_split_completion_timeout(void __iomem *bbar, | ||
| 739 | unsigned char busnum) | ||
| 740 | { | ||
| 741 | u64 val64; | ||
| 742 | void __iomem *target; | ||
| 743 | unsigned long phb_shift = -1; | ||
| 744 | u64 mask; | ||
| 745 | |||
| 746 | switch (busno_to_phbid(busnum)) { | ||
| 747 | case 0: phb_shift = (63 - 19); | ||
| 748 | break; | ||
| 749 | case 1: phb_shift = (63 - 23); | ||
| 750 | break; | ||
| 751 | case 2: phb_shift = (63 - 27); | ||
| 752 | break; | ||
| 753 | case 3: phb_shift = (63 - 35); | ||
| 754 | break; | ||
| 755 | default: | ||
| 756 | BUG_ON(busno_to_phbid(busnum)); | ||
| 757 | } | ||
| 758 | |||
| 759 | target = calgary_reg(bbar, CALGARY_CONFIG_REG); | ||
| 760 | val64 = be64_to_cpu(readq(target)); | ||
| 761 | |||
| 762 | /* zero out this PHB's timer bits */ | ||
| 763 | mask = ~(0xFUL << phb_shift); | ||
| 764 | val64 &= mask; | ||
| 765 | val64 |= (CCR_2SEC_TIMEOUT << phb_shift); | ||
| 766 | writeq(cpu_to_be64(val64), target); | ||
| 767 | readq(target); /* flush */ | ||
| 768 | } | ||
| 769 | |||
| 735 | static void __init calgary_enable_translation(struct pci_dev *dev) | 770 | static void __init calgary_enable_translation(struct pci_dev *dev) |
| 736 | { | 771 | { |
| 737 | u32 val32; | 772 | u32 val32; |
| @@ -756,6 +791,13 @@ static void __init calgary_enable_translation(struct pci_dev *dev) | |||
| 756 | writel(cpu_to_be32(val32), target); | 791 | writel(cpu_to_be32(val32), target); |
| 757 | readl(target); /* flush */ | 792 | readl(target); /* flush */ |
| 758 | 793 | ||
| 794 | /* | ||
| 795 | * Give split completion a longer timeout on bus 1 for aic94xx | ||
| 796 | * http://bugzilla.kernel.org/show_bug.cgi?id=7180 | ||
| 797 | */ | ||
| 798 | if (busnum == 1) | ||
| 799 | calgary_increase_split_completion_timeout(bbar, busnum); | ||
| 800 | |||
| 759 | init_timer(&tbl->watchdog_timer); | 801 | init_timer(&tbl->watchdog_timer); |
| 760 | tbl->watchdog_timer.function = &calgary_watchdog; | 802 | tbl->watchdog_timer.function = &calgary_watchdog; |
| 761 | tbl->watchdog_timer.data = (unsigned long)dev; | 803 | tbl->watchdog_timer.data = (unsigned long)dev; |
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 1ba5a442ac32..88722f11ca13 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
| @@ -948,7 +948,7 @@ __cpuinit int unsynchronized_tsc(void) | |||
| 948 | if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) { | 948 | if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) { |
| 949 | #ifdef CONFIG_ACPI | 949 | #ifdef CONFIG_ACPI |
| 950 | /* But TSC doesn't tick in C3 so don't use it there */ | 950 | /* But TSC doesn't tick in C3 so don't use it there */ |
| 951 | if (acpi_fadt.length > 0 && acpi_fadt.plvl3_lat < 100) | 951 | if (acpi_fadt.length > 0 && acpi_fadt.plvl3_lat < 1000) |
| 952 | return 1; | 952 | return 1; |
| 953 | #endif | 953 | #endif |
| 954 | return 0; | 954 | return 0; |
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S index b9df2ab6529f..1283614c9b24 100644 --- a/arch/x86_64/kernel/vmlinux.lds.S +++ b/arch/x86_64/kernel/vmlinux.lds.S | |||
| @@ -17,6 +17,7 @@ PHDRS { | |||
| 17 | text PT_LOAD FLAGS(5); /* R_E */ | 17 | text PT_LOAD FLAGS(5); /* R_E */ |
| 18 | data PT_LOAD FLAGS(7); /* RWE */ | 18 | data PT_LOAD FLAGS(7); /* RWE */ |
| 19 | user PT_LOAD FLAGS(7); /* RWE */ | 19 | user PT_LOAD FLAGS(7); /* RWE */ |
| 20 | data.init PT_LOAD FLAGS(7); /* RWE */ | ||
| 20 | note PT_NOTE FLAGS(4); /* R__ */ | 21 | note PT_NOTE FLAGS(4); /* R__ */ |
| 21 | } | 22 | } |
| 22 | SECTIONS | 23 | SECTIONS |
| @@ -131,7 +132,7 @@ SECTIONS | |||
| 131 | . = ALIGN(8192); /* init_task */ | 132 | . = ALIGN(8192); /* init_task */ |
| 132 | .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { | 133 | .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { |
| 133 | *(.data.init_task) | 134 | *(.data.init_task) |
| 134 | } :data | 135 | }:data.init |
| 135 | 136 | ||
| 136 | . = ALIGN(4096); | 137 | . = ALIGN(4096); |
| 137 | .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { | 138 | .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { |
diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c index 3cc0544e25f5..1087e150a218 100644 --- a/arch/x86_64/mm/srat.c +++ b/arch/x86_64/mm/srat.c | |||
| @@ -207,7 +207,7 @@ static inline int save_add_info(void) | |||
| 207 | return hotadd_percent > 0; | 207 | return hotadd_percent > 0; |
| 208 | } | 208 | } |
| 209 | #else | 209 | #else |
| 210 | int update_end_of_memory(unsigned long end) {return 0;} | 210 | int update_end_of_memory(unsigned long end) {return -1;} |
| 211 | static int hotadd_enough_memory(struct bootnode *nd) {return 1;} | 211 | static int hotadd_enough_memory(struct bootnode *nd) {return 1;} |
| 212 | #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE | 212 | #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE |
| 213 | static inline int save_add_info(void) {return 1;} | 213 | static inline int save_add_info(void) {return 1;} |
| @@ -337,7 +337,7 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma) | |||
| 337 | push_node_boundaries(node, nd->start >> PAGE_SHIFT, | 337 | push_node_boundaries(node, nd->start >> PAGE_SHIFT, |
| 338 | nd->end >> PAGE_SHIFT); | 338 | nd->end >> PAGE_SHIFT); |
| 339 | 339 | ||
| 340 | if (ma->flags.hot_pluggable && !reserve_hotadd(node, start, end) < 0) { | 340 | if (ma->flags.hot_pluggable && (reserve_hotadd(node, start, end) < 0)) { |
| 341 | /* Ignore hotadd region. Undo damage */ | 341 | /* Ignore hotadd region. Undo damage */ |
| 342 | printk(KERN_NOTICE "SRAT: Hotplug region ignored\n"); | 342 | printk(KERN_NOTICE "SRAT: Hotplug region ignored\n"); |
| 343 | *nd = oldnode; | 343 | *nd = oldnode; |
diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile index 1eb18f421edf..149aba05a5b8 100644 --- a/arch/x86_64/pci/Makefile +++ b/arch/x86_64/pci/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | # Reuse the i386 PCI subsystem | 4 | # Reuse the i386 PCI subsystem |
| 5 | # | 5 | # |
| 6 | CFLAGS += -Iarch/i386/pci | 6 | EXTRA_CFLAGS += -Iarch/i386/pci |
| 7 | 7 | ||
| 8 | obj-y := i386.o | 8 | obj-y := i386.o |
| 9 | obj-$(CONFIG_PCI_DIRECT)+= direct.o | 9 | obj-$(CONFIG_PCI_DIRECT)+= direct.o |
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index c847e17e5caa..136066583c68 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
| @@ -56,11 +56,6 @@ static kmem_cache_t *requestq_cachep; | |||
| 56 | */ | 56 | */ |
| 57 | static kmem_cache_t *iocontext_cachep; | 57 | static kmem_cache_t *iocontext_cachep; |
| 58 | 58 | ||
| 59 | static wait_queue_head_t congestion_wqh[2] = { | ||
| 60 | __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[0]), | ||
| 61 | __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[1]) | ||
| 62 | }; | ||
| 63 | |||
| 64 | /* | 59 | /* |
| 65 | * Controlling structure to kblockd | 60 | * Controlling structure to kblockd |
| 66 | */ | 61 | */ |
| @@ -112,35 +107,6 @@ static void blk_queue_congestion_threshold(struct request_queue *q) | |||
| 112 | q->nr_congestion_off = nr; | 107 | q->nr_congestion_off = nr; |
| 113 | } | 108 | } |
| 114 | 109 | ||
| 115 | /* | ||
| 116 | * A queue has just exitted congestion. Note this in the global counter of | ||
| 117 | * congested queues, and wake up anyone who was waiting for requests to be | ||
| 118 | * put back. | ||
| 119 | */ | ||
| 120 | static void clear_queue_congested(request_queue_t *q, int rw) | ||
| 121 | { | ||
| 122 | enum bdi_state bit; | ||
| 123 | wait_queue_head_t *wqh = &congestion_wqh[rw]; | ||
| 124 | |||
| 125 | bit = (rw == WRITE) ? BDI_write_congested : BDI_read_congested; | ||
| 126 | clear_bit(bit, &q->backing_dev_info.state); | ||
| 127 | smp_mb__after_clear_bit(); | ||
| 128 | if (waitqueue_active(wqh)) | ||
| 129 | wake_up(wqh); | ||
| 130 | } | ||
| 131 | |||
| 132 | /* | ||
| 133 | * A queue has just entered congestion. Flag that in the queue's VM-visible | ||
| 134 | * state flags and increment the global gounter of congested queues. | ||
| 135 | */ | ||
| 136 | static void set_queue_congested(request_queue_t *q, int rw) | ||
| 137 | { | ||
| 138 | enum bdi_state bit; | ||
| 139 | |||
| 140 | bit = (rw == WRITE) ? BDI_write_congested : BDI_read_congested; | ||
| 141 | set_bit(bit, &q->backing_dev_info.state); | ||
| 142 | } | ||
| 143 | |||
| 144 | /** | 110 | /** |
| 145 | * blk_get_backing_dev_info - get the address of a queue's backing_dev_info | 111 | * blk_get_backing_dev_info - get the address of a queue's backing_dev_info |
| 146 | * @bdev: device | 112 | * @bdev: device |
| @@ -159,7 +125,6 @@ struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev) | |||
| 159 | ret = &q->backing_dev_info; | 125 | ret = &q->backing_dev_info; |
| 160 | return ret; | 126 | return ret; |
| 161 | } | 127 | } |
| 162 | |||
| 163 | EXPORT_SYMBOL(blk_get_backing_dev_info); | 128 | EXPORT_SYMBOL(blk_get_backing_dev_info); |
| 164 | 129 | ||
| 165 | void blk_queue_activity_fn(request_queue_t *q, activity_fn *fn, void *data) | 130 | void blk_queue_activity_fn(request_queue_t *q, activity_fn *fn, void *data) |
| @@ -167,7 +132,6 @@ void blk_queue_activity_fn(request_queue_t *q, activity_fn *fn, void *data) | |||
| 167 | q->activity_fn = fn; | 132 | q->activity_fn = fn; |
| 168 | q->activity_data = data; | 133 | q->activity_data = data; |
| 169 | } | 134 | } |
| 170 | |||
| 171 | EXPORT_SYMBOL(blk_queue_activity_fn); | 135 | EXPORT_SYMBOL(blk_queue_activity_fn); |
| 172 | 136 | ||
| 173 | /** | 137 | /** |
| @@ -2067,7 +2031,7 @@ static void __freed_request(request_queue_t *q, int rw) | |||
| 2067 | struct request_list *rl = &q->rq; | 2031 | struct request_list *rl = &q->rq; |
| 2068 | 2032 | ||
| 2069 | if (rl->count[rw] < queue_congestion_off_threshold(q)) | 2033 | if (rl->count[rw] < queue_congestion_off_threshold(q)) |
| 2070 | clear_queue_congested(q, rw); | 2034 | blk_clear_queue_congested(q, rw); |
| 2071 | 2035 | ||
| 2072 | if (rl->count[rw] + 1 <= q->nr_requests) { | 2036 | if (rl->count[rw] + 1 <= q->nr_requests) { |
| 2073 | if (waitqueue_active(&rl->wait[rw])) | 2037 | if (waitqueue_active(&rl->wait[rw])) |
| @@ -2137,7 +2101,7 @@ static struct request *get_request(request_queue_t *q, int rw, struct bio *bio, | |||
| 2137 | } | 2101 | } |
| 2138 | } | 2102 | } |
| 2139 | } | 2103 | } |
| 2140 | set_queue_congested(q, rw); | 2104 | blk_set_queue_congested(q, rw); |
| 2141 | } | 2105 | } |
| 2142 | 2106 | ||
| 2143 | /* | 2107 | /* |
| @@ -2755,41 +2719,6 @@ void blk_end_sync_rq(struct request *rq, int error) | |||
| 2755 | } | 2719 | } |
| 2756 | EXPORT_SYMBOL(blk_end_sync_rq); | 2720 | EXPORT_SYMBOL(blk_end_sync_rq); |
| 2757 | 2721 | ||
| 2758 | /** | ||
| 2759 | * blk_congestion_wait - wait for a queue to become uncongested | ||
| 2760 | * @rw: READ or WRITE | ||
| 2761 | * @timeout: timeout in jiffies | ||
| 2762 | * | ||
| 2763 | * Waits for up to @timeout jiffies for a queue (any queue) to exit congestion. | ||
| 2764 | * If no queues are congested then just wait for the next request to be | ||
| 2765 | * returned. | ||
| 2766 | */ | ||
| 2767 | long blk_congestion_wait(int rw, long timeout) | ||
| 2768 | { | ||
| 2769 | long ret; | ||
| 2770 | DEFINE_WAIT(wait); | ||
| 2771 | wait_queue_head_t *wqh = &congestion_wqh[rw]; | ||
| 2772 | |||
| 2773 | prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE); | ||
| 2774 | ret = io_schedule_timeout(timeout); | ||
| 2775 | finish_wait(wqh, &wait); | ||
| 2776 | return ret; | ||
| 2777 | } | ||
| 2778 | |||
| 2779 | EXPORT_SYMBOL(blk_congestion_wait); | ||
| 2780 | |||
| 2781 | /** | ||
| 2782 | * blk_congestion_end - wake up sleepers on a congestion queue | ||
| 2783 | * @rw: READ or WRITE | ||
| 2784 | */ | ||
| 2785 | void blk_congestion_end(int rw) | ||
| 2786 | { | ||
| 2787 | wait_queue_head_t *wqh = &congestion_wqh[rw]; | ||
| 2788 | |||
| 2789 | if (waitqueue_active(wqh)) | ||
| 2790 | wake_up(wqh); | ||
| 2791 | } | ||
| 2792 | |||
| 2793 | /* | 2722 | /* |
| 2794 | * Has to be called with the request spinlock acquired | 2723 | * Has to be called with the request spinlock acquired |
| 2795 | */ | 2724 | */ |
| @@ -3765,14 +3694,14 @@ queue_requests_store(struct request_queue *q, const char *page, size_t count) | |||
| 3765 | blk_queue_congestion_threshold(q); | 3694 | blk_queue_congestion_threshold(q); |
| 3766 | 3695 | ||
| 3767 | if (rl->count[READ] >= queue_congestion_on_threshold(q)) | 3696 | if (rl->count[READ] >= queue_congestion_on_threshold(q)) |
| 3768 | set_queue_congested(q, READ); | 3697 | blk_set_queue_congested(q, READ); |
| 3769 | else if (rl->count[READ] < queue_congestion_off_threshold(q)) | 3698 | else if (rl->count[READ] < queue_congestion_off_threshold(q)) |
| 3770 | clear_queue_congested(q, READ); | 3699 | blk_clear_queue_congested(q, READ); |
| 3771 | 3700 | ||
| 3772 | if (rl->count[WRITE] >= queue_congestion_on_threshold(q)) | 3701 | if (rl->count[WRITE] >= queue_congestion_on_threshold(q)) |
| 3773 | set_queue_congested(q, WRITE); | 3702 | blk_set_queue_congested(q, WRITE); |
| 3774 | else if (rl->count[WRITE] < queue_congestion_off_threshold(q)) | 3703 | else if (rl->count[WRITE] < queue_congestion_off_threshold(q)) |
| 3775 | clear_queue_congested(q, WRITE); | 3704 | blk_clear_queue_congested(q, WRITE); |
| 3776 | 3705 | ||
| 3777 | if (rl->count[READ] >= q->nr_requests) { | 3706 | if (rl->count[READ] >= q->nr_requests) { |
| 3778 | blk_set_queue_full(q, READ); | 3707 | blk_set_queue_full(q, READ); |
diff --git a/crypto/Kconfig b/crypto/Kconfig index 1e2f39c21180..cbae8392ce11 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -27,7 +27,6 @@ config CRYPTO_HASH | |||
| 27 | config CRYPTO_MANAGER | 27 | config CRYPTO_MANAGER |
| 28 | tristate "Cryptographic algorithm manager" | 28 | tristate "Cryptographic algorithm manager" |
| 29 | select CRYPTO_ALGAPI | 29 | select CRYPTO_ALGAPI |
| 30 | default m | ||
| 31 | help | 30 | help |
| 32 | Create default cryptographic template instantiations such as | 31 | Create default cryptographic template instantiations such as |
| 33 | cbc(aes). | 32 | cbc(aes). |
| @@ -35,6 +34,7 @@ config CRYPTO_MANAGER | |||
| 35 | config CRYPTO_HMAC | 34 | config CRYPTO_HMAC |
| 36 | tristate "HMAC support" | 35 | tristate "HMAC support" |
| 37 | select CRYPTO_HASH | 36 | select CRYPTO_HASH |
| 37 | select CRYPTO_MANAGER | ||
| 38 | help | 38 | help |
| 39 | HMAC: Keyed-Hashing for Message Authentication (RFC2104). | 39 | HMAC: Keyed-Hashing for Message Authentication (RFC2104). |
| 40 | This is required for IPSec. | 40 | This is required for IPSec. |
| @@ -131,6 +131,7 @@ config CRYPTO_TGR192 | |||
| 131 | config CRYPTO_ECB | 131 | config CRYPTO_ECB |
| 132 | tristate "ECB support" | 132 | tristate "ECB support" |
| 133 | select CRYPTO_BLKCIPHER | 133 | select CRYPTO_BLKCIPHER |
| 134 | select CRYPTO_MANAGER | ||
| 134 | default m | 135 | default m |
| 135 | help | 136 | help |
| 136 | ECB: Electronic CodeBook mode | 137 | ECB: Electronic CodeBook mode |
| @@ -140,6 +141,7 @@ config CRYPTO_ECB | |||
| 140 | config CRYPTO_CBC | 141 | config CRYPTO_CBC |
| 141 | tristate "CBC support" | 142 | tristate "CBC support" |
| 142 | select CRYPTO_BLKCIPHER | 143 | select CRYPTO_BLKCIPHER |
| 144 | select CRYPTO_MANAGER | ||
| 143 | default m | 145 | default m |
| 144 | help | 146 | help |
| 145 | CBC: Cipher Block Chaining mode | 147 | CBC: Cipher Block Chaining mode |
diff --git a/crypto/api.c b/crypto/api.c index 2e84d4b54790..4fb7fa45cb0d 100644 --- a/crypto/api.c +++ b/crypto/api.c | |||
| @@ -331,7 +331,7 @@ struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 flags) | |||
| 331 | tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, flags); | 331 | tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, flags); |
| 332 | tfm = kzalloc(tfm_size, GFP_KERNEL); | 332 | tfm = kzalloc(tfm_size, GFP_KERNEL); |
| 333 | if (tfm == NULL) | 333 | if (tfm == NULL) |
| 334 | goto out; | 334 | goto out_err; |
| 335 | 335 | ||
| 336 | tfm->__crt_alg = alg; | 336 | tfm->__crt_alg = alg; |
| 337 | 337 | ||
| @@ -355,6 +355,7 @@ cra_init_failed: | |||
| 355 | crypto_exit_ops(tfm); | 355 | crypto_exit_ops(tfm); |
| 356 | out_free_tfm: | 356 | out_free_tfm: |
| 357 | kfree(tfm); | 357 | kfree(tfm); |
| 358 | out_err: | ||
| 358 | tfm = ERR_PTR(err); | 359 | tfm = ERR_PTR(err); |
| 359 | out: | 360 | out: |
| 360 | return tfm; | 361 | return tfm; |
| @@ -414,14 +415,14 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask) | |||
| 414 | struct crypto_alg *alg; | 415 | struct crypto_alg *alg; |
| 415 | 416 | ||
| 416 | alg = crypto_alg_mod_lookup(alg_name, type, mask); | 417 | alg = crypto_alg_mod_lookup(alg_name, type, mask); |
| 417 | err = PTR_ERR(alg); | 418 | if (IS_ERR(alg)) { |
| 418 | tfm = ERR_PTR(err); | 419 | err = PTR_ERR(alg); |
| 419 | if (IS_ERR(alg)) | ||
| 420 | goto err; | 420 | goto err; |
| 421 | } | ||
| 421 | 422 | ||
| 422 | tfm = __crypto_alloc_tfm(alg, 0); | 423 | tfm = __crypto_alloc_tfm(alg, 0); |
| 423 | if (!IS_ERR(tfm)) | 424 | if (!IS_ERR(tfm)) |
| 424 | break; | 425 | return tfm; |
| 425 | 426 | ||
| 426 | crypto_mod_put(alg); | 427 | crypto_mod_put(alg); |
| 427 | err = PTR_ERR(tfm); | 428 | err = PTR_ERR(tfm); |
| @@ -433,9 +434,9 @@ err: | |||
| 433 | err = -EINTR; | 434 | err = -EINTR; |
| 434 | break; | 435 | break; |
| 435 | } | 436 | } |
| 436 | }; | 437 | } |
| 437 | 438 | ||
| 438 | return tfm; | 439 | return ERR_PTR(err); |
| 439 | } | 440 | } |
| 440 | EXPORT_SYMBOL_GPL(crypto_alloc_base); | 441 | EXPORT_SYMBOL_GPL(crypto_alloc_base); |
| 441 | 442 | ||
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 98099de59b45..6bcd9e8e7bcb 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
| @@ -85,6 +85,8 @@ struct acpi_memory_device { | |||
| 85 | struct list_head res_list; | 85 | struct list_head res_list; |
| 86 | }; | 86 | }; |
| 87 | 87 | ||
| 88 | static int acpi_hotmem_initialized; | ||
| 89 | |||
| 88 | static acpi_status | 90 | static acpi_status |
| 89 | acpi_memory_get_resource(struct acpi_resource *resource, void *context) | 91 | acpi_memory_get_resource(struct acpi_resource *resource, void *context) |
| 90 | { | 92 | { |
| @@ -414,7 +416,7 @@ static int acpi_memory_device_add(struct acpi_device *device) | |||
| 414 | /* Set the device state */ | 416 | /* Set the device state */ |
| 415 | mem_device->state = MEMORY_POWER_ON_STATE; | 417 | mem_device->state = MEMORY_POWER_ON_STATE; |
| 416 | 418 | ||
| 417 | printk(KERN_INFO "%s \n", acpi_device_name(device)); | 419 | printk(KERN_DEBUG "%s \n", acpi_device_name(device)); |
| 418 | 420 | ||
| 419 | return result; | 421 | return result; |
| 420 | } | 422 | } |
| @@ -438,6 +440,15 @@ static int acpi_memory_device_start (struct acpi_device *device) | |||
| 438 | struct acpi_memory_device *mem_device; | 440 | struct acpi_memory_device *mem_device; |
| 439 | int result = 0; | 441 | int result = 0; |
| 440 | 442 | ||
| 443 | /* | ||
| 444 | * Early boot code has recognized memory area by EFI/E820. | ||
| 445 | * If DSDT shows these memory devices on boot, hotplug is not necessary | ||
| 446 | * for them. So, it just returns until completion of this driver's | ||
| 447 | * start up. | ||
| 448 | */ | ||
| 449 | if (!acpi_hotmem_initialized) | ||
| 450 | return 0; | ||
| 451 | |||
| 441 | mem_device = acpi_driver_data(device); | 452 | mem_device = acpi_driver_data(device); |
| 442 | 453 | ||
| 443 | if (!acpi_memory_check_device(mem_device)) { | 454 | if (!acpi_memory_check_device(mem_device)) { |
| @@ -537,6 +548,7 @@ static int __init acpi_memory_device_init(void) | |||
| 537 | return -ENODEV; | 548 | return -ENODEV; |
| 538 | } | 549 | } |
| 539 | 550 | ||
| 551 | acpi_hotmem_initialized = 1; | ||
| 540 | return 0; | 552 | return 0; |
| 541 | } | 553 | } |
| 542 | 554 | ||
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index e67144cf3c8b..65b3f056ad89 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -962,7 +962,7 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr) | |||
| 962 | 962 | ||
| 963 | result = acpi_processor_get_power_info_cst(pr); | 963 | result = acpi_processor_get_power_info_cst(pr); |
| 964 | if (result == -ENODEV) | 964 | if (result == -ENODEV) |
| 965 | acpi_processor_get_power_info_fadt(pr); | 965 | result = acpi_processor_get_power_info_fadt(pr); |
| 966 | 966 | ||
| 967 | if (result) | 967 | if (result) |
| 968 | return result; | 968 | return result; |
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 3f4aa0c99ee4..03f6338acc8f 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -6,6 +6,7 @@ menu "Serial ATA (prod) and Parallel ATA (experimental) drivers" | |||
| 6 | 6 | ||
| 7 | config ATA | 7 | config ATA |
| 8 | tristate "ATA device support" | 8 | tristate "ATA device support" |
| 9 | depends on BLOCK | ||
| 9 | depends on !(M32R || M68K) || BROKEN | 10 | depends on !(M32R || M68K) || BROKEN |
| 10 | depends on !SUN4 || BROKEN | 11 | depends on !SUN4 || BROKEN |
| 11 | select SCSI | 12 | select SCSI |
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 25929123ffff..cef2e70d64f8 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -1041,7 +1041,7 @@ static void ahci_host_intr(struct ata_port *ap) | |||
| 1041 | /* hmmm... a spurious interupt */ | 1041 | /* hmmm... a spurious interupt */ |
| 1042 | 1042 | ||
| 1043 | /* some devices send D2H reg with I bit set during NCQ command phase */ | 1043 | /* some devices send D2H reg with I bit set during NCQ command phase */ |
| 1044 | if (ap->sactive && status & PORT_IRQ_D2H_REG_FIS) | 1044 | if (ap->sactive && (status & PORT_IRQ_D2H_REG_FIS)) |
| 1045 | return; | 1045 | return; |
| 1046 | 1046 | ||
| 1047 | /* ignore interim PIO setup fis interrupts */ | 1047 | /* ignore interim PIO setup fis interrupts */ |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 5719704eb0ee..5250187ffce2 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -432,9 +432,9 @@ static const struct piix_map_db ich8_map_db = { | |||
| 432 | .present_shift = 8, | 432 | .present_shift = 8, |
| 433 | .map = { | 433 | .map = { |
| 434 | /* PM PS SM SS MAP */ | 434 | /* PM PS SM SS MAP */ |
| 435 | { P0, NA, P1, NA }, /* 00b (hardwired) */ | 435 | { P0, P2, P1, P3 }, /* 00b (hardwired when in AHCI) */ |
| 436 | { RV, RV, RV, RV }, | 436 | { RV, RV, RV, RV }, |
| 437 | { RV, RV, RV, RV }, /* 10b (never) */ | 437 | { IDE, IDE, NA, NA }, /* 10b (IDE mode) */ |
| 438 | { RV, RV, RV, RV }, | 438 | { RV, RV, RV, RV }, |
| 439 | }, | 439 | }, |
| 440 | }; | 440 | }; |
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 06daaa3736a2..7645f2b30ccf 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
| @@ -981,6 +981,15 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, | |||
| 981 | mask = (1 << 2) | (1 << 0); | 981 | mask = (1 << 2) | (1 << 0); |
| 982 | if ((tmp8 & mask) != mask) | 982 | if ((tmp8 & mask) != mask) |
| 983 | legacy_mode = (1 << 3); | 983 | legacy_mode = (1 << 3); |
| 984 | #if defined(CONFIG_NO_ATA_LEGACY) | ||
| 985 | /* Some platforms with PCI limits cannot address compat | ||
| 986 | port space. In that case we punt if their firmware has | ||
| 987 | left a device in compatibility mode */ | ||
| 988 | if (legacy_mode) { | ||
| 989 | printk(KERN_ERR "ata: Compatibility mode ATA is not supported on this platform, skipping.\n"); | ||
| 990 | return -EOPNOTSUPP; | ||
| 991 | } | ||
| 992 | #endif | ||
| 984 | } | 993 | } |
| 985 | 994 | ||
| 986 | rc = pci_request_regions(pdev, DRV_NAME); | 995 | rc = pci_request_regions(pdev, DRV_NAME); |
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index dcccaf2782f3..bc6602606fb5 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -1923,7 +1923,6 @@ static void cciss_geometry_inquiry(int ctlr, int logvol, | |||
| 1923 | { | 1923 | { |
| 1924 | int return_code; | 1924 | int return_code; |
| 1925 | unsigned long t; | 1925 | unsigned long t; |
| 1926 | unsigned long rem; | ||
| 1927 | 1926 | ||
| 1928 | memset(inq_buff, 0, sizeof(InquiryData_struct)); | 1927 | memset(inq_buff, 0, sizeof(InquiryData_struct)); |
| 1929 | if (withirq) | 1928 | if (withirq) |
| @@ -1939,26 +1938,23 @@ static void cciss_geometry_inquiry(int ctlr, int logvol, | |||
| 1939 | printk(KERN_WARNING | 1938 | printk(KERN_WARNING |
| 1940 | "cciss: reading geometry failed, volume " | 1939 | "cciss: reading geometry failed, volume " |
| 1941 | "does not support reading geometry\n"); | 1940 | "does not support reading geometry\n"); |
| 1942 | drv->block_size = block_size; | ||
| 1943 | drv->nr_blocks = total_size; | ||
| 1944 | drv->heads = 255; | 1941 | drv->heads = 255; |
| 1945 | drv->sectors = 32; // Sectors per track | 1942 | drv->sectors = 32; // Sectors per track |
| 1946 | t = drv->heads * drv->sectors; | ||
| 1947 | drv->cylinders = total_size; | ||
| 1948 | rem = do_div(drv->cylinders, t); | ||
| 1949 | } else { | 1943 | } else { |
| 1950 | drv->block_size = block_size; | ||
| 1951 | drv->nr_blocks = total_size; | ||
| 1952 | drv->heads = inq_buff->data_byte[6]; | 1944 | drv->heads = inq_buff->data_byte[6]; |
| 1953 | drv->sectors = inq_buff->data_byte[7]; | 1945 | drv->sectors = inq_buff->data_byte[7]; |
| 1954 | drv->cylinders = (inq_buff->data_byte[4] & 0xff) << 8; | 1946 | drv->cylinders = (inq_buff->data_byte[4] & 0xff) << 8; |
| 1955 | drv->cylinders += inq_buff->data_byte[5]; | 1947 | drv->cylinders += inq_buff->data_byte[5]; |
| 1956 | drv->raid_level = inq_buff->data_byte[8]; | 1948 | drv->raid_level = inq_buff->data_byte[8]; |
| 1957 | t = drv->heads * drv->sectors; | 1949 | } |
| 1958 | if (t > 1) { | 1950 | drv->block_size = block_size; |
| 1959 | drv->cylinders = total_size; | 1951 | drv->nr_blocks = total_size; |
| 1960 | rem = do_div(drv->cylinders, t); | 1952 | t = drv->heads * drv->sectors; |
| 1961 | } | 1953 | if (t > 1) { |
| 1954 | unsigned rem = sector_div(total_size, t); | ||
| 1955 | if (rem) | ||
| 1956 | total_size++; | ||
| 1957 | drv->cylinders = total_size; | ||
| 1962 | } | 1958 | } |
| 1963 | } else { /* Get geometry failed */ | 1959 | } else { /* Get geometry failed */ |
| 1964 | printk(KERN_WARNING "cciss: reading geometry failed\n"); | 1960 | printk(KERN_WARNING "cciss: reading geometry failed\n"); |
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index e7c800f4c3ad..07eafbc5dc3a 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
| @@ -711,6 +711,7 @@ static void dtl1_release(struct pcmcia_device *link) | |||
| 711 | 711 | ||
| 712 | static struct pcmcia_device_id dtl1_ids[] = { | 712 | static struct pcmcia_device_id dtl1_ids[] = { |
| 713 | PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d), | 713 | PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d), |
| 714 | PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-4", 0xe1bfdd64, 0x9102bc82), | ||
| 714 | PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863), | 715 | PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863), |
| 715 | PCMCIA_DEVICE_PROD_ID12("Socket", "CF+ Personal Network Card", 0xb38bcc2e, 0xe732bae3), | 716 | PCMCIA_DEVICE_PROD_ID12("Socket", "CF+ Personal Network Card", 0xb38bcc2e, 0xe732bae3), |
| 716 | PCMCIA_DEVICE_NULL | 717 | PCMCIA_DEVICE_NULL |
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index 7565642a007a..fdea58ae16b2 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c | |||
| @@ -118,6 +118,9 @@ static struct usb_device_id blacklist_ids[] = { | |||
| 118 | /* IBM/Lenovo ThinkPad with Broadcom chip */ | 118 | /* IBM/Lenovo ThinkPad with Broadcom chip */ |
| 119 | { USB_DEVICE(0x0a5c, 0x201e), .driver_info = HCI_WRONG_SCO_MTU }, | 119 | { USB_DEVICE(0x0a5c, 0x201e), .driver_info = HCI_WRONG_SCO_MTU }, |
| 120 | 120 | ||
| 121 | /* ANYCOM Bluetooth USB-200 and USB-250 */ | ||
| 122 | { USB_DEVICE(0x0a5c, 0x2111), .driver_info = HCI_RESET }, | ||
| 123 | |||
| 121 | /* Microsoft Wireless Transceiver for Bluetooth 2.0 */ | 124 | /* Microsoft Wireless Transceiver for Bluetooth 2.0 */ |
| 122 | { USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET }, | 125 | { USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET }, |
| 123 | 126 | ||
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index 91b71e750ee1..dffc19382f7e 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
| @@ -27,32 +27,42 @@ | |||
| 27 | static int uninorth_rev; | 27 | static int uninorth_rev; |
| 28 | static int is_u3; | 28 | static int is_u3; |
| 29 | 29 | ||
| 30 | static char __devinitdata *aperture = NULL; | ||
| 30 | 31 | ||
| 31 | static int uninorth_fetch_size(void) | 32 | static int uninorth_fetch_size(void) |
| 32 | { | 33 | { |
| 33 | int i; | 34 | int i, size = 0; |
| 34 | u32 temp; | 35 | struct aper_size_info_32 *values = |
| 35 | struct aper_size_info_32 *values; | 36 | A_SIZE_32(agp_bridge->driver->aperture_sizes); |
| 36 | 37 | ||
| 37 | pci_read_config_dword(agp_bridge->dev, UNI_N_CFG_GART_BASE, &temp); | 38 | if (aperture) { |
| 38 | temp &= ~(0xfffff000); | 39 | char *save = aperture; |
| 39 | values = A_SIZE_32(agp_bridge->driver->aperture_sizes); | 40 | |
| 40 | 41 | size = memparse(aperture, &aperture) >> 20; | |
| 41 | for (i = 0; i < agp_bridge->driver->num_aperture_sizes; i++) { | 42 | aperture = save; |
| 42 | if (temp == values[i].size_value) { | 43 | |
| 43 | agp_bridge->previous_size = | 44 | for (i = 0; i < agp_bridge->driver->num_aperture_sizes; i++) |
| 44 | agp_bridge->current_size = (void *) (values + i); | 45 | if (size == values[i].size) |
| 45 | agp_bridge->aperture_size_idx = i; | 46 | break; |
| 46 | return values[i].size; | 47 | |
| 48 | if (i == agp_bridge->driver->num_aperture_sizes) { | ||
| 49 | printk(KERN_ERR PFX "Invalid aperture size, using" | ||
| 50 | " default\n"); | ||
| 51 | size = 0; | ||
| 52 | aperture = NULL; | ||
| 47 | } | 53 | } |
| 48 | } | 54 | } |
| 49 | 55 | ||
| 50 | agp_bridge->previous_size = | 56 | if (!size) { |
| 51 | agp_bridge->current_size = (void *) (values + 1); | 57 | for (i = 0; i < agp_bridge->driver->num_aperture_sizes; i++) |
| 52 | agp_bridge->aperture_size_idx = 1; | 58 | if (values[i].size == 32) |
| 53 | return values[1].size; | 59 | break; |
| 60 | } | ||
| 54 | 61 | ||
| 55 | return 0; | 62 | agp_bridge->previous_size = |
| 63 | agp_bridge->current_size = (void *)(values + i); | ||
| 64 | agp_bridge->aperture_size_idx = i; | ||
| 65 | return values[i].size; | ||
| 56 | } | 66 | } |
| 57 | 67 | ||
| 58 | static void uninorth_tlbflush(struct agp_memory *mem) | 68 | static void uninorth_tlbflush(struct agp_memory *mem) |
| @@ -683,5 +693,11 @@ static void __exit agp_uninorth_cleanup(void) | |||
| 683 | module_init(agp_uninorth_init); | 693 | module_init(agp_uninorth_init); |
| 684 | module_exit(agp_uninorth_cleanup); | 694 | module_exit(agp_uninorth_cleanup); |
| 685 | 695 | ||
| 696 | module_param(aperture, charp, 0); | ||
| 697 | MODULE_PARM_DESC(aperture, | ||
| 698 | "Aperture size, must be power of two between 4MB and an\n" | ||
| 699 | "\t\tupper limit specific to the UniNorth revision.\n" | ||
| 700 | "\t\tDefault: 32M"); | ||
| 701 | |||
| 686 | MODULE_AUTHOR("Ben Herrenschmidt & Paul Mackerras"); | 702 | MODULE_AUTHOR("Ben Herrenschmidt & Paul Mackerras"); |
| 687 | MODULE_LICENSE("GPL"); | 703 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 24825bdca8f4..e5cfb1fa47d1 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
| @@ -1789,7 +1789,7 @@ static int __devinit ipmi_pci_probe(struct pci_dev *pdev, | |||
| 1789 | 1789 | ||
| 1790 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 1790 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
| 1791 | if (!info) | 1791 | if (!info) |
| 1792 | return ENOMEM; | 1792 | return -ENOMEM; |
| 1793 | 1793 | ||
| 1794 | info->addr_source = "PCI"; | 1794 | info->addr_source = "PCI"; |
| 1795 | 1795 | ||
| @@ -1810,7 +1810,7 @@ static int __devinit ipmi_pci_probe(struct pci_dev *pdev, | |||
| 1810 | kfree(info); | 1810 | kfree(info); |
| 1811 | printk(KERN_INFO "ipmi_si: %s: Unknown IPMI type: %d\n", | 1811 | printk(KERN_INFO "ipmi_si: %s: Unknown IPMI type: %d\n", |
| 1812 | pci_name(pdev), class_type); | 1812 | pci_name(pdev), class_type); |
| 1813 | return ENOMEM; | 1813 | return -ENOMEM; |
| 1814 | } | 1814 | } |
| 1815 | 1815 | ||
| 1816 | rv = pci_enable_device(pdev); | 1816 | rv = pci_enable_device(pdev); |
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index b401383808c2..96cb1f07332b 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c | |||
| @@ -130,6 +130,7 @@ static moxa_isa_board_conf moxa_isa_boards[] = | |||
| 130 | typedef struct _moxa_pci_devinfo { | 130 | typedef struct _moxa_pci_devinfo { |
| 131 | ushort busNum; | 131 | ushort busNum; |
| 132 | ushort devNum; | 132 | ushort devNum; |
| 133 | struct pci_dev *pdev; | ||
| 133 | } moxa_pci_devinfo; | 134 | } moxa_pci_devinfo; |
| 134 | 135 | ||
| 135 | typedef struct _moxa_board_conf { | 136 | typedef struct _moxa_board_conf { |
| @@ -324,6 +325,9 @@ static int moxa_get_PCI_conf(struct pci_dev *p, int board_type, moxa_board_conf | |||
| 324 | board->busType = MOXA_BUS_TYPE_PCI; | 325 | board->busType = MOXA_BUS_TYPE_PCI; |
| 325 | board->pciInfo.busNum = p->bus->number; | 326 | board->pciInfo.busNum = p->bus->number; |
| 326 | board->pciInfo.devNum = p->devfn >> 3; | 327 | board->pciInfo.devNum = p->devfn >> 3; |
| 328 | board->pciInfo.pdev = p; | ||
| 329 | /* don't lose the reference in the next pci_get_device iteration */ | ||
| 330 | pci_dev_get(p); | ||
| 327 | 331 | ||
| 328 | return (0); | 332 | return (0); |
| 329 | } | 333 | } |
| @@ -493,6 +497,11 @@ static void __exit moxa_exit(void) | |||
| 493 | if (tty_unregister_driver(moxaDriver)) | 497 | if (tty_unregister_driver(moxaDriver)) |
| 494 | printk("Couldn't unregister MOXA Intellio family serial driver\n"); | 498 | printk("Couldn't unregister MOXA Intellio family serial driver\n"); |
| 495 | put_tty_driver(moxaDriver); | 499 | put_tty_driver(moxaDriver); |
| 500 | |||
| 501 | for (i = 0; i < MAX_BOARDS; i++) | ||
| 502 | if (moxa_boards[i].busType == MOXA_BUS_TYPE_PCI) | ||
| 503 | pci_dev_put(moxa_boards[i].pciInfo.pdev); | ||
| 504 | |||
| 496 | if (verbose) | 505 | if (verbose) |
| 497 | printk("Done\n"); | 506 | printk("Done\n"); |
| 498 | } | 507 | } |
diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h index ee2ddea7a63a..23d0681fe491 100644 --- a/drivers/char/rio/host.h +++ b/drivers/char/rio/host.h | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | ** the host. | 44 | ** the host. |
| 45 | */ | 45 | */ |
| 46 | struct Host { | 46 | struct Host { |
| 47 | struct pci_dev *pdev; | ||
| 47 | unsigned char Type; /* RIO_EISA, RIO_MCA, ... */ | 48 | unsigned char Type; /* RIO_EISA, RIO_MCA, ... */ |
| 48 | unsigned char Ivec; /* POLLED or ivec number */ | 49 | unsigned char Ivec; /* POLLED or ivec number */ |
| 49 | unsigned char Mode; /* Control stuff */ | 50 | unsigned char Mode; /* Control stuff */ |
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c index c382df0f82f6..7ac68cb3bedd 100644 --- a/drivers/char/rio/rio_linux.c +++ b/drivers/char/rio/rio_linux.c | |||
| @@ -1017,6 +1017,10 @@ static int __init rio_init(void) | |||
| 1017 | rio_dprintk(RIO_DEBUG_PROBE, "Hmm Tested ok, uniqid = %x.\n", p->RIOHosts[p->RIONumHosts].UniqueNum); | 1017 | rio_dprintk(RIO_DEBUG_PROBE, "Hmm Tested ok, uniqid = %x.\n", p->RIOHosts[p->RIONumHosts].UniqueNum); |
| 1018 | 1018 | ||
| 1019 | fix_rio_pci(pdev); | 1019 | fix_rio_pci(pdev); |
| 1020 | |||
| 1021 | p->RIOHosts[p->RIONumHosts].pdev = pdev; | ||
| 1022 | pci_dev_get(pdev); | ||
| 1023 | |||
| 1020 | p->RIOLastPCISearch = 0; | 1024 | p->RIOLastPCISearch = 0; |
| 1021 | p->RIONumHosts++; | 1025 | p->RIONumHosts++; |
| 1022 | found++; | 1026 | found++; |
| @@ -1066,6 +1070,9 @@ static int __init rio_init(void) | |||
| 1066 | ((readb(&p->RIOHosts[p->RIONumHosts].Unique[1]) & 0xFF) << 8) | ((readb(&p->RIOHosts[p->RIONumHosts].Unique[2]) & 0xFF) << 16) | ((readb(&p->RIOHosts[p->RIONumHosts].Unique[3]) & 0xFF) << 24); | 1070 | ((readb(&p->RIOHosts[p->RIONumHosts].Unique[1]) & 0xFF) << 8) | ((readb(&p->RIOHosts[p->RIONumHosts].Unique[2]) & 0xFF) << 16) | ((readb(&p->RIOHosts[p->RIONumHosts].Unique[3]) & 0xFF) << 24); |
| 1067 | rio_dprintk(RIO_DEBUG_PROBE, "Hmm Tested ok, uniqid = %x.\n", p->RIOHosts[p->RIONumHosts].UniqueNum); | 1071 | rio_dprintk(RIO_DEBUG_PROBE, "Hmm Tested ok, uniqid = %x.\n", p->RIOHosts[p->RIONumHosts].UniqueNum); |
| 1068 | 1072 | ||
| 1073 | p->RIOHosts[p->RIONumHosts].pdev = pdev; | ||
| 1074 | pci_dev_get(pdev); | ||
| 1075 | |||
| 1069 | p->RIOLastPCISearch = 0; | 1076 | p->RIOLastPCISearch = 0; |
| 1070 | p->RIONumHosts++; | 1077 | p->RIONumHosts++; |
| 1071 | found++; | 1078 | found++; |
| @@ -1181,6 +1188,8 @@ static void __exit rio_exit(void) | |||
| 1181 | } | 1188 | } |
| 1182 | /* It is safe/allowed to del_timer a non-active timer */ | 1189 | /* It is safe/allowed to del_timer a non-active timer */ |
| 1183 | del_timer(&hp->timer); | 1190 | del_timer(&hp->timer); |
| 1191 | if (hp->Type == RIO_PCI) | ||
| 1192 | pci_dev_put(hp->pdev); | ||
| 1184 | } | 1193 | } |
| 1185 | 1194 | ||
| 1186 | if (misc_deregister(&rio_fw_device) < 0) { | 1195 | if (misc_deregister(&rio_fw_device) < 0) { |
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 7ad3be8c0f49..7fcb77a9d011 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c | |||
| @@ -54,8 +54,8 @@ static cycle_t acpi_pm_read_verified(void) | |||
| 54 | v1 = read_pmtmr(); | 54 | v1 = read_pmtmr(); |
| 55 | v2 = read_pmtmr(); | 55 | v2 = read_pmtmr(); |
| 56 | v3 = read_pmtmr(); | 56 | v3 = read_pmtmr(); |
| 57 | } while ((v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1) | 57 | } while (unlikely((v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1) |
| 58 | || (v3 > v1 && v3 < v2)); | 58 | || (v3 > v1 && v3 < v2))); |
| 59 | 59 | ||
| 60 | return (cycle_t)v2; | 60 | return (cycle_t)v2; |
| 61 | } | 61 | } |
| @@ -138,6 +138,8 @@ static void __devinit acpi_pm_check_graylist(struct pci_dev *dev) | |||
| 138 | } | 138 | } |
| 139 | DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, | 139 | DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0, |
| 140 | acpi_pm_check_graylist); | 140 | acpi_pm_check_graylist); |
| 141 | DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE, | ||
| 142 | acpi_pm_check_graylist); | ||
| 141 | #endif | 143 | #endif |
| 142 | 144 | ||
| 143 | 145 | ||
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c index 8bcb58cd4ac0..1865b56fb141 100644 --- a/drivers/firmware/dcdbas.c +++ b/drivers/firmware/dcdbas.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * | 8 | * |
| 9 | * See Documentation/dcdbas.txt for more information. | 9 | * See Documentation/dcdbas.txt for more information. |
| 10 | * | 10 | * |
| 11 | * Copyright (C) 1995-2005 Dell Inc. | 11 | * Copyright (C) 1995-2006 Dell Inc. |
| 12 | * | 12 | * |
| 13 | * This program is free software; you can redistribute it and/or modify | 13 | * This program is free software; you can redistribute it and/or modify |
| 14 | * it under the terms of the GNU General Public License v2.0 as published by | 14 | * it under the terms of the GNU General Public License v2.0 as published by |
| @@ -40,7 +40,7 @@ | |||
| 40 | #include "dcdbas.h" | 40 | #include "dcdbas.h" |
| 41 | 41 | ||
| 42 | #define DRIVER_NAME "dcdbas" | 42 | #define DRIVER_NAME "dcdbas" |
| 43 | #define DRIVER_VERSION "5.6.0-2" | 43 | #define DRIVER_VERSION "5.6.0-3.2" |
| 44 | #define DRIVER_DESCRIPTION "Dell Systems Management Base Driver" | 44 | #define DRIVER_DESCRIPTION "Dell Systems Management Base Driver" |
| 45 | 45 | ||
| 46 | static struct platform_device *dcdbas_pdev; | 46 | static struct platform_device *dcdbas_pdev; |
| @@ -175,6 +175,9 @@ static ssize_t smi_data_write(struct kobject *kobj, char *buf, loff_t pos, | |||
| 175 | { | 175 | { |
| 176 | ssize_t ret; | 176 | ssize_t ret; |
| 177 | 177 | ||
| 178 | if ((pos + count) > MAX_SMI_DATA_BUF_SIZE) | ||
| 179 | return -EINVAL; | ||
| 180 | |||
| 178 | mutex_lock(&smi_data_lock); | 181 | mutex_lock(&smi_data_lock); |
| 179 | 182 | ||
| 180 | ret = smi_data_buf_realloc(pos + count); | 183 | ret = smi_data_buf_realloc(pos + count); |
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index b8b596d5778d..37deee6c0c1c 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
| @@ -326,6 +326,26 @@ char *dmi_get_system_info(int field) | |||
| 326 | } | 326 | } |
| 327 | EXPORT_SYMBOL(dmi_get_system_info); | 327 | EXPORT_SYMBOL(dmi_get_system_info); |
| 328 | 328 | ||
| 329 | |||
| 330 | /** | ||
| 331 | * dmi_name_in_vendors - Check if string is anywhere in the DMI vendor information. | ||
| 332 | * @str: Case sensitive Name | ||
| 333 | */ | ||
| 334 | int dmi_name_in_vendors(char *str) | ||
| 335 | { | ||
| 336 | static int fields[] = { DMI_BIOS_VENDOR, DMI_BIOS_VERSION, DMI_SYS_VENDOR, | ||
| 337 | DMI_PRODUCT_NAME, DMI_PRODUCT_VERSION, DMI_BOARD_VENDOR, | ||
| 338 | DMI_BOARD_NAME, DMI_BOARD_VERSION, DMI_NONE }; | ||
| 339 | int i; | ||
| 340 | for (i = 0; fields[i] != DMI_NONE; i++) { | ||
| 341 | int f = fields[i]; | ||
| 342 | if (dmi_ident[f] && strstr(dmi_ident[f], str)) | ||
| 343 | return 1; | ||
| 344 | } | ||
| 345 | return 0; | ||
| 346 | } | ||
| 347 | EXPORT_SYMBOL(dmi_name_in_vendors); | ||
| 348 | |||
| 329 | /** | 349 | /** |
| 330 | * dmi_find_device - find onboard device by type/name | 350 | * dmi_find_device - find onboard device by type/name |
| 331 | * @type: device type or %DMI_DEV_TYPE_ANY to match all device types | 351 | * @type: device type or %DMI_DEV_TYPE_ANY to match all device types |
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c index 5b77a5bcbf0c..ad418ce882ca 100644 --- a/drivers/ide/pci/generic.c +++ b/drivers/ide/pci/generic.c | |||
| @@ -40,6 +40,19 @@ | |||
| 40 | 40 | ||
| 41 | static int ide_generic_all; /* Set to claim all devices */ | 41 | static int ide_generic_all; /* Set to claim all devices */ |
| 42 | 42 | ||
| 43 | /* | ||
| 44 | * the module_param_named() was added for the modular case | ||
| 45 | * the __setup() is left as compatibility for existing setups | ||
| 46 | */ | ||
| 47 | #ifndef MODULE | ||
| 48 | static int __init ide_generic_all_on(char *unused) | ||
| 49 | { | ||
| 50 | ide_generic_all = 1; | ||
| 51 | printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers."); | ||
| 52 | return 1; | ||
| 53 | } | ||
| 54 | __setup("all-generic-ide", ide_generic_all_on); | ||
| 55 | #endif | ||
| 43 | module_param_named(all_generic_ide, ide_generic_all, bool, 0444); | 56 | module_param_named(all_generic_ide, ide_generic_all, bool, 0444); |
| 44 | MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers."); | 57 | MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers."); |
| 45 | 58 | ||
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c index 7e95f04f13da..3dacfff93f5f 100644 --- a/drivers/isdn/hisax/diva.c +++ b/drivers/isdn/hisax/diva.c | |||
| @@ -716,8 +716,10 @@ release_io_diva(struct IsdnCardState *cs) | |||
| 716 | 716 | ||
| 717 | *cfg = 0; /* disable INT0/1 */ | 717 | *cfg = 0; /* disable INT0/1 */ |
| 718 | *cfg = 2; /* reset pending INT0 */ | 718 | *cfg = 2; /* reset pending INT0 */ |
| 719 | iounmap((void *)cs->hw.diva.cfg_reg); | 719 | if (cs->hw.diva.cfg_reg) |
| 720 | iounmap((void *)cs->hw.diva.pci_cfg); | 720 | iounmap((void *)cs->hw.diva.cfg_reg); |
| 721 | if (cs->hw.diva.pci_cfg) | ||
| 722 | iounmap((void *)cs->hw.diva.pci_cfg); | ||
| 721 | return; | 723 | return; |
| 722 | } else if (cs->subtyp != DIVA_IPAC_ISA) { | 724 | } else if (cs->subtyp != DIVA_IPAC_ISA) { |
| 723 | del_timer(&cs->hw.diva.tl); | 725 | del_timer(&cs->hw.diva.tl); |
| @@ -734,6 +736,23 @@ release_io_diva(struct IsdnCardState *cs) | |||
| 734 | } | 736 | } |
| 735 | 737 | ||
| 736 | static void | 738 | static void |
| 739 | iounmap_diva(struct IsdnCardState *cs) | ||
| 740 | { | ||
| 741 | if ((cs->subtyp == DIVA_IPAC_PCI) || (cs->subtyp == DIVA_IPACX_PCI)) { | ||
| 742 | if (cs->hw.diva.cfg_reg) { | ||
| 743 | iounmap((void *)cs->hw.diva.cfg_reg); | ||
| 744 | cs->hw.diva.cfg_reg = 0; | ||
| 745 | } | ||
| 746 | if (cs->hw.diva.pci_cfg) { | ||
| 747 | iounmap((void *)cs->hw.diva.pci_cfg); | ||
| 748 | cs->hw.diva.pci_cfg = 0; | ||
| 749 | } | ||
| 750 | } | ||
| 751 | |||
| 752 | return; | ||
| 753 | } | ||
| 754 | |||
| 755 | static void | ||
| 737 | reset_diva(struct IsdnCardState *cs) | 756 | reset_diva(struct IsdnCardState *cs) |
| 738 | { | 757 | { |
| 739 | if (cs->subtyp == DIVA_IPAC_ISA) { | 758 | if (cs->subtyp == DIVA_IPAC_ISA) { |
| @@ -1069,11 +1088,13 @@ setup_diva(struct IsdnCard *card) | |||
| 1069 | 1088 | ||
| 1070 | if (!cs->irq) { | 1089 | if (!cs->irq) { |
| 1071 | printk(KERN_WARNING "Diva: No IRQ for PCI card found\n"); | 1090 | printk(KERN_WARNING "Diva: No IRQ for PCI card found\n"); |
| 1091 | iounmap_diva(cs); | ||
| 1072 | return(0); | 1092 | return(0); |
| 1073 | } | 1093 | } |
| 1074 | 1094 | ||
| 1075 | if (!cs->hw.diva.cfg_reg) { | 1095 | if (!cs->hw.diva.cfg_reg) { |
| 1076 | printk(KERN_WARNING "Diva: No IO-Adr for PCI card found\n"); | 1096 | printk(KERN_WARNING "Diva: No IO-Adr for PCI card found\n"); |
| 1097 | iounmap_diva(cs); | ||
| 1077 | return(0); | 1098 | return(0); |
| 1078 | } | 1099 | } |
| 1079 | cs->irq_flags |= IRQF_SHARED; | 1100 | cs->irq_flags |= IRQF_SHARED; |
| @@ -1123,6 +1144,7 @@ ready: | |||
| 1123 | CardType[card->typ], | 1144 | CardType[card->typ], |
| 1124 | cs->hw.diva.cfg_reg, | 1145 | cs->hw.diva.cfg_reg, |
| 1125 | cs->hw.diva.cfg_reg + bytecnt); | 1146 | cs->hw.diva.cfg_reg + bytecnt); |
| 1147 | iounmap_diva(cs); | ||
| 1126 | return (0); | 1148 | return (0); |
| 1127 | } | 1149 | } |
| 1128 | } | 1150 | } |
diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c index 8bbe33ae06db..82e42a80dc4b 100644 --- a/drivers/isdn/hysdn/boardergo.c +++ b/drivers/isdn/hysdn/boardergo.c | |||
| @@ -403,7 +403,7 @@ ergo_releasehardware(hysdn_card * card) | |||
| 403 | free_irq(card->irq, card); /* release interrupt */ | 403 | free_irq(card->irq, card); /* release interrupt */ |
| 404 | release_region(card->iobase + PCI9050_INTR_REG, 1); /* release all io ports */ | 404 | release_region(card->iobase + PCI9050_INTR_REG, 1); /* release all io ports */ |
| 405 | release_region(card->iobase + PCI9050_USER_IO, 1); | 405 | release_region(card->iobase + PCI9050_USER_IO, 1); |
| 406 | vfree(card->dpram); | 406 | iounmap(card->dpram); |
| 407 | card->dpram = NULL; /* release shared mem */ | 407 | card->dpram = NULL; /* release shared mem */ |
| 408 | } /* ergo_releasehardware */ | 408 | } /* ergo_releasehardware */ |
| 409 | 409 | ||
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index d47d38ac71b1..d6f614738bbd 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
| @@ -536,7 +536,7 @@ static int bitmap_read_sb(struct bitmap *bitmap) | |||
| 536 | printk(KERN_INFO "%s: bitmap file is out of date (%llu < %llu) " | 536 | printk(KERN_INFO "%s: bitmap file is out of date (%llu < %llu) " |
| 537 | "-- forcing full recovery\n", bmname(bitmap), events, | 537 | "-- forcing full recovery\n", bmname(bitmap), events, |
| 538 | (unsigned long long) bitmap->mddev->events); | 538 | (unsigned long long) bitmap->mddev->events); |
| 539 | sb->state |= BITMAP_STALE; | 539 | sb->state |= cpu_to_le32(BITMAP_STALE); |
| 540 | } | 540 | } |
| 541 | success: | 541 | success: |
| 542 | /* assign fields using values from superblock */ | 542 | /* assign fields using values from superblock */ |
| @@ -544,11 +544,11 @@ success: | |||
| 544 | bitmap->daemon_sleep = daemon_sleep; | 544 | bitmap->daemon_sleep = daemon_sleep; |
| 545 | bitmap->daemon_lastrun = jiffies; | 545 | bitmap->daemon_lastrun = jiffies; |
| 546 | bitmap->max_write_behind = write_behind; | 546 | bitmap->max_write_behind = write_behind; |
| 547 | bitmap->flags |= sb->state; | 547 | bitmap->flags |= le32_to_cpu(sb->state); |
| 548 | if (le32_to_cpu(sb->version) == BITMAP_MAJOR_HOSTENDIAN) | 548 | if (le32_to_cpu(sb->version) == BITMAP_MAJOR_HOSTENDIAN) |
| 549 | bitmap->flags |= BITMAP_HOSTENDIAN; | 549 | bitmap->flags |= BITMAP_HOSTENDIAN; |
| 550 | bitmap->events_cleared = le64_to_cpu(sb->events_cleared); | 550 | bitmap->events_cleared = le64_to_cpu(sb->events_cleared); |
| 551 | if (sb->state & BITMAP_STALE) | 551 | if (sb->state & cpu_to_le32(BITMAP_STALE)) |
| 552 | bitmap->events_cleared = bitmap->mddev->events; | 552 | bitmap->events_cleared = bitmap->mddev->events; |
| 553 | err = 0; | 553 | err = 0; |
| 554 | out: | 554 | out: |
| @@ -578,9 +578,9 @@ static void bitmap_mask_state(struct bitmap *bitmap, enum bitmap_state bits, | |||
| 578 | spin_unlock_irqrestore(&bitmap->lock, flags); | 578 | spin_unlock_irqrestore(&bitmap->lock, flags); |
| 579 | sb = (bitmap_super_t *)kmap_atomic(bitmap->sb_page, KM_USER0); | 579 | sb = (bitmap_super_t *)kmap_atomic(bitmap->sb_page, KM_USER0); |
| 580 | switch (op) { | 580 | switch (op) { |
| 581 | case MASK_SET: sb->state |= bits; | 581 | case MASK_SET: sb->state |= cpu_to_le32(bits); |
| 582 | break; | 582 | break; |
| 583 | case MASK_UNSET: sb->state &= ~bits; | 583 | case MASK_UNSET: sb->state &= cpu_to_le32(~bits); |
| 584 | break; | 584 | break; |
| 585 | default: BUG(); | 585 | default: BUG(); |
| 586 | } | 586 | } |
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 655d816760e5..a625576fdeeb 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 17 | #include <linux/crypto.h> | 17 | #include <linux/crypto.h> |
| 18 | #include <linux/workqueue.h> | 18 | #include <linux/workqueue.h> |
| 19 | #include <linux/backing-dev.h> | ||
| 19 | #include <asm/atomic.h> | 20 | #include <asm/atomic.h> |
| 20 | #include <linux/scatterlist.h> | 21 | #include <linux/scatterlist.h> |
| 21 | #include <asm/page.h> | 22 | #include <asm/page.h> |
| @@ -602,7 +603,7 @@ static void process_write(struct crypt_io *io) | |||
| 602 | 603 | ||
| 603 | /* out of memory -> run queues */ | 604 | /* out of memory -> run queues */ |
| 604 | if (remaining) | 605 | if (remaining) |
| 605 | blk_congestion_wait(bio_data_dir(clone), HZ/100); | 606 | congestion_wait(bio_data_dir(clone), HZ/100); |
| 606 | } | 607 | } |
| 607 | } | 608 | } |
| 608 | 609 | ||
diff --git a/drivers/md/md.c b/drivers/md/md.c index f7f19088f3be..7daa7b1e145f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -974,12 +974,13 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev) | |||
| 974 | * version 1 superblock | 974 | * version 1 superblock |
| 975 | */ | 975 | */ |
| 976 | 976 | ||
| 977 | static unsigned int calc_sb_1_csum(struct mdp_superblock_1 * sb) | 977 | static __le32 calc_sb_1_csum(struct mdp_superblock_1 * sb) |
| 978 | { | 978 | { |
| 979 | unsigned int disk_csum, csum; | 979 | __le32 disk_csum; |
| 980 | u32 csum; | ||
| 980 | unsigned long long newcsum; | 981 | unsigned long long newcsum; |
| 981 | int size = 256 + le32_to_cpu(sb->max_dev)*2; | 982 | int size = 256 + le32_to_cpu(sb->max_dev)*2; |
| 982 | unsigned int *isuper = (unsigned int*)sb; | 983 | __le32 *isuper = (__le32*)sb; |
| 983 | int i; | 984 | int i; |
| 984 | 985 | ||
| 985 | disk_csum = sb->sb_csum; | 986 | disk_csum = sb->sb_csum; |
| @@ -989,7 +990,7 @@ static unsigned int calc_sb_1_csum(struct mdp_superblock_1 * sb) | |||
| 989 | newcsum += le32_to_cpu(*isuper++); | 990 | newcsum += le32_to_cpu(*isuper++); |
| 990 | 991 | ||
| 991 | if (size == 2) | 992 | if (size == 2) |
| 992 | newcsum += le16_to_cpu(*(unsigned short*) isuper); | 993 | newcsum += le16_to_cpu(*(__le16*) isuper); |
| 993 | 994 | ||
| 994 | csum = (newcsum & 0xffffffff) + (newcsum >> 32); | 995 | csum = (newcsum & 0xffffffff) + (newcsum >> 32); |
| 995 | sb->sb_csum = disk_csum; | 996 | sb->sb_csum = disk_csum; |
| @@ -1106,7 +1107,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) | |||
| 1106 | if (le32_to_cpu(sb->chunksize)) | 1107 | if (le32_to_cpu(sb->chunksize)) |
| 1107 | rdev->size &= ~((sector_t)le32_to_cpu(sb->chunksize)/2 - 1); | 1108 | rdev->size &= ~((sector_t)le32_to_cpu(sb->chunksize)/2 - 1); |
| 1108 | 1109 | ||
| 1109 | if (le32_to_cpu(sb->size) > rdev->size*2) | 1110 | if (le64_to_cpu(sb->size) > rdev->size*2) |
| 1110 | return -EINVAL; | 1111 | return -EINVAL; |
| 1111 | return ret; | 1112 | return ret; |
| 1112 | } | 1113 | } |
| @@ -1228,7 +1229,7 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev) | |||
| 1228 | else | 1229 | else |
| 1229 | sb->resync_offset = cpu_to_le64(0); | 1230 | sb->resync_offset = cpu_to_le64(0); |
| 1230 | 1231 | ||
| 1231 | sb->cnt_corrected_read = atomic_read(&rdev->corrected_errors); | 1232 | sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors)); |
| 1232 | 1233 | ||
| 1233 | sb->raid_disks = cpu_to_le32(mddev->raid_disks); | 1234 | sb->raid_disks = cpu_to_le32(mddev->raid_disks); |
| 1234 | sb->size = cpu_to_le64(mddev->size<<1); | 1235 | sb->size = cpu_to_le64(mddev->size<<1); |
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 171ff41b52b0..a6260f0e3b9e 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c | |||
| @@ -501,7 +501,7 @@ static int multipath_run (mddev_t *mddev) | |||
| 501 | mdname(mddev)); | 501 | mdname(mddev)); |
| 502 | goto out_free_conf; | 502 | goto out_free_conf; |
| 503 | } | 503 | } |
| 504 | mddev->degraded = conf->raid_disks = conf->working_disks; | 504 | mddev->degraded = conf->raid_disks - conf->working_disks; |
| 505 | 505 | ||
| 506 | conf->pool = mempool_create_kzalloc_pool(NR_RESERVED_BUFS, | 506 | conf->pool = mempool_create_kzalloc_pool(NR_RESERVED_BUFS, |
| 507 | sizeof(struct multipath_bh)); | 507 | sizeof(struct multipath_bh)); |
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 1250f0eab4af..74f17a9a6ebb 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -2079,7 +2079,7 @@ static int run(mddev_t *mddev) | |||
| 2079 | disk = conf->mirrors + i; | 2079 | disk = conf->mirrors + i; |
| 2080 | 2080 | ||
| 2081 | if (!disk->rdev || | 2081 | if (!disk->rdev || |
| 2082 | !test_bit(In_sync, &rdev->flags)) { | 2082 | !test_bit(In_sync, &disk->rdev->flags)) { |
| 2083 | disk->head_position = 0; | 2083 | disk->head_position = 0; |
| 2084 | mddev->degraded++; | 2084 | mddev->degraded++; |
| 2085 | } | 2085 | } |
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c index 91f95d172ca5..01a5a702b037 100644 --- a/drivers/message/i2o/exec-osm.c +++ b/drivers/message/i2o/exec-osm.c | |||
| @@ -127,7 +127,7 @@ int i2o_msg_post_wait_mem(struct i2o_controller *c, struct i2o_message *msg, | |||
| 127 | DECLARE_WAIT_QUEUE_HEAD(wq); | 127 | DECLARE_WAIT_QUEUE_HEAD(wq); |
| 128 | struct i2o_exec_wait *wait; | 128 | struct i2o_exec_wait *wait; |
| 129 | static u32 tcntxt = 0x80000000; | 129 | static u32 tcntxt = 0x80000000; |
| 130 | long flags; | 130 | unsigned long flags; |
| 131 | int rc = 0; | 131 | int rc = 0; |
| 132 | 132 | ||
| 133 | wait = i2o_exec_wait_alloc(); | 133 | wait = i2o_exec_wait_alloc(); |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ab92cc794c64..e2ed24918a58 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2288,7 +2288,7 @@ config UGETH_TX_ON_DEMOND | |||
| 2288 | 2288 | ||
| 2289 | config UGETH_HAS_GIGA | 2289 | config UGETH_HAS_GIGA |
| 2290 | bool | 2290 | bool |
| 2291 | depends on UCC_GETH && MPC836x | 2291 | depends on UCC_GETH && PPC_MPC836x |
| 2292 | 2292 | ||
| 2293 | config MV643XX_ETH | 2293 | config MV643XX_ETH |
| 2294 | tristate "MV-643XX Ethernet support" | 2294 | tristate "MV-643XX Ethernet support" |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 27d5d2f02533..a3a08a5dd185 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -2039,7 +2039,6 @@ static int e100_change_mtu(struct net_device *netdev, int new_mtu) | |||
| 2039 | return 0; | 2039 | return 0; |
| 2040 | } | 2040 | } |
| 2041 | 2041 | ||
| 2042 | #ifdef CONFIG_PM | ||
| 2043 | static int e100_asf(struct nic *nic) | 2042 | static int e100_asf(struct nic *nic) |
| 2044 | { | 2043 | { |
| 2045 | /* ASF can be enabled from eeprom */ | 2044 | /* ASF can be enabled from eeprom */ |
| @@ -2048,7 +2047,6 @@ static int e100_asf(struct nic *nic) | |||
| 2048 | !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) && | 2047 | !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) && |
| 2049 | ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE)); | 2048 | ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE)); |
| 2050 | } | 2049 | } |
| 2051 | #endif | ||
| 2052 | 2050 | ||
| 2053 | static int e100_up(struct nic *nic) | 2051 | static int e100_up(struct nic *nic) |
| 2054 | { | 2052 | { |
| @@ -2715,34 +2713,32 @@ static void __devexit e100_remove(struct pci_dev *pdev) | |||
| 2715 | } | 2713 | } |
| 2716 | } | 2714 | } |
| 2717 | 2715 | ||
| 2716 | #ifdef CONFIG_PM | ||
| 2718 | static int e100_suspend(struct pci_dev *pdev, pm_message_t state) | 2717 | static int e100_suspend(struct pci_dev *pdev, pm_message_t state) |
| 2719 | { | 2718 | { |
| 2720 | struct net_device *netdev = pci_get_drvdata(pdev); | 2719 | struct net_device *netdev = pci_get_drvdata(pdev); |
| 2721 | struct nic *nic = netdev_priv(netdev); | 2720 | struct nic *nic = netdev_priv(netdev); |
| 2722 | 2721 | ||
| 2723 | if (netif_running(netdev)) | 2722 | netif_poll_disable(nic->netdev); |
| 2724 | e100_down(nic); | 2723 | del_timer_sync(&nic->watchdog); |
| 2725 | e100_hw_reset(nic); | 2724 | netif_carrier_off(nic->netdev); |
| 2726 | netif_device_detach(netdev); | ||
| 2727 | 2725 | ||
| 2728 | #ifdef CONFIG_PM | ||
| 2729 | pci_save_state(pdev); | 2726 | pci_save_state(pdev); |
| 2730 | if (nic->flags & (wol_magic | e100_asf(nic))) | 2727 | |
| 2731 | #else | 2728 | if ((nic->flags & wol_magic) | e100_asf(nic)) { |
| 2732 | if (nic->flags & (wol_magic)) | 2729 | pci_enable_wake(pdev, PCI_D3hot, 1); |
| 2733 | #endif | 2730 | pci_enable_wake(pdev, PCI_D3cold, 1); |
| 2734 | pci_enable_wake(pdev, pci_choose_state(pdev, state), 1); | 2731 | } else { |
| 2735 | else | 2732 | pci_enable_wake(pdev, PCI_D3hot, 0); |
| 2736 | /* disable PME */ | 2733 | pci_enable_wake(pdev, PCI_D3cold, 0); |
| 2737 | pci_enable_wake(pdev, 0, 0); | 2734 | } |
| 2738 | 2735 | ||
| 2739 | pci_disable_device(pdev); | 2736 | pci_disable_device(pdev); |
| 2740 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); | 2737 | pci_set_power_state(pdev, PCI_D3hot); |
| 2741 | 2738 | ||
| 2742 | return 0; | 2739 | return 0; |
| 2743 | } | 2740 | } |
| 2744 | 2741 | ||
| 2745 | #ifdef CONFIG_PM | ||
| 2746 | static int e100_resume(struct pci_dev *pdev) | 2742 | static int e100_resume(struct pci_dev *pdev) |
| 2747 | { | 2743 | { |
| 2748 | struct net_device *netdev = pci_get_drvdata(pdev); | 2744 | struct net_device *netdev = pci_get_drvdata(pdev); |
| @@ -2764,7 +2760,23 @@ static int e100_resume(struct pci_dev *pdev) | |||
| 2764 | 2760 | ||
| 2765 | static void e100_shutdown(struct pci_dev *pdev) | 2761 | static void e100_shutdown(struct pci_dev *pdev) |
| 2766 | { | 2762 | { |
| 2767 | e100_suspend(pdev, PMSG_SUSPEND); | 2763 | struct net_device *netdev = pci_get_drvdata(pdev); |
| 2764 | struct nic *nic = netdev_priv(netdev); | ||
| 2765 | |||
| 2766 | netif_poll_disable(nic->netdev); | ||
| 2767 | del_timer_sync(&nic->watchdog); | ||
| 2768 | netif_carrier_off(nic->netdev); | ||
| 2769 | |||
| 2770 | if ((nic->flags & wol_magic) | e100_asf(nic)) { | ||
| 2771 | pci_enable_wake(pdev, PCI_D3hot, 1); | ||
| 2772 | pci_enable_wake(pdev, PCI_D3cold, 1); | ||
| 2773 | } else { | ||
| 2774 | pci_enable_wake(pdev, PCI_D3hot, 0); | ||
| 2775 | pci_enable_wake(pdev, PCI_D3cold, 0); | ||
| 2776 | } | ||
| 2777 | |||
| 2778 | pci_disable_device(pdev); | ||
| 2779 | pci_set_power_state(pdev, PCI_D3hot); | ||
| 2768 | } | 2780 | } |
| 2769 | 2781 | ||
| 2770 | /* ------------------ PCI Error Recovery infrastructure -------------- */ | 2782 | /* ------------------ PCI Error Recovery infrastructure -------------- */ |
| @@ -2848,9 +2860,9 @@ static struct pci_driver e100_driver = { | |||
| 2848 | .id_table = e100_id_table, | 2860 | .id_table = e100_id_table, |
| 2849 | .probe = e100_probe, | 2861 | .probe = e100_probe, |
| 2850 | .remove = __devexit_p(e100_remove), | 2862 | .remove = __devexit_p(e100_remove), |
| 2863 | #ifdef CONFIG_PM | ||
| 2851 | /* Power Management hooks */ | 2864 | /* Power Management hooks */ |
| 2852 | .suspend = e100_suspend, | 2865 | .suspend = e100_suspend, |
| 2853 | #ifdef CONFIG_PM | ||
| 2854 | .resume = e100_resume, | 2866 | .resume = e100_resume, |
| 2855 | #endif | 2867 | #endif |
| 2856 | .shutdown = e100_shutdown, | 2868 | .shutdown = e100_shutdown, |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index ce0d35fe3947..fa849831d099 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -4914,10 +4914,6 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) | |||
| 4914 | pci_enable_wake(pdev, PCI_D3hot, 0); | 4914 | pci_enable_wake(pdev, PCI_D3hot, 0); |
| 4915 | pci_enable_wake(pdev, PCI_D3cold, 0); | 4915 | pci_enable_wake(pdev, PCI_D3cold, 0); |
| 4916 | 4916 | ||
| 4917 | /* Perform card reset only on one instance of the card */ | ||
| 4918 | if (PCI_FUNC (pdev->devfn) != 0) | ||
| 4919 | return PCI_ERS_RESULT_RECOVERED; | ||
| 4920 | |||
| 4921 | e1000_reset(adapter); | 4917 | e1000_reset(adapter); |
| 4922 | E1000_WRITE_REG(&adapter->hw, WUS, ~0); | 4918 | E1000_WRITE_REG(&adapter->hw, WUS, ~0); |
| 4923 | 4919 | ||
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 2802db23d3cb..44c9f993dcc4 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
| @@ -212,8 +212,8 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc | |||
| 212 | break; | 212 | break; |
| 213 | } | 213 | } |
| 214 | 214 | ||
| 215 | free_index = pool->consumer_index++ % pool->size; | 215 | free_index = pool->consumer_index; |
| 216 | pool->consumer_index = free_index; | 216 | pool->consumer_index = (pool->consumer_index + 1) % pool->size; |
| 217 | index = pool->free_map[free_index]; | 217 | index = pool->free_map[free_index]; |
| 218 | 218 | ||
| 219 | ibmveth_assert(index != IBM_VETH_INVALID_MAP); | 219 | ibmveth_assert(index != IBM_VETH_INVALID_MAP); |
| @@ -329,8 +329,10 @@ static void ibmveth_remove_buffer_from_pool(struct ibmveth_adapter *adapter, u64 | |||
| 329 | adapter->rx_buff_pool[pool].buff_size, | 329 | adapter->rx_buff_pool[pool].buff_size, |
| 330 | DMA_FROM_DEVICE); | 330 | DMA_FROM_DEVICE); |
| 331 | 331 | ||
| 332 | free_index = adapter->rx_buff_pool[pool].producer_index++ % adapter->rx_buff_pool[pool].size; | 332 | free_index = adapter->rx_buff_pool[pool].producer_index; |
| 333 | adapter->rx_buff_pool[pool].producer_index = free_index; | 333 | adapter->rx_buff_pool[pool].producer_index |
| 334 | = (adapter->rx_buff_pool[pool].producer_index + 1) | ||
| 335 | % adapter->rx_buff_pool[pool].size; | ||
| 334 | adapter->rx_buff_pool[pool].free_map[free_index] = index; | 336 | adapter->rx_buff_pool[pool].free_map[free_index] = index; |
| 335 | 337 | ||
| 336 | mb(); | 338 | mb(); |
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index e963dbf816be..f56b00ee385e 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c | |||
| @@ -1017,7 +1017,7 @@ static void ioc3_init(struct net_device *dev) | |||
| 1017 | struct ioc3_private *ip = netdev_priv(dev); | 1017 | struct ioc3_private *ip = netdev_priv(dev); |
| 1018 | struct ioc3 *ioc3 = ip->regs; | 1018 | struct ioc3 *ioc3 = ip->regs; |
| 1019 | 1019 | ||
| 1020 | del_timer(&ip->ioc3_timer); /* Kill if running */ | 1020 | del_timer_sync(&ip->ioc3_timer); /* Kill if running */ |
| 1021 | 1021 | ||
| 1022 | ioc3_w_emcr(EMCR_RST); /* Reset */ | 1022 | ioc3_w_emcr(EMCR_RST); /* Reset */ |
| 1023 | (void) ioc3_r_emcr(); /* Flush WB */ | 1023 | (void) ioc3_r_emcr(); /* Flush WB */ |
| @@ -1081,7 +1081,7 @@ static int ioc3_close(struct net_device *dev) | |||
| 1081 | { | 1081 | { |
| 1082 | struct ioc3_private *ip = netdev_priv(dev); | 1082 | struct ioc3_private *ip = netdev_priv(dev); |
| 1083 | 1083 | ||
| 1084 | del_timer(&ip->ioc3_timer); | 1084 | del_timer_sync(&ip->ioc3_timer); |
| 1085 | 1085 | ||
| 1086 | netif_stop_queue(dev); | 1086 | netif_stop_queue(dev); |
| 1087 | 1087 | ||
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 4178b4b1d2df..82c10dec1b5a 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c | |||
| @@ -58,7 +58,11 @@ | |||
| 58 | #include <linux/tcp.h> | 58 | #include <linux/tcp.h> |
| 59 | #include <linux/percpu.h> | 59 | #include <linux/percpu.h> |
| 60 | 60 | ||
| 61 | static DEFINE_PER_CPU(struct net_device_stats, loopback_stats); | 61 | struct pcpu_lstats { |
| 62 | unsigned long packets; | ||
| 63 | unsigned long bytes; | ||
| 64 | }; | ||
| 65 | static DEFINE_PER_CPU(struct pcpu_lstats, pcpu_lstats); | ||
| 62 | 66 | ||
| 63 | #define LOOPBACK_OVERHEAD (128 + MAX_HEADER + 16 + 16) | 67 | #define LOOPBACK_OVERHEAD (128 + MAX_HEADER + 16 + 16) |
| 64 | 68 | ||
| @@ -128,7 +132,7 @@ static void emulate_large_send_offload(struct sk_buff *skb) | |||
| 128 | */ | 132 | */ |
| 129 | static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) | 133 | static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) |
| 130 | { | 134 | { |
| 131 | struct net_device_stats *lb_stats; | 135 | struct pcpu_lstats *lb_stats; |
| 132 | 136 | ||
| 133 | skb_orphan(skb); | 137 | skb_orphan(skb); |
| 134 | 138 | ||
| @@ -149,16 +153,14 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 149 | #endif | 153 | #endif |
| 150 | dev->last_rx = jiffies; | 154 | dev->last_rx = jiffies; |
| 151 | 155 | ||
| 152 | lb_stats = &per_cpu(loopback_stats, get_cpu()); | 156 | /* it's OK to use __get_cpu_var() because BHs are off */ |
| 153 | lb_stats->rx_bytes += skb->len; | 157 | lb_stats = &__get_cpu_var(pcpu_lstats); |
| 154 | lb_stats->tx_bytes = lb_stats->rx_bytes; | 158 | lb_stats->bytes += skb->len; |
| 155 | lb_stats->rx_packets++; | 159 | lb_stats->packets++; |
| 156 | lb_stats->tx_packets = lb_stats->rx_packets; | ||
| 157 | put_cpu(); | ||
| 158 | 160 | ||
| 159 | netif_rx(skb); | 161 | netif_rx(skb); |
| 160 | 162 | ||
| 161 | return(0); | 163 | return 0; |
| 162 | } | 164 | } |
| 163 | 165 | ||
| 164 | static struct net_device_stats loopback_stats; | 166 | static struct net_device_stats loopback_stats; |
| @@ -166,20 +168,21 @@ static struct net_device_stats loopback_stats; | |||
| 166 | static struct net_device_stats *get_stats(struct net_device *dev) | 168 | static struct net_device_stats *get_stats(struct net_device *dev) |
| 167 | { | 169 | { |
| 168 | struct net_device_stats *stats = &loopback_stats; | 170 | struct net_device_stats *stats = &loopback_stats; |
| 171 | unsigned long bytes = 0; | ||
| 172 | unsigned long packets = 0; | ||
| 169 | int i; | 173 | int i; |
| 170 | 174 | ||
| 171 | memset(stats, 0, sizeof(struct net_device_stats)); | ||
| 172 | |||
| 173 | for_each_possible_cpu(i) { | 175 | for_each_possible_cpu(i) { |
| 174 | struct net_device_stats *lb_stats; | 176 | const struct pcpu_lstats *lb_stats; |
| 175 | 177 | ||
| 176 | lb_stats = &per_cpu(loopback_stats, i); | 178 | lb_stats = &per_cpu(pcpu_lstats, i); |
| 177 | stats->rx_bytes += lb_stats->rx_bytes; | 179 | bytes += lb_stats->bytes; |
| 178 | stats->tx_bytes += lb_stats->tx_bytes; | 180 | packets += lb_stats->packets; |
| 179 | stats->rx_packets += lb_stats->rx_packets; | ||
| 180 | stats->tx_packets += lb_stats->tx_packets; | ||
| 181 | } | 181 | } |
| 182 | 182 | stats->rx_packets = packets; | |
| 183 | stats->tx_packets = packets; | ||
| 184 | stats->rx_bytes = bytes; | ||
| 185 | stats->tx_bytes = bytes; | ||
| 183 | return stats; | 186 | return stats; |
| 184 | } | 187 | } |
| 185 | 188 | ||
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index a4f861bf32d6..9997081c6dae 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
| @@ -1557,12 +1557,6 @@ static void __exit mv643xx_cleanup_module(void) | |||
| 1557 | module_init(mv643xx_init_module); | 1557 | module_init(mv643xx_init_module); |
| 1558 | module_exit(mv643xx_cleanup_module); | 1558 | module_exit(mv643xx_cleanup_module); |
| 1559 | 1559 | ||
| 1560 | static struct pci_device_id pci_marvell_mv64360[] = { | ||
| 1561 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) }, | ||
| 1562 | {} | ||
| 1563 | }; | ||
| 1564 | MODULE_DEVICE_TABLE(pci, pci_marvell_mv64360); | ||
| 1565 | |||
| 1566 | MODULE_LICENSE("GPL"); | 1560 | MODULE_LICENSE("GPL"); |
| 1567 | MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani" | 1561 | MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani" |
| 1568 | " and Dale Farnsworth"); | 1562 | " and Dale Farnsworth"); |
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index f1c75751cab7..d132fe7d475e 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
| @@ -214,6 +214,7 @@ static struct pci_device_id rtl8169_pci_tbl[] = { | |||
| 214 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_2 }, | 214 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_2 }, |
| 215 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 }, | 215 | { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 }, |
| 216 | { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 }, | 216 | { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 }, |
| 217 | { PCI_DEVICE(0x1259, 0xc107), 0, 0, RTL_CFG_0 }, | ||
| 217 | { PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 }, | 218 | { PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 }, |
| 218 | { PCI_VENDOR_ID_LINKSYS, 0x1032, | 219 | { PCI_VENDOR_ID_LINKSYS, 0x1032, |
| 219 | PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 }, | 220 | PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 }, |
| @@ -2700,6 +2701,7 @@ static void rtl8169_down(struct net_device *dev) | |||
| 2700 | struct rtl8169_private *tp = netdev_priv(dev); | 2701 | struct rtl8169_private *tp = netdev_priv(dev); |
| 2701 | void __iomem *ioaddr = tp->mmio_addr; | 2702 | void __iomem *ioaddr = tp->mmio_addr; |
| 2702 | unsigned int poll_locked = 0; | 2703 | unsigned int poll_locked = 0; |
| 2704 | unsigned int intrmask; | ||
| 2703 | 2705 | ||
| 2704 | rtl8169_delete_timer(dev); | 2706 | rtl8169_delete_timer(dev); |
| 2705 | 2707 | ||
| @@ -2738,8 +2740,11 @@ core_down: | |||
| 2738 | * 2) dev->change_mtu | 2740 | * 2) dev->change_mtu |
| 2739 | * -> rtl8169_poll can not be issued again and re-enable the | 2741 | * -> rtl8169_poll can not be issued again and re-enable the |
| 2740 | * interruptions. Let's simply issue the IRQ down sequence again. | 2742 | * interruptions. Let's simply issue the IRQ down sequence again. |
| 2743 | * | ||
| 2744 | * No loop if hotpluged or major error (0xffff). | ||
| 2741 | */ | 2745 | */ |
| 2742 | if (RTL_R16(IntrMask)) | 2746 | intrmask = RTL_R16(IntrMask); |
| 2747 | if (intrmask && (intrmask != 0xffff)) | ||
| 2743 | goto core_down; | 2748 | goto core_down; |
| 2744 | 2749 | ||
| 2745 | rtl8169_tx_clear(tp); | 2750 | rtl8169_tx_clear(tp); |
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index db2324939b69..1eae16b72b4b 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
| @@ -2903,7 +2903,7 @@ sbmac_init_module(void) | |||
| 2903 | 2903 | ||
| 2904 | dev = alloc_etherdev(sizeof(struct sbmac_softc)); | 2904 | dev = alloc_etherdev(sizeof(struct sbmac_softc)); |
| 2905 | if (!dev) | 2905 | if (!dev) |
| 2906 | return -ENOMEM; /* return ENOMEM */ | 2906 | return -ENOMEM; |
| 2907 | 2907 | ||
| 2908 | printk(KERN_DEBUG "sbmac: configuring MAC at %lx\n", port); | 2908 | printk(KERN_DEBUG "sbmac: configuring MAC at %lx\n", port); |
| 2909 | 2909 | ||
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 67ecd66f26d6..95efdb5bbbe1 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -699,16 +699,10 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) | |||
| 699 | 699 | ||
| 700 | } | 700 | } |
| 701 | 701 | ||
| 702 | /* Assign Ram Buffer allocation. | 702 | /* Assign Ram Buffer allocation in units of 64bit (8 bytes) */ |
| 703 | * start and end are in units of 4k bytes | 703 | static void sky2_ramset(struct sky2_hw *hw, u16 q, u32 start, u32 end) |
| 704 | * ram registers are in units of 64bit words | ||
| 705 | */ | ||
| 706 | static void sky2_ramset(struct sky2_hw *hw, u16 q, u8 startk, u8 endk) | ||
| 707 | { | 704 | { |
| 708 | u32 start, end; | 705 | pr_debug(PFX "q %d %#x %#x\n", q, start, end); |
| 709 | |||
| 710 | start = startk * 4096/8; | ||
| 711 | end = (endk * 4096/8) - 1; | ||
| 712 | 706 | ||
| 713 | sky2_write8(hw, RB_ADDR(q, RB_CTRL), RB_RST_CLR); | 707 | sky2_write8(hw, RB_ADDR(q, RB_CTRL), RB_RST_CLR); |
| 714 | sky2_write32(hw, RB_ADDR(q, RB_START), start); | 708 | sky2_write32(hw, RB_ADDR(q, RB_START), start); |
| @@ -717,7 +711,7 @@ static void sky2_ramset(struct sky2_hw *hw, u16 q, u8 startk, u8 endk) | |||
| 717 | sky2_write32(hw, RB_ADDR(q, RB_RP), start); | 711 | sky2_write32(hw, RB_ADDR(q, RB_RP), start); |
| 718 | 712 | ||
| 719 | if (q == Q_R1 || q == Q_R2) { | 713 | if (q == Q_R1 || q == Q_R2) { |
| 720 | u32 space = (endk - startk) * 4096/8; | 714 | u32 space = end - start + 1; |
| 721 | u32 tp = space - space/4; | 715 | u32 tp = space - space/4; |
| 722 | 716 | ||
| 723 | /* On receive queue's set the thresholds | 717 | /* On receive queue's set the thresholds |
| @@ -1199,19 +1193,16 @@ static int sky2_up(struct net_device *dev) | |||
| 1199 | 1193 | ||
| 1200 | sky2_mac_init(hw, port); | 1194 | sky2_mac_init(hw, port); |
| 1201 | 1195 | ||
| 1202 | /* Determine available ram buffer space (in 4K blocks). | 1196 | /* Determine available ram buffer space in qwords. */ |
| 1203 | * Note: not sure about the FE setting below yet | 1197 | ramsize = sky2_read8(hw, B2_E_0) * 4096/8; |
| 1204 | */ | ||
| 1205 | if (hw->chip_id == CHIP_ID_YUKON_FE) | ||
| 1206 | ramsize = 4; | ||
| 1207 | else | ||
| 1208 | ramsize = sky2_read8(hw, B2_E_0); | ||
| 1209 | 1198 | ||
| 1210 | /* Give transmitter one third (rounded up) */ | 1199 | if (ramsize > 6*1024/8) |
| 1211 | rxspace = ramsize - (ramsize + 2) / 3; | 1200 | rxspace = ramsize - (ramsize + 2) / 3; |
| 1201 | else | ||
| 1202 | rxspace = ramsize / 2; | ||
| 1212 | 1203 | ||
| 1213 | sky2_ramset(hw, rxqaddr[port], 0, rxspace); | 1204 | sky2_ramset(hw, rxqaddr[port], 0, rxspace-1); |
| 1214 | sky2_ramset(hw, txqaddr[port], rxspace, ramsize); | 1205 | sky2_ramset(hw, txqaddr[port], rxspace, ramsize-1); |
| 1215 | 1206 | ||
| 1216 | /* Make sure SyncQ is disabled */ | 1207 | /* Make sure SyncQ is disabled */ |
| 1217 | sky2_write8(hw, RB_ADDR(port == 0 ? Q_XS1 : Q_XS2, RB_CTRL), | 1208 | sky2_write8(hw, RB_ADDR(port == 0 ? Q_XS1 : Q_XS2, RB_CTRL), |
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 0c9f1e7dab2e..a8640169fc77 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
| @@ -416,6 +416,24 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, | |||
| 416 | 416 | ||
| 417 | #define SMC_IRQ_FLAGS (0) | 417 | #define SMC_IRQ_FLAGS (0) |
| 418 | 418 | ||
| 419 | #elif defined(CONFIG_ARCH_VERSATILE) | ||
| 420 | |||
| 421 | #define SMC_CAN_USE_8BIT 1 | ||
| 422 | #define SMC_CAN_USE_16BIT 1 | ||
| 423 | #define SMC_CAN_USE_32BIT 1 | ||
| 424 | #define SMC_NOWAIT 1 | ||
| 425 | |||
| 426 | #define SMC_inb(a, r) readb((a) + (r)) | ||
| 427 | #define SMC_inw(a, r) readw((a) + (r)) | ||
| 428 | #define SMC_inl(a, r) readl((a) + (r)) | ||
| 429 | #define SMC_outb(v, a, r) writeb(v, (a) + (r)) | ||
| 430 | #define SMC_outw(v, a, r) writew(v, (a) + (r)) | ||
| 431 | #define SMC_outl(v, a, r) writel(v, (a) + (r)) | ||
| 432 | #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) | ||
| 433 | #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) | ||
| 434 | |||
| 435 | #define SMC_IRQ_FLAGS (0) | ||
| 436 | |||
| 419 | #else | 437 | #else |
| 420 | 438 | ||
| 421 | #define SMC_CAN_USE_8BIT 1 | 439 | #define SMC_CAN_USE_8BIT 1 |
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 327836b1014e..8e398499c045 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -68,8 +68,8 @@ | |||
| 68 | 68 | ||
| 69 | #define DRV_MODULE_NAME "tg3" | 69 | #define DRV_MODULE_NAME "tg3" |
| 70 | #define PFX DRV_MODULE_NAME ": " | 70 | #define PFX DRV_MODULE_NAME ": " |
| 71 | #define DRV_MODULE_VERSION "3.66" | 71 | #define DRV_MODULE_VERSION "3.67" |
| 72 | #define DRV_MODULE_RELDATE "September 23, 2006" | 72 | #define DRV_MODULE_RELDATE "October 18, 2006" |
| 73 | 73 | ||
| 74 | #define TG3_DEF_MAC_MODE 0 | 74 | #define TG3_DEF_MAC_MODE 0 |
| 75 | #define TG3_DEF_RX_MODE 0 | 75 | #define TG3_DEF_RX_MODE 0 |
| @@ -129,7 +129,7 @@ | |||
| 129 | #define RX_JUMBO_PKT_BUF_SZ (9046 + tp->rx_offset + 64) | 129 | #define RX_JUMBO_PKT_BUF_SZ (9046 + tp->rx_offset + 64) |
| 130 | 130 | ||
| 131 | /* minimum number of free TX descriptors required to wake up TX process */ | 131 | /* minimum number of free TX descriptors required to wake up TX process */ |
| 132 | #define TG3_TX_WAKEUP_THRESH (TG3_TX_RING_SIZE / 4) | 132 | #define TG3_TX_WAKEUP_THRESH(tp) ((tp)->tx_pending / 4) |
| 133 | 133 | ||
| 134 | /* number of ETHTOOL_GSTATS u64's */ | 134 | /* number of ETHTOOL_GSTATS u64's */ |
| 135 | #define TG3_NUM_STATS (sizeof(struct tg3_ethtool_stats)/sizeof(u64)) | 135 | #define TG3_NUM_STATS (sizeof(struct tg3_ethtool_stats)/sizeof(u64)) |
| @@ -3075,10 +3075,10 @@ static void tg3_tx(struct tg3 *tp) | |||
| 3075 | smp_mb(); | 3075 | smp_mb(); |
| 3076 | 3076 | ||
| 3077 | if (unlikely(netif_queue_stopped(tp->dev) && | 3077 | if (unlikely(netif_queue_stopped(tp->dev) && |
| 3078 | (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH))) { | 3078 | (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp)))) { |
| 3079 | netif_tx_lock(tp->dev); | 3079 | netif_tx_lock(tp->dev); |
| 3080 | if (netif_queue_stopped(tp->dev) && | 3080 | if (netif_queue_stopped(tp->dev) && |
| 3081 | (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH)) | 3081 | (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp))) |
| 3082 | netif_wake_queue(tp->dev); | 3082 | netif_wake_queue(tp->dev); |
| 3083 | netif_tx_unlock(tp->dev); | 3083 | netif_tx_unlock(tp->dev); |
| 3084 | } | 3084 | } |
| @@ -3928,7 +3928,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 3928 | tp->tx_prod = entry; | 3928 | tp->tx_prod = entry; |
| 3929 | if (unlikely(tg3_tx_avail(tp) <= (MAX_SKB_FRAGS + 1))) { | 3929 | if (unlikely(tg3_tx_avail(tp) <= (MAX_SKB_FRAGS + 1))) { |
| 3930 | netif_stop_queue(dev); | 3930 | netif_stop_queue(dev); |
| 3931 | if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH) | 3931 | if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp)) |
| 3932 | netif_wake_queue(tp->dev); | 3932 | netif_wake_queue(tp->dev); |
| 3933 | } | 3933 | } |
| 3934 | 3934 | ||
| @@ -4143,7 +4143,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev) | |||
| 4143 | tp->tx_prod = entry; | 4143 | tp->tx_prod = entry; |
| 4144 | if (unlikely(tg3_tx_avail(tp) <= (MAX_SKB_FRAGS + 1))) { | 4144 | if (unlikely(tg3_tx_avail(tp) <= (MAX_SKB_FRAGS + 1))) { |
| 4145 | netif_stop_queue(dev); | 4145 | netif_stop_queue(dev); |
| 4146 | if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH) | 4146 | if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp)) |
| 4147 | netif_wake_queue(tp->dev); | 4147 | netif_wake_queue(tp->dev); |
| 4148 | } | 4148 | } |
| 4149 | 4149 | ||
| @@ -8106,7 +8106,10 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e | |||
| 8106 | 8106 | ||
| 8107 | if ((ering->rx_pending > TG3_RX_RING_SIZE - 1) || | 8107 | if ((ering->rx_pending > TG3_RX_RING_SIZE - 1) || |
| 8108 | (ering->rx_jumbo_pending > TG3_RX_JUMBO_RING_SIZE - 1) || | 8108 | (ering->rx_jumbo_pending > TG3_RX_JUMBO_RING_SIZE - 1) || |
| 8109 | (ering->tx_pending > TG3_TX_RING_SIZE - 1)) | 8109 | (ering->tx_pending > TG3_TX_RING_SIZE - 1) || |
| 8110 | (ering->tx_pending <= MAX_SKB_FRAGS) || | ||
| 8111 | ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_1_BUG) && | ||
| 8112 | (ering->tx_pending <= (MAX_SKB_FRAGS * 3)))) | ||
| 8110 | return -EINVAL; | 8113 | return -EINVAL; |
| 8111 | 8114 | ||
| 8112 | if (netif_running(dev)) { | 8115 | if (netif_running(dev)) { |
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 12cd7b561f35..b37888011067 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
| @@ -2,14 +2,11 @@ | |||
| 2 | * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved. | 2 | * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * Author: Shlomi Gridish <gridish@freescale.com> | 4 | * Author: Shlomi Gridish <gridish@freescale.com> |
| 5 | * Li Yang <leoli@freescale.com> | ||
| 5 | * | 6 | * |
| 6 | * Description: | 7 | * Description: |
| 7 | * QE UCC Gigabit Ethernet Driver | 8 | * QE UCC Gigabit Ethernet Driver |
| 8 | * | 9 | * |
| 9 | * Changelog: | ||
| 10 | * Jul 6, 2006 Li Yang <LeoLi@freescale.com> | ||
| 11 | * - Rearrange code and style fixes | ||
| 12 | * | ||
| 13 | * This program is free software; you can redistribute it and/or modify it | 10 | * This program is free software; you can redistribute it and/or modify it |
| 14 | * under the terms of the GNU General Public License as published by the | 11 | * under the terms of the GNU General Public License as published by the |
| 15 | * Free Software Foundation; either version 2 of the License, or (at your | 12 | * Free Software Foundation; either version 2 of the License, or (at your |
| @@ -31,9 +28,9 @@ | |||
| 31 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
| 32 | #include <linux/fsl_devices.h> | 29 | #include <linux/fsl_devices.h> |
| 33 | #include <linux/ethtool.h> | 30 | #include <linux/ethtool.h> |
| 34 | #include <linux/platform_device.h> | ||
| 35 | #include <linux/mii.h> | 31 | #include <linux/mii.h> |
| 36 | 32 | ||
| 33 | #include <asm/of_device.h> | ||
| 37 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
| 38 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 39 | #include <asm/io.h> | 36 | #include <asm/io.h> |
| @@ -70,7 +67,7 @@ | |||
| 70 | 67 | ||
| 71 | static DEFINE_SPINLOCK(ugeth_lock); | 68 | static DEFINE_SPINLOCK(ugeth_lock); |
| 72 | 69 | ||
| 73 | static ucc_geth_info_t ugeth_primary_info = { | 70 | static struct ucc_geth_info ugeth_primary_info = { |
| 74 | .uf_info = { | 71 | .uf_info = { |
| 75 | .bd_mem_part = MEM_PART_SYSTEM, | 72 | .bd_mem_part = MEM_PART_SYSTEM, |
| 76 | .rtsm = UCC_FAST_SEND_IDLES_BETWEEN_FRAMES, | 73 | .rtsm = UCC_FAST_SEND_IDLES_BETWEEN_FRAMES, |
| @@ -163,7 +160,7 @@ static ucc_geth_info_t ugeth_primary_info = { | |||
| 163 | .riscRx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, | 160 | .riscRx = QE_RISC_ALLOCATION_RISC1_AND_RISC2, |
| 164 | }; | 161 | }; |
| 165 | 162 | ||
| 166 | static ucc_geth_info_t ugeth_info[8]; | 163 | static struct ucc_geth_info ugeth_info[8]; |
| 167 | 164 | ||
| 168 | #ifdef DEBUG | 165 | #ifdef DEBUG |
| 169 | static void mem_disp(u8 *addr, int size) | 166 | static void mem_disp(u8 *addr, int size) |
| @@ -219,8 +216,8 @@ static struct list_head *dequeue(struct list_head *lh) | |||
| 219 | } | 216 | } |
| 220 | } | 217 | } |
| 221 | 218 | ||
| 222 | static int get_interface_details(enet_interface_e enet_interface, | 219 | static int get_interface_details(enum enet_interface enet_interface, |
| 223 | enet_speed_e *speed, | 220 | enum enet_speed *speed, |
| 224 | int *r10m, | 221 | int *r10m, |
| 225 | int *rmm, | 222 | int *rmm, |
| 226 | int *rpm, | 223 | int *rpm, |
| @@ -283,7 +280,7 @@ static int get_interface_details(enet_interface_e enet_interface, | |||
| 283 | return 0; | 280 | return 0; |
| 284 | } | 281 | } |
| 285 | 282 | ||
| 286 | static struct sk_buff *get_new_skb(ucc_geth_private_t *ugeth, u8 *bd) | 283 | static struct sk_buff *get_new_skb(struct ucc_geth_private *ugeth, u8 *bd) |
| 287 | { | 284 | { |
| 288 | struct sk_buff *skb = NULL; | 285 | struct sk_buff *skb = NULL; |
| 289 | 286 | ||
| @@ -303,21 +300,19 @@ static struct sk_buff *get_new_skb(ucc_geth_private_t *ugeth, u8 *bd) | |||
| 303 | 300 | ||
| 304 | skb->dev = ugeth->dev; | 301 | skb->dev = ugeth->dev; |
| 305 | 302 | ||
| 306 | BD_BUFFER_SET(bd, | 303 | out_be32(&((struct qe_bd *)bd)->buf, |
| 307 | dma_map_single(NULL, | 304 | dma_map_single(NULL, |
| 308 | skb->data, | 305 | skb->data, |
| 309 | ugeth->ug_info->uf_info.max_rx_buf_length + | 306 | ugeth->ug_info->uf_info.max_rx_buf_length + |
| 310 | UCC_GETH_RX_DATA_BUF_ALIGNMENT, | 307 | UCC_GETH_RX_DATA_BUF_ALIGNMENT, |
| 311 | DMA_FROM_DEVICE)); | 308 | DMA_FROM_DEVICE)); |
| 312 | 309 | ||
| 313 | BD_STATUS_AND_LENGTH_SET(bd, | 310 | out_be32((u32 *)bd, (R_E | R_I | (in_be32((u32 *)bd) & R_W))); |
| 314 | (R_E | R_I | | ||
| 315 | (BD_STATUS_AND_LENGTH(bd) & R_W))); | ||
| 316 | 311 | ||
| 317 | return skb; | 312 | return skb; |
| 318 | } | 313 | } |
| 319 | 314 | ||
| 320 | static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ) | 315 | static int rx_bd_buffer_set(struct ucc_geth_private *ugeth, u8 rxQ) |
| 321 | { | 316 | { |
| 322 | u8 *bd; | 317 | u8 *bd; |
| 323 | u32 bd_status; | 318 | u32 bd_status; |
| @@ -328,7 +323,7 @@ static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ) | |||
| 328 | i = 0; | 323 | i = 0; |
| 329 | 324 | ||
| 330 | do { | 325 | do { |
| 331 | bd_status = BD_STATUS_AND_LENGTH(bd); | 326 | bd_status = in_be32((u32*)bd); |
| 332 | skb = get_new_skb(ugeth, bd); | 327 | skb = get_new_skb(ugeth, bd); |
| 333 | 328 | ||
| 334 | if (!skb) /* If can not allocate data buffer, | 329 | if (!skb) /* If can not allocate data buffer, |
| @@ -338,19 +333,19 @@ static int rx_bd_buffer_set(ucc_geth_private_t *ugeth, u8 rxQ) | |||
| 338 | ugeth->rx_skbuff[rxQ][i] = skb; | 333 | ugeth->rx_skbuff[rxQ][i] = skb; |
| 339 | 334 | ||
| 340 | /* advance the BD pointer */ | 335 | /* advance the BD pointer */ |
| 341 | bd += UCC_GETH_SIZE_OF_BD; | 336 | bd += sizeof(struct qe_bd); |
| 342 | i++; | 337 | i++; |
| 343 | } while (!(bd_status & R_W)); | 338 | } while (!(bd_status & R_W)); |
| 344 | 339 | ||
| 345 | return 0; | 340 | return 0; |
| 346 | } | 341 | } |
| 347 | 342 | ||
| 348 | static int fill_init_enet_entries(ucc_geth_private_t *ugeth, | 343 | static int fill_init_enet_entries(struct ucc_geth_private *ugeth, |
| 349 | volatile u32 *p_start, | 344 | volatile u32 *p_start, |
| 350 | u8 num_entries, | 345 | u8 num_entries, |
| 351 | u32 thread_size, | 346 | u32 thread_size, |
| 352 | u32 thread_alignment, | 347 | u32 thread_alignment, |
| 353 | qe_risc_allocation_e risc, | 348 | enum qe_risc_allocation risc, |
| 354 | int skip_page_for_first_entry) | 349 | int skip_page_for_first_entry) |
| 355 | { | 350 | { |
| 356 | u32 init_enet_offset; | 351 | u32 init_enet_offset; |
| @@ -383,10 +378,10 @@ static int fill_init_enet_entries(ucc_geth_private_t *ugeth, | |||
| 383 | return 0; | 378 | return 0; |
| 384 | } | 379 | } |
| 385 | 380 | ||
| 386 | static int return_init_enet_entries(ucc_geth_private_t *ugeth, | 381 | static int return_init_enet_entries(struct ucc_geth_private *ugeth, |
| 387 | volatile u32 *p_start, | 382 | volatile u32 *p_start, |
| 388 | u8 num_entries, | 383 | u8 num_entries, |
| 389 | qe_risc_allocation_e risc, | 384 | enum qe_risc_allocation risc, |
| 390 | int skip_page_for_first_entry) | 385 | int skip_page_for_first_entry) |
| 391 | { | 386 | { |
| 392 | u32 init_enet_offset; | 387 | u32 init_enet_offset; |
| @@ -416,11 +411,11 @@ static int return_init_enet_entries(ucc_geth_private_t *ugeth, | |||
| 416 | } | 411 | } |
| 417 | 412 | ||
| 418 | #ifdef DEBUG | 413 | #ifdef DEBUG |
| 419 | static int dump_init_enet_entries(ucc_geth_private_t *ugeth, | 414 | static int dump_init_enet_entries(struct ucc_geth_private *ugeth, |
| 420 | volatile u32 *p_start, | 415 | volatile u32 *p_start, |
| 421 | u8 num_entries, | 416 | u8 num_entries, |
| 422 | u32 thread_size, | 417 | u32 thread_size, |
| 423 | qe_risc_allocation_e risc, | 418 | enum qe_risc_allocation risc, |
| 424 | int skip_page_for_first_entry) | 419 | int skip_page_for_first_entry) |
| 425 | { | 420 | { |
| 426 | u32 init_enet_offset; | 421 | u32 init_enet_offset; |
| @@ -456,14 +451,14 @@ static int dump_init_enet_entries(ucc_geth_private_t *ugeth, | |||
| 456 | #endif | 451 | #endif |
| 457 | 452 | ||
| 458 | #ifdef CONFIG_UGETH_FILTERING | 453 | #ifdef CONFIG_UGETH_FILTERING |
| 459 | static enet_addr_container_t *get_enet_addr_container(void) | 454 | static struct enet_addr_container *get_enet_addr_container(void) |
| 460 | { | 455 | { |
| 461 | enet_addr_container_t *enet_addr_cont; | 456 | struct enet_addr_container *enet_addr_cont; |
| 462 | 457 | ||
| 463 | /* allocate memory */ | 458 | /* allocate memory */ |
| 464 | enet_addr_cont = kmalloc(sizeof(enet_addr_container_t), GFP_KERNEL); | 459 | enet_addr_cont = kmalloc(sizeof(struct enet_addr_container), GFP_KERNEL); |
| 465 | if (!enet_addr_cont) { | 460 | if (!enet_addr_cont) { |
| 466 | ugeth_err("%s: No memory for enet_addr_container_t object.", | 461 | ugeth_err("%s: No memory for enet_addr_container object.", |
| 467 | __FUNCTION__); | 462 | __FUNCTION__); |
| 468 | return NULL; | 463 | return NULL; |
| 469 | } | 464 | } |
| @@ -472,45 +467,43 @@ static enet_addr_container_t *get_enet_addr_container(void) | |||
| 472 | } | 467 | } |
| 473 | #endif /* CONFIG_UGETH_FILTERING */ | 468 | #endif /* CONFIG_UGETH_FILTERING */ |
| 474 | 469 | ||
| 475 | static void put_enet_addr_container(enet_addr_container_t *enet_addr_cont) | 470 | static void put_enet_addr_container(struct enet_addr_container *enet_addr_cont) |
| 476 | { | 471 | { |
| 477 | kfree(enet_addr_cont); | 472 | kfree(enet_addr_cont); |
| 478 | } | 473 | } |
| 479 | 474 | ||
| 475 | static int set_mac_addr(__be16 __iomem *reg, u8 *mac) | ||
| 476 | { | ||
| 477 | out_be16(®[0], ((u16)mac[5] << 8) | mac[4]); | ||
| 478 | out_be16(®[1], ((u16)mac[3] << 8) | mac[2]); | ||
| 479 | out_be16(®[2], ((u16)mac[1] << 8) | mac[0]); | ||
| 480 | } | ||
| 481 | |||
| 480 | #ifdef CONFIG_UGETH_FILTERING | 482 | #ifdef CONFIG_UGETH_FILTERING |
| 481 | static int hw_add_addr_in_paddr(ucc_geth_private_t *ugeth, | 483 | static int hw_add_addr_in_paddr(struct ucc_geth_private *ugeth, |
| 482 | enet_addr_t *p_enet_addr, u8 paddr_num) | 484 | u8 *p_enet_addr, u8 paddr_num) |
| 483 | { | 485 | { |
| 484 | ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; | 486 | struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; |
| 485 | 487 | ||
| 486 | if (!(paddr_num < NUM_OF_PADDRS)) { | 488 | if (!(paddr_num < NUM_OF_PADDRS)) { |
| 487 | ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__); | 489 | ugeth_warn("%s: Illegal paddr_num.", __FUNCTION__); |
| 488 | return -EINVAL; | 490 | return -EINVAL; |
| 489 | } | 491 | } |
| 490 | 492 | ||
| 491 | p_82xx_addr_filt = | 493 | p_82xx_addr_filt = |
| 492 | (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> | 494 | (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram-> |
| 493 | addressfiltering; | 495 | addressfiltering; |
| 494 | 496 | ||
| 495 | /* Ethernet frames are defined in Little Endian mode, */ | 497 | /* Ethernet frames are defined in Little Endian mode, */ |
| 496 | /* therefore to insert the address we reverse the bytes. */ | 498 | /* therefore to insert the address we reverse the bytes. */ |
| 497 | out_be16(&p_82xx_addr_filt->paddr[paddr_num].h, | 499 | set_mac_addr(&p_82xx_addr_filt->paddr[paddr_num].h, p_enet_addr); |
| 498 | (u16) (((u16) (((u16) ((*p_enet_addr)[5])) << 8)) | | ||
| 499 | (u16) (*p_enet_addr)[4])); | ||
| 500 | out_be16(&p_82xx_addr_filt->paddr[paddr_num].m, | ||
| 501 | (u16) (((u16) (((u16) ((*p_enet_addr)[3])) << 8)) | | ||
| 502 | (u16) (*p_enet_addr)[2])); | ||
| 503 | out_be16(&p_82xx_addr_filt->paddr[paddr_num].l, | ||
| 504 | (u16) (((u16) (((u16) ((*p_enet_addr)[1])) << 8)) | | ||
| 505 | (u16) (*p_enet_addr)[0])); | ||
| 506 | |||
| 507 | return 0; | 500 | return 0; |
| 508 | } | 501 | } |
| 509 | #endif /* CONFIG_UGETH_FILTERING */ | 502 | #endif /* CONFIG_UGETH_FILTERING */ |
| 510 | 503 | ||
| 511 | static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num) | 504 | static int hw_clear_addr_in_paddr(struct ucc_geth_private *ugeth, u8 paddr_num) |
| 512 | { | 505 | { |
| 513 | ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; | 506 | struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; |
| 514 | 507 | ||
| 515 | if (!(paddr_num < NUM_OF_PADDRS)) { | 508 | if (!(paddr_num < NUM_OF_PADDRS)) { |
| 516 | ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__); | 509 | ugeth_warn("%s: Illagel paddr_num.", __FUNCTION__); |
| @@ -518,7 +511,7 @@ static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num) | |||
| 518 | } | 511 | } |
| 519 | 512 | ||
| 520 | p_82xx_addr_filt = | 513 | p_82xx_addr_filt = |
| 521 | (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> | 514 | (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram-> |
| 522 | addressfiltering; | 515 | addressfiltering; |
| 523 | 516 | ||
| 524 | /* Writing address ff.ff.ff.ff.ff.ff disables address | 517 | /* Writing address ff.ff.ff.ff.ff.ff disables address |
| @@ -530,14 +523,14 @@ static int hw_clear_addr_in_paddr(ucc_geth_private_t *ugeth, u8 paddr_num) | |||
| 530 | return 0; | 523 | return 0; |
| 531 | } | 524 | } |
| 532 | 525 | ||
| 533 | static void hw_add_addr_in_hash(ucc_geth_private_t *ugeth, | 526 | static void hw_add_addr_in_hash(struct ucc_geth_private *ugeth, |
| 534 | enet_addr_t *p_enet_addr) | 527 | u8 *p_enet_addr) |
| 535 | { | 528 | { |
| 536 | ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; | 529 | struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; |
| 537 | u32 cecr_subblock; | 530 | u32 cecr_subblock; |
| 538 | 531 | ||
| 539 | p_82xx_addr_filt = | 532 | p_82xx_addr_filt = |
| 540 | (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> | 533 | (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram-> |
| 541 | addressfiltering; | 534 | addressfiltering; |
| 542 | 535 | ||
| 543 | cecr_subblock = | 536 | cecr_subblock = |
| @@ -546,25 +539,18 @@ static void hw_add_addr_in_hash(ucc_geth_private_t *ugeth, | |||
| 546 | /* Ethernet frames are defined in Little Endian mode, | 539 | /* Ethernet frames are defined in Little Endian mode, |
| 547 | therefor to insert */ | 540 | therefor to insert */ |
| 548 | /* the address to the hash (Big Endian mode), we reverse the bytes.*/ | 541 | /* the address to the hash (Big Endian mode), we reverse the bytes.*/ |
| 549 | out_be16(&p_82xx_addr_filt->taddr.h, | 542 | |
| 550 | (u16) (((u16) (((u16) ((*p_enet_addr)[5])) << 8)) | | 543 | set_mac_addr(&p_82xx_addr_filt->taddr.h, p_enet_addr); |
| 551 | (u16) (*p_enet_addr)[4])); | ||
| 552 | out_be16(&p_82xx_addr_filt->taddr.m, | ||
| 553 | (u16) (((u16) (((u16) ((*p_enet_addr)[3])) << 8)) | | ||
| 554 | (u16) (*p_enet_addr)[2])); | ||
| 555 | out_be16(&p_82xx_addr_filt->taddr.l, | ||
| 556 | (u16) (((u16) (((u16) ((*p_enet_addr)[1])) << 8)) | | ||
| 557 | (u16) (*p_enet_addr)[0])); | ||
| 558 | 544 | ||
| 559 | qe_issue_cmd(QE_SET_GROUP_ADDRESS, cecr_subblock, | 545 | qe_issue_cmd(QE_SET_GROUP_ADDRESS, cecr_subblock, |
| 560 | (u8) QE_CR_PROTOCOL_ETHERNET, 0); | 546 | QE_CR_PROTOCOL_ETHERNET, 0); |
| 561 | } | 547 | } |
| 562 | 548 | ||
| 563 | #ifdef CONFIG_UGETH_MAGIC_PACKET | 549 | #ifdef CONFIG_UGETH_MAGIC_PACKET |
| 564 | static void magic_packet_detection_enable(ucc_geth_private_t *ugeth) | 550 | static void magic_packet_detection_enable(struct ucc_geth_private *ugeth) |
| 565 | { | 551 | { |
| 566 | ucc_fast_private_t *uccf; | 552 | struct ucc_fast_private *uccf; |
| 567 | ucc_geth_t *ug_regs; | 553 | struct ucc_geth *ug_regs; |
| 568 | u32 maccfg2, uccm; | 554 | u32 maccfg2, uccm; |
| 569 | 555 | ||
| 570 | uccf = ugeth->uccf; | 556 | uccf = ugeth->uccf; |
| @@ -581,10 +567,10 @@ static void magic_packet_detection_enable(ucc_geth_private_t *ugeth) | |||
| 581 | out_be32(&ug_regs->maccfg2, maccfg2); | 567 | out_be32(&ug_regs->maccfg2, maccfg2); |
| 582 | } | 568 | } |
| 583 | 569 | ||
| 584 | static void magic_packet_detection_disable(ucc_geth_private_t *ugeth) | 570 | static void magic_packet_detection_disable(struct ucc_geth_private *ugeth) |
| 585 | { | 571 | { |
| 586 | ucc_fast_private_t *uccf; | 572 | struct ucc_fast_private *uccf; |
| 587 | ucc_geth_t *ug_regs; | 573 | struct ucc_geth *ug_regs; |
| 588 | u32 maccfg2, uccm; | 574 | u32 maccfg2, uccm; |
| 589 | 575 | ||
| 590 | uccf = ugeth->uccf; | 576 | uccf = ugeth->uccf; |
| @@ -602,26 +588,26 @@ static void magic_packet_detection_disable(ucc_geth_private_t *ugeth) | |||
| 602 | } | 588 | } |
| 603 | #endif /* MAGIC_PACKET */ | 589 | #endif /* MAGIC_PACKET */ |
| 604 | 590 | ||
| 605 | static inline int compare_addr(enet_addr_t *addr1, enet_addr_t *addr2) | 591 | static inline int compare_addr(u8 **addr1, u8 **addr2) |
| 606 | { | 592 | { |
| 607 | return memcmp(addr1, addr2, ENET_NUM_OCTETS_PER_ADDRESS); | 593 | return memcmp(addr1, addr2, ENET_NUM_OCTETS_PER_ADDRESS); |
| 608 | } | 594 | } |
| 609 | 595 | ||
| 610 | #ifdef DEBUG | 596 | #ifdef DEBUG |
| 611 | static void get_statistics(ucc_geth_private_t *ugeth, | 597 | static void get_statistics(struct ucc_geth_private *ugeth, |
| 612 | ucc_geth_tx_firmware_statistics_t * | 598 | struct ucc_geth_tx_firmware_statistics * |
| 613 | tx_firmware_statistics, | 599 | tx_firmware_statistics, |
| 614 | ucc_geth_rx_firmware_statistics_t * | 600 | struct ucc_geth_rx_firmware_statistics * |
| 615 | rx_firmware_statistics, | 601 | rx_firmware_statistics, |
| 616 | ucc_geth_hardware_statistics_t *hardware_statistics) | 602 | struct ucc_geth_hardware_statistics *hardware_statistics) |
| 617 | { | 603 | { |
| 618 | ucc_fast_t *uf_regs; | 604 | struct ucc_fast *uf_regs; |
| 619 | ucc_geth_t *ug_regs; | 605 | struct ucc_geth *ug_regs; |
| 620 | ucc_geth_tx_firmware_statistics_pram_t *p_tx_fw_statistics_pram; | 606 | struct ucc_geth_tx_firmware_statistics_pram *p_tx_fw_statistics_pram; |
| 621 | ucc_geth_rx_firmware_statistics_pram_t *p_rx_fw_statistics_pram; | 607 | struct ucc_geth_rx_firmware_statistics_pram *p_rx_fw_statistics_pram; |
| 622 | 608 | ||
| 623 | ug_regs = ugeth->ug_regs; | 609 | ug_regs = ugeth->ug_regs; |
| 624 | uf_regs = (ucc_fast_t *) ug_regs; | 610 | uf_regs = (struct ucc_fast *) ug_regs; |
| 625 | p_tx_fw_statistics_pram = ugeth->p_tx_fw_statistics_pram; | 611 | p_tx_fw_statistics_pram = ugeth->p_tx_fw_statistics_pram; |
| 626 | p_rx_fw_statistics_pram = ugeth->p_rx_fw_statistics_pram; | 612 | p_rx_fw_statistics_pram = ugeth->p_rx_fw_statistics_pram; |
| 627 | 613 | ||
| @@ -727,7 +713,7 @@ static void get_statistics(ucc_geth_private_t *ugeth, | |||
| 727 | } | 713 | } |
| 728 | } | 714 | } |
| 729 | 715 | ||
| 730 | static void dump_bds(ucc_geth_private_t *ugeth) | 716 | static void dump_bds(struct ucc_geth_private *ugeth) |
| 731 | { | 717 | { |
| 732 | int i; | 718 | int i; |
| 733 | int length; | 719 | int length; |
| @@ -736,7 +722,7 @@ static void dump_bds(ucc_geth_private_t *ugeth) | |||
| 736 | if (ugeth->p_tx_bd_ring[i]) { | 722 | if (ugeth->p_tx_bd_ring[i]) { |
| 737 | length = | 723 | length = |
| 738 | (ugeth->ug_info->bdRingLenTx[i] * | 724 | (ugeth->ug_info->bdRingLenTx[i] * |
| 739 | UCC_GETH_SIZE_OF_BD); | 725 | sizeof(struct qe_bd)); |
| 740 | ugeth_info("TX BDs[%d]", i); | 726 | ugeth_info("TX BDs[%d]", i); |
| 741 | mem_disp(ugeth->p_tx_bd_ring[i], length); | 727 | mem_disp(ugeth->p_tx_bd_ring[i], length); |
| 742 | } | 728 | } |
| @@ -745,14 +731,14 @@ static void dump_bds(ucc_geth_private_t *ugeth) | |||
| 745 | if (ugeth->p_rx_bd_ring[i]) { | 731 | if (ugeth->p_rx_bd_ring[i]) { |
| 746 | length = | 732 | length = |
| 747 | (ugeth->ug_info->bdRingLenRx[i] * | 733 | (ugeth->ug_info->bdRingLenRx[i] * |
| 748 | UCC_GETH_SIZE_OF_BD); | 734 | sizeof(struct qe_bd)); |
| 749 | ugeth_info("RX BDs[%d]", i); | 735 | ugeth_info("RX BDs[%d]", i); |
| 750 | mem_disp(ugeth->p_rx_bd_ring[i], length); | 736 | mem_disp(ugeth->p_rx_bd_ring[i], length); |
| 751 | } | 737 | } |
| 752 | } | 738 | } |
| 753 | } | 739 | } |
| 754 | 740 | ||
| 755 | static void dump_regs(ucc_geth_private_t *ugeth) | 741 | static void dump_regs(struct ucc_geth_private *ugeth) |
| 756 | { | 742 | { |
| 757 | int i; | 743 | int i; |
| 758 | 744 | ||
| @@ -893,7 +879,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) | |||
| 893 | ugeth_info("Base address: 0x%08x", | 879 | ugeth_info("Base address: 0x%08x", |
| 894 | (u32) & ugeth->p_thread_data_tx[i]); | 880 | (u32) & ugeth->p_thread_data_tx[i]); |
| 895 | mem_disp((u8 *) & ugeth->p_thread_data_tx[i], | 881 | mem_disp((u8 *) & ugeth->p_thread_data_tx[i], |
| 896 | sizeof(ucc_geth_thread_data_tx_t)); | 882 | sizeof(struct ucc_geth_thread_data_tx)); |
| 897 | } | 883 | } |
| 898 | } | 884 | } |
| 899 | if (ugeth->p_thread_data_rx) { | 885 | if (ugeth->p_thread_data_rx) { |
| @@ -927,7 +913,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) | |||
| 927 | ugeth_info("Base address: 0x%08x", | 913 | ugeth_info("Base address: 0x%08x", |
| 928 | (u32) & ugeth->p_thread_data_rx[i]); | 914 | (u32) & ugeth->p_thread_data_rx[i]); |
| 929 | mem_disp((u8 *) & ugeth->p_thread_data_rx[i], | 915 | mem_disp((u8 *) & ugeth->p_thread_data_rx[i], |
| 930 | sizeof(ucc_geth_thread_data_rx_t)); | 916 | sizeof(struct ucc_geth_thread_data_rx)); |
| 931 | } | 917 | } |
| 932 | } | 918 | } |
| 933 | if (ugeth->p_exf_glbl_param) { | 919 | if (ugeth->p_exf_glbl_param) { |
| @@ -1105,7 +1091,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) | |||
| 1105 | ugeth_info("Base address: 0x%08x", | 1091 | ugeth_info("Base address: 0x%08x", |
| 1106 | (u32) & ugeth->p_send_q_mem_reg->sqqd[i]); | 1092 | (u32) & ugeth->p_send_q_mem_reg->sqqd[i]); |
| 1107 | mem_disp((u8 *) & ugeth->p_send_q_mem_reg->sqqd[i], | 1093 | mem_disp((u8 *) & ugeth->p_send_q_mem_reg->sqqd[i], |
| 1108 | sizeof(ucc_geth_send_queue_qd_t)); | 1094 | sizeof(struct ucc_geth_send_queue_qd)); |
| 1109 | } | 1095 | } |
| 1110 | } | 1096 | } |
| 1111 | if (ugeth->p_scheduler) { | 1097 | if (ugeth->p_scheduler) { |
| @@ -1187,7 +1173,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) | |||
| 1187 | qe_muram_addr(in_be32 | 1173 | qe_muram_addr(in_be32 |
| 1188 | (&ugeth->p_rx_bd_qs_tbl[i]. | 1174 | (&ugeth->p_rx_bd_qs_tbl[i]. |
| 1189 | bdbaseptr)), | 1175 | bdbaseptr)), |
| 1190 | sizeof(ucc_geth_rx_prefetched_bds_t)); | 1176 | sizeof(struct ucc_geth_rx_prefetched_bds)); |
| 1191 | } | 1177 | } |
| 1192 | } | 1178 | } |
| 1193 | if (ugeth->p_init_enet_param_shadow) { | 1179 | if (ugeth->p_init_enet_param_shadow) { |
| @@ -1198,7 +1184,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) | |||
| 1198 | mem_disp((u8 *) ugeth->p_init_enet_param_shadow, | 1184 | mem_disp((u8 *) ugeth->p_init_enet_param_shadow, |
| 1199 | sizeof(*ugeth->p_init_enet_param_shadow)); | 1185 | sizeof(*ugeth->p_init_enet_param_shadow)); |
| 1200 | 1186 | ||
| 1201 | size = sizeof(ucc_geth_thread_rx_pram_t); | 1187 | size = sizeof(struct ucc_geth_thread_rx_pram); |
| 1202 | if (ugeth->ug_info->rxExtendedFiltering) { | 1188 | if (ugeth->ug_info->rxExtendedFiltering) { |
| 1203 | size += | 1189 | size += |
| 1204 | THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING; | 1190 | THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING; |
| @@ -1216,7 +1202,7 @@ static void dump_regs(ucc_geth_private_t *ugeth) | |||
| 1216 | &(ugeth->p_init_enet_param_shadow-> | 1202 | &(ugeth->p_init_enet_param_shadow-> |
| 1217 | txthread[0]), | 1203 | txthread[0]), |
| 1218 | ENET_INIT_PARAM_MAX_ENTRIES_TX, | 1204 | ENET_INIT_PARAM_MAX_ENTRIES_TX, |
| 1219 | sizeof(ucc_geth_thread_tx_pram_t), | 1205 | sizeof(struct ucc_geth_thread_tx_pram), |
| 1220 | ugeth->ug_info->riscTx, 0); | 1206 | ugeth->ug_info->riscTx, 0); |
| 1221 | dump_init_enet_entries(ugeth, | 1207 | dump_init_enet_entries(ugeth, |
| 1222 | &(ugeth->p_init_enet_param_shadow-> | 1208 | &(ugeth->p_init_enet_param_shadow-> |
| @@ -1578,12 +1564,12 @@ static int init_min_frame_len(u16 min_frame_length, | |||
| 1578 | return 0; | 1564 | return 0; |
| 1579 | } | 1565 | } |
| 1580 | 1566 | ||
| 1581 | static int adjust_enet_interface(ucc_geth_private_t *ugeth) | 1567 | static int adjust_enet_interface(struct ucc_geth_private *ugeth) |
| 1582 | { | 1568 | { |
| 1583 | ucc_geth_info_t *ug_info; | 1569 | struct ucc_geth_info *ug_info; |
| 1584 | ucc_geth_t *ug_regs; | 1570 | struct ucc_geth *ug_regs; |
| 1585 | ucc_fast_t *uf_regs; | 1571 | struct ucc_fast *uf_regs; |
| 1586 | enet_speed_e speed; | 1572 | enum enet_speed speed; |
| 1587 | int ret_val, rpm = 0, tbi = 0, r10m = 0, rmm = | 1573 | int ret_val, rpm = 0, tbi = 0, r10m = 0, rmm = |
| 1588 | 0, limited_to_full_duplex = 0; | 1574 | 0, limited_to_full_duplex = 0; |
| 1589 | u32 upsmr, maccfg2, utbipar, tbiBaseAddress; | 1575 | u32 upsmr, maccfg2, utbipar, tbiBaseAddress; |
| @@ -1691,8 +1677,8 @@ static int adjust_enet_interface(ucc_geth_private_t *ugeth) | |||
| 1691 | */ | 1677 | */ |
| 1692 | static void adjust_link(struct net_device *dev) | 1678 | static void adjust_link(struct net_device *dev) |
| 1693 | { | 1679 | { |
| 1694 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 1680 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 1695 | ucc_geth_t *ug_regs; | 1681 | struct ucc_geth *ug_regs; |
| 1696 | u32 tempval; | 1682 | u32 tempval; |
| 1697 | struct ugeth_mii_info *mii_info = ugeth->mii_info; | 1683 | struct ugeth_mii_info *mii_info = ugeth->mii_info; |
| 1698 | 1684 | ||
| @@ -1722,7 +1708,7 @@ static void adjust_link(struct net_device *dev) | |||
| 1722 | if (mii_info->speed != ugeth->oldspeed) { | 1708 | if (mii_info->speed != ugeth->oldspeed) { |
| 1723 | switch (mii_info->speed) { | 1709 | switch (mii_info->speed) { |
| 1724 | case 1000: | 1710 | case 1000: |
| 1725 | #ifdef CONFIG_MPC836x | 1711 | #ifdef CONFIG_PPC_MPC836x |
| 1726 | /* FIXME: This code is for 100Mbs BUG fixing, | 1712 | /* FIXME: This code is for 100Mbs BUG fixing, |
| 1727 | remove this when it is fixed!!! */ | 1713 | remove this when it is fixed!!! */ |
| 1728 | if (ugeth->ug_info->enet_interface == | 1714 | if (ugeth->ug_info->enet_interface == |
| @@ -1768,7 +1754,7 @@ remove this when it is fixed!!! */ | |||
| 1768 | break; | 1754 | break; |
| 1769 | case 100: | 1755 | case 100: |
| 1770 | case 10: | 1756 | case 10: |
| 1771 | #ifdef CONFIG_MPC836x | 1757 | #ifdef CONFIG_PPC_MPC836x |
| 1772 | /* FIXME: This code is for 100Mbs BUG fixing, | 1758 | /* FIXME: This code is for 100Mbs BUG fixing, |
| 1773 | remove this lines when it will be fixed!!! */ | 1759 | remove this lines when it will be fixed!!! */ |
| 1774 | ugeth->ug_info->enet_interface = ENET_100_RGMII; | 1760 | ugeth->ug_info->enet_interface = ENET_100_RGMII; |
| @@ -1827,9 +1813,9 @@ remove this lines when it will be fixed!!! */ | |||
| 1827 | */ | 1813 | */ |
| 1828 | static int init_phy(struct net_device *dev) | 1814 | static int init_phy(struct net_device *dev) |
| 1829 | { | 1815 | { |
| 1830 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 1816 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 1831 | struct phy_info *curphy; | 1817 | struct phy_info *curphy; |
| 1832 | ucc_mii_mng_t *mii_regs; | 1818 | struct ucc_mii_mng *mii_regs; |
| 1833 | struct ugeth_mii_info *mii_info; | 1819 | struct ugeth_mii_info *mii_info; |
| 1834 | int err; | 1820 | int err; |
| 1835 | 1821 | ||
| @@ -1914,17 +1900,17 @@ static int init_phy(struct net_device *dev) | |||
| 1914 | } | 1900 | } |
| 1915 | 1901 | ||
| 1916 | #ifdef CONFIG_UGETH_TX_ON_DEMOND | 1902 | #ifdef CONFIG_UGETH_TX_ON_DEMOND |
| 1917 | static int ugeth_transmit_on_demand(ucc_geth_private_t *ugeth) | 1903 | static int ugeth_transmit_on_demand(struct ucc_geth_private *ugeth) |
| 1918 | { | 1904 | { |
| 1919 | ucc_fast_transmit_on_demand(ugeth->uccf); | 1905 | struct ucc_fastransmit_on_demand(ugeth->uccf); |
| 1920 | 1906 | ||
| 1921 | return 0; | 1907 | return 0; |
| 1922 | } | 1908 | } |
| 1923 | #endif | 1909 | #endif |
| 1924 | 1910 | ||
| 1925 | static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth) | 1911 | static int ugeth_graceful_stop_tx(struct ucc_geth_private *ugeth) |
| 1926 | { | 1912 | { |
| 1927 | ucc_fast_private_t *uccf; | 1913 | struct ucc_fast_private *uccf; |
| 1928 | u32 cecr_subblock; | 1914 | u32 cecr_subblock; |
| 1929 | u32 temp; | 1915 | u32 temp; |
| 1930 | 1916 | ||
| @@ -1940,7 +1926,7 @@ static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth) | |||
| 1940 | cecr_subblock = | 1926 | cecr_subblock = |
| 1941 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); | 1927 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); |
| 1942 | qe_issue_cmd(QE_GRACEFUL_STOP_TX, cecr_subblock, | 1928 | qe_issue_cmd(QE_GRACEFUL_STOP_TX, cecr_subblock, |
| 1943 | (u8) QE_CR_PROTOCOL_ETHERNET, 0); | 1929 | QE_CR_PROTOCOL_ETHERNET, 0); |
| 1944 | 1930 | ||
| 1945 | /* Wait for command to complete */ | 1931 | /* Wait for command to complete */ |
| 1946 | do { | 1932 | do { |
| @@ -1952,9 +1938,9 @@ static int ugeth_graceful_stop_tx(ucc_geth_private_t *ugeth) | |||
| 1952 | return 0; | 1938 | return 0; |
| 1953 | } | 1939 | } |
| 1954 | 1940 | ||
| 1955 | static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth) | 1941 | static int ugeth_graceful_stop_rx(struct ucc_geth_private * ugeth) |
| 1956 | { | 1942 | { |
| 1957 | ucc_fast_private_t *uccf; | 1943 | struct ucc_fast_private *uccf; |
| 1958 | u32 cecr_subblock; | 1944 | u32 cecr_subblock; |
| 1959 | u8 temp; | 1945 | u8 temp; |
| 1960 | 1946 | ||
| @@ -1973,7 +1959,7 @@ static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth) | |||
| 1973 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info. | 1959 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info. |
| 1974 | ucc_num); | 1960 | ucc_num); |
| 1975 | qe_issue_cmd(QE_GRACEFUL_STOP_RX, cecr_subblock, | 1961 | qe_issue_cmd(QE_GRACEFUL_STOP_RX, cecr_subblock, |
| 1976 | (u8) QE_CR_PROTOCOL_ETHERNET, 0); | 1962 | QE_CR_PROTOCOL_ETHERNET, 0); |
| 1977 | 1963 | ||
| 1978 | temp = ugeth->p_rx_glbl_pram->rxgstpack; | 1964 | temp = ugeth->p_rx_glbl_pram->rxgstpack; |
| 1979 | } while (!(temp & GRACEFUL_STOP_ACKNOWLEDGE_RX)); | 1965 | } while (!(temp & GRACEFUL_STOP_ACKNOWLEDGE_RX)); |
| @@ -1983,41 +1969,40 @@ static int ugeth_graceful_stop_rx(ucc_geth_private_t * ugeth) | |||
| 1983 | return 0; | 1969 | return 0; |
| 1984 | } | 1970 | } |
| 1985 | 1971 | ||
| 1986 | static int ugeth_restart_tx(ucc_geth_private_t *ugeth) | 1972 | static int ugeth_restart_tx(struct ucc_geth_private *ugeth) |
| 1987 | { | 1973 | { |
| 1988 | ucc_fast_private_t *uccf; | 1974 | struct ucc_fast_private *uccf; |
| 1989 | u32 cecr_subblock; | 1975 | u32 cecr_subblock; |
| 1990 | 1976 | ||
| 1991 | uccf = ugeth->uccf; | 1977 | uccf = ugeth->uccf; |
| 1992 | 1978 | ||
| 1993 | cecr_subblock = | 1979 | cecr_subblock = |
| 1994 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); | 1980 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); |
| 1995 | qe_issue_cmd(QE_RESTART_TX, cecr_subblock, (u8) QE_CR_PROTOCOL_ETHERNET, | 1981 | qe_issue_cmd(QE_RESTART_TX, cecr_subblock, QE_CR_PROTOCOL_ETHERNET, 0); |
| 1996 | 0); | ||
| 1997 | uccf->stopped_tx = 0; | 1982 | uccf->stopped_tx = 0; |
| 1998 | 1983 | ||
| 1999 | return 0; | 1984 | return 0; |
| 2000 | } | 1985 | } |
| 2001 | 1986 | ||
| 2002 | static int ugeth_restart_rx(ucc_geth_private_t *ugeth) | 1987 | static int ugeth_restart_rx(struct ucc_geth_private *ugeth) |
| 2003 | { | 1988 | { |
| 2004 | ucc_fast_private_t *uccf; | 1989 | struct ucc_fast_private *uccf; |
| 2005 | u32 cecr_subblock; | 1990 | u32 cecr_subblock; |
| 2006 | 1991 | ||
| 2007 | uccf = ugeth->uccf; | 1992 | uccf = ugeth->uccf; |
| 2008 | 1993 | ||
| 2009 | cecr_subblock = | 1994 | cecr_subblock = |
| 2010 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); | 1995 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); |
| 2011 | qe_issue_cmd(QE_RESTART_RX, cecr_subblock, (u8) QE_CR_PROTOCOL_ETHERNET, | 1996 | qe_issue_cmd(QE_RESTART_RX, cecr_subblock, QE_CR_PROTOCOL_ETHERNET, |
| 2012 | 0); | 1997 | 0); |
| 2013 | uccf->stopped_rx = 0; | 1998 | uccf->stopped_rx = 0; |
| 2014 | 1999 | ||
| 2015 | return 0; | 2000 | return 0; |
| 2016 | } | 2001 | } |
| 2017 | 2002 | ||
| 2018 | static int ugeth_enable(ucc_geth_private_t *ugeth, comm_dir_e mode) | 2003 | static int ugeth_enable(struct ucc_geth_private *ugeth, enum comm_dir mode) |
| 2019 | { | 2004 | { |
| 2020 | ucc_fast_private_t *uccf; | 2005 | struct ucc_fast_private *uccf; |
| 2021 | int enabled_tx, enabled_rx; | 2006 | int enabled_tx, enabled_rx; |
| 2022 | 2007 | ||
| 2023 | uccf = ugeth->uccf; | 2008 | uccf = ugeth->uccf; |
| @@ -2044,9 +2029,9 @@ static int ugeth_enable(ucc_geth_private_t *ugeth, comm_dir_e mode) | |||
| 2044 | 2029 | ||
| 2045 | } | 2030 | } |
| 2046 | 2031 | ||
| 2047 | static int ugeth_disable(ucc_geth_private_t * ugeth, comm_dir_e mode) | 2032 | static int ugeth_disable(struct ucc_geth_private * ugeth, enum comm_dir mode) |
| 2048 | { | 2033 | { |
| 2049 | ucc_fast_private_t *uccf; | 2034 | struct ucc_fast_private *uccf; |
| 2050 | 2035 | ||
| 2051 | uccf = ugeth->uccf; | 2036 | uccf = ugeth->uccf; |
| 2052 | 2037 | ||
| @@ -2069,7 +2054,7 @@ static int ugeth_disable(ucc_geth_private_t * ugeth, comm_dir_e mode) | |||
| 2069 | return 0; | 2054 | return 0; |
| 2070 | } | 2055 | } |
| 2071 | 2056 | ||
| 2072 | static void ugeth_dump_regs(ucc_geth_private_t *ugeth) | 2057 | static void ugeth_dump_regs(struct ucc_geth_private *ugeth) |
| 2073 | { | 2058 | { |
| 2074 | #ifdef DEBUG | 2059 | #ifdef DEBUG |
| 2075 | ucc_fast_dump_regs(ugeth->uccf); | 2060 | ucc_fast_dump_regs(ugeth->uccf); |
| @@ -2079,9 +2064,9 @@ static void ugeth_dump_regs(ucc_geth_private_t *ugeth) | |||
| 2079 | } | 2064 | } |
| 2080 | 2065 | ||
| 2081 | #ifdef CONFIG_UGETH_FILTERING | 2066 | #ifdef CONFIG_UGETH_FILTERING |
| 2082 | static int ugeth_ext_filtering_serialize_tad(ucc_geth_tad_params_t * | 2067 | static int ugeth_ext_filtering_serialize_tad(struct ucc_geth_tad_params * |
| 2083 | p_UccGethTadParams, | 2068 | p_UccGethTadParams, |
| 2084 | qe_fltr_tad_t *qe_fltr_tad) | 2069 | struct qe_fltr_tad *qe_fltr_tad) |
| 2085 | { | 2070 | { |
| 2086 | u16 temp; | 2071 | u16 temp; |
| 2087 | 2072 | ||
| @@ -2119,11 +2104,11 @@ static int ugeth_ext_filtering_serialize_tad(ucc_geth_tad_params_t * | |||
| 2119 | return 0; | 2104 | return 0; |
| 2120 | } | 2105 | } |
| 2121 | 2106 | ||
| 2122 | static enet_addr_container_t | 2107 | static struct enet_addr_container_t |
| 2123 | *ugeth_82xx_filtering_get_match_addr_in_hash(ucc_geth_private_t *ugeth, | 2108 | *ugeth_82xx_filtering_get_match_addr_in_hash(struct ucc_geth_private *ugeth, |
| 2124 | enet_addr_t *p_enet_addr) | 2109 | struct enet_addr *p_enet_addr) |
| 2125 | { | 2110 | { |
| 2126 | enet_addr_container_t *enet_addr_cont; | 2111 | struct enet_addr_container *enet_addr_cont; |
| 2127 | struct list_head *p_lh; | 2112 | struct list_head *p_lh; |
| 2128 | u16 i, num; | 2113 | u16 i, num; |
| 2129 | int32_t j; | 2114 | int32_t j; |
| @@ -2144,7 +2129,7 @@ static enet_addr_container_t | |||
| 2144 | 2129 | ||
| 2145 | for (i = 0; i < num; i++) { | 2130 | for (i = 0; i < num; i++) { |
| 2146 | enet_addr_cont = | 2131 | enet_addr_cont = |
| 2147 | (enet_addr_container_t *) | 2132 | (struct enet_addr_container *) |
| 2148 | ENET_ADDR_CONT_ENTRY(dequeue(p_lh)); | 2133 | ENET_ADDR_CONT_ENTRY(dequeue(p_lh)); |
| 2149 | for (j = ENET_NUM_OCTETS_PER_ADDRESS - 1; j >= 0; j--) { | 2134 | for (j = ENET_NUM_OCTETS_PER_ADDRESS - 1; j >= 0; j--) { |
| 2150 | if ((*p_enet_addr)[j] != (enet_addr_cont->address)[j]) | 2135 | if ((*p_enet_addr)[j] != (enet_addr_cont->address)[j]) |
| @@ -2157,11 +2142,11 @@ static enet_addr_container_t | |||
| 2157 | return NULL; | 2142 | return NULL; |
| 2158 | } | 2143 | } |
| 2159 | 2144 | ||
| 2160 | static int ugeth_82xx_filtering_add_addr_in_hash(ucc_geth_private_t *ugeth, | 2145 | static int ugeth_82xx_filtering_add_addr_in_hash(struct ucc_geth_private *ugeth, |
| 2161 | enet_addr_t *p_enet_addr) | 2146 | struct enet_addr *p_enet_addr) |
| 2162 | { | 2147 | { |
| 2163 | ucc_geth_enet_address_recognition_location_e location; | 2148 | enum ucc_geth_enet_address_recognition_location location; |
| 2164 | enet_addr_container_t *enet_addr_cont; | 2149 | struct enet_addr_container *enet_addr_cont; |
| 2165 | struct list_head *p_lh; | 2150 | struct list_head *p_lh; |
| 2166 | u8 i; | 2151 | u8 i; |
| 2167 | u32 limit; | 2152 | u32 limit; |
| @@ -2196,18 +2181,17 @@ static int ugeth_82xx_filtering_add_addr_in_hash(ucc_geth_private_t *ugeth, | |||
| 2196 | enqueue(p_lh, &enet_addr_cont->node); /* Put it back */ | 2181 | enqueue(p_lh, &enet_addr_cont->node); /* Put it back */ |
| 2197 | ++(*p_counter); | 2182 | ++(*p_counter); |
| 2198 | 2183 | ||
| 2199 | hw_add_addr_in_hash(ugeth, &(enet_addr_cont->address)); | 2184 | hw_add_addr_in_hash(ugeth, enet_addr_cont->address); |
| 2200 | |||
| 2201 | return 0; | 2185 | return 0; |
| 2202 | } | 2186 | } |
| 2203 | 2187 | ||
| 2204 | static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth, | 2188 | static int ugeth_82xx_filtering_clear_addr_in_hash(struct ucc_geth_private *ugeth, |
| 2205 | enet_addr_t *p_enet_addr) | 2189 | struct enet_addr *p_enet_addr) |
| 2206 | { | 2190 | { |
| 2207 | ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; | 2191 | struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; |
| 2208 | enet_addr_container_t *enet_addr_cont; | 2192 | struct enet_addr_container *enet_addr_cont; |
| 2209 | ucc_fast_private_t *uccf; | 2193 | struct ucc_fast_private *uccf; |
| 2210 | comm_dir_e comm_dir; | 2194 | enum comm_dir comm_dir; |
| 2211 | u16 i, num; | 2195 | u16 i, num; |
| 2212 | struct list_head *p_lh; | 2196 | struct list_head *p_lh; |
| 2213 | u32 *addr_h, *addr_l; | 2197 | u32 *addr_h, *addr_l; |
| @@ -2216,7 +2200,7 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth, | |||
| 2216 | uccf = ugeth->uccf; | 2200 | uccf = ugeth->uccf; |
| 2217 | 2201 | ||
| 2218 | p_82xx_addr_filt = | 2202 | p_82xx_addr_filt = |
| 2219 | (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> | 2203 | (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram-> |
| 2220 | addressfiltering; | 2204 | addressfiltering; |
| 2221 | 2205 | ||
| 2222 | if (! | 2206 | if (! |
| @@ -2256,9 +2240,9 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth, | |||
| 2256 | num = --(*p_counter); | 2240 | num = --(*p_counter); |
| 2257 | for (i = 0; i < num; i++) { | 2241 | for (i = 0; i < num; i++) { |
| 2258 | enet_addr_cont = | 2242 | enet_addr_cont = |
| 2259 | (enet_addr_container_t *) | 2243 | (struct enet_addr_container *) |
| 2260 | ENET_ADDR_CONT_ENTRY(dequeue(p_lh)); | 2244 | ENET_ADDR_CONT_ENTRY(dequeue(p_lh)); |
| 2261 | hw_add_addr_in_hash(ugeth, &(enet_addr_cont->address)); | 2245 | hw_add_addr_in_hash(ugeth, enet_addr_cont->address); |
| 2262 | enqueue(p_lh, &enet_addr_cont->node); /* Put it back */ | 2246 | enqueue(p_lh, &enet_addr_cont->node); /* Put it back */ |
| 2263 | } | 2247 | } |
| 2264 | 2248 | ||
| @@ -2269,14 +2253,14 @@ static int ugeth_82xx_filtering_clear_addr_in_hash(ucc_geth_private_t *ugeth, | |||
| 2269 | } | 2253 | } |
| 2270 | #endif /* CONFIG_UGETH_FILTERING */ | 2254 | #endif /* CONFIG_UGETH_FILTERING */ |
| 2271 | 2255 | ||
| 2272 | static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t * | 2256 | static int ugeth_82xx_filtering_clear_all_addr_in_hash(struct ucc_geth_private * |
| 2273 | ugeth, | 2257 | ugeth, |
| 2274 | enet_addr_type_e | 2258 | enum enet_addr_type |
| 2275 | enet_addr_type) | 2259 | enet_addr_type) |
| 2276 | { | 2260 | { |
| 2277 | ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; | 2261 | struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; |
| 2278 | ucc_fast_private_t *uccf; | 2262 | struct ucc_fast_private *uccf; |
| 2279 | comm_dir_e comm_dir; | 2263 | enum comm_dir comm_dir; |
| 2280 | struct list_head *p_lh; | 2264 | struct list_head *p_lh; |
| 2281 | u16 i, num; | 2265 | u16 i, num; |
| 2282 | u32 *addr_h, *addr_l; | 2266 | u32 *addr_h, *addr_l; |
| @@ -2285,7 +2269,7 @@ static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t * | |||
| 2285 | uccf = ugeth->uccf; | 2269 | uccf = ugeth->uccf; |
| 2286 | 2270 | ||
| 2287 | p_82xx_addr_filt = | 2271 | p_82xx_addr_filt = |
| 2288 | (ucc_geth_82xx_address_filtering_pram_t *) ugeth->p_rx_glbl_pram-> | 2272 | (struct ucc_geth_82xx_address_filtering_pram *) ugeth->p_rx_glbl_pram-> |
| 2289 | addressfiltering; | 2273 | addressfiltering; |
| 2290 | 2274 | ||
| 2291 | if (enet_addr_type == ENET_ADDR_TYPE_GROUP) { | 2275 | if (enet_addr_type == ENET_ADDR_TYPE_GROUP) { |
| @@ -2331,8 +2315,8 @@ static int ugeth_82xx_filtering_clear_all_addr_in_hash(ucc_geth_private_t * | |||
| 2331 | } | 2315 | } |
| 2332 | 2316 | ||
| 2333 | #ifdef CONFIG_UGETH_FILTERING | 2317 | #ifdef CONFIG_UGETH_FILTERING |
| 2334 | static int ugeth_82xx_filtering_add_addr_in_paddr(ucc_geth_private_t *ugeth, | 2318 | static int ugeth_82xx_filtering_add_addr_in_paddr(struct ucc_geth_private *ugeth, |
| 2335 | enet_addr_t *p_enet_addr, | 2319 | struct enet_addr *p_enet_addr, |
| 2336 | u8 paddr_num) | 2320 | u8 paddr_num) |
| 2337 | { | 2321 | { |
| 2338 | int i; | 2322 | int i; |
| @@ -2352,14 +2336,14 @@ static int ugeth_82xx_filtering_add_addr_in_paddr(ucc_geth_private_t *ugeth, | |||
| 2352 | } | 2336 | } |
| 2353 | #endif /* CONFIG_UGETH_FILTERING */ | 2337 | #endif /* CONFIG_UGETH_FILTERING */ |
| 2354 | 2338 | ||
| 2355 | static int ugeth_82xx_filtering_clear_addr_in_paddr(ucc_geth_private_t *ugeth, | 2339 | static int ugeth_82xx_filtering_clear_addr_in_paddr(struct ucc_geth_private *ugeth, |
| 2356 | u8 paddr_num) | 2340 | u8 paddr_num) |
| 2357 | { | 2341 | { |
| 2358 | ugeth->indAddrRegUsed[paddr_num] = 0; /* mark this paddr as not used */ | 2342 | ugeth->indAddrRegUsed[paddr_num] = 0; /* mark this paddr as not used */ |
| 2359 | return hw_clear_addr_in_paddr(ugeth, paddr_num);/* clear in hardware */ | 2343 | return hw_clear_addr_in_paddr(ugeth, paddr_num);/* clear in hardware */ |
| 2360 | } | 2344 | } |
| 2361 | 2345 | ||
| 2362 | static void ucc_geth_memclean(ucc_geth_private_t *ugeth) | 2346 | static void ucc_geth_memclean(struct ucc_geth_private *ugeth) |
| 2363 | { | 2347 | { |
| 2364 | u16 i, j; | 2348 | u16 i, j; |
| 2365 | u8 *bd; | 2349 | u8 *bd; |
| @@ -2433,8 +2417,8 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth) | |||
| 2433 | for (j = 0; j < ugeth->ug_info->bdRingLenTx[i]; j++) { | 2417 | for (j = 0; j < ugeth->ug_info->bdRingLenTx[i]; j++) { |
| 2434 | if (ugeth->tx_skbuff[i][j]) { | 2418 | if (ugeth->tx_skbuff[i][j]) { |
| 2435 | dma_unmap_single(NULL, | 2419 | dma_unmap_single(NULL, |
| 2436 | BD_BUFFER_ARG(bd), | 2420 | ((qe_bd_t *)bd)->buf, |
| 2437 | (BD_STATUS_AND_LENGTH(bd) & | 2421 | (in_be32((u32 *)bd) & |
| 2438 | BD_LENGTH_MASK), | 2422 | BD_LENGTH_MASK), |
| 2439 | DMA_TO_DEVICE); | 2423 | DMA_TO_DEVICE); |
| 2440 | dev_kfree_skb_any(ugeth->tx_skbuff[i][j]); | 2424 | dev_kfree_skb_any(ugeth->tx_skbuff[i][j]); |
| @@ -2460,18 +2444,17 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth) | |||
| 2460 | bd = ugeth->p_rx_bd_ring[i]; | 2444 | bd = ugeth->p_rx_bd_ring[i]; |
| 2461 | for (j = 0; j < ugeth->ug_info->bdRingLenRx[i]; j++) { | 2445 | for (j = 0; j < ugeth->ug_info->bdRingLenRx[i]; j++) { |
| 2462 | if (ugeth->rx_skbuff[i][j]) { | 2446 | if (ugeth->rx_skbuff[i][j]) { |
| 2463 | dma_unmap_single(NULL, BD_BUFFER(bd), | 2447 | dma_unmap_single(NULL, |
| 2464 | ugeth->ug_info-> | 2448 | ((struct qe_bd *)bd)->buf, |
| 2465 | uf_info. | 2449 | ugeth->ug_info-> |
| 2466 | max_rx_buf_length + | 2450 | uf_info.max_rx_buf_length + |
| 2467 | UCC_GETH_RX_DATA_BUF_ALIGNMENT, | 2451 | UCC_GETH_RX_DATA_BUF_ALIGNMENT, |
| 2468 | DMA_FROM_DEVICE); | 2452 | DMA_FROM_DEVICE); |
| 2469 | 2453 | dev_kfree_skb_any( | |
| 2470 | dev_kfree_skb_any(ugeth-> | 2454 | ugeth->rx_skbuff[i][j]); |
| 2471 | rx_skbuff[i][j]); | ||
| 2472 | ugeth->rx_skbuff[i][j] = NULL; | 2455 | ugeth->rx_skbuff[i][j] = NULL; |
| 2473 | } | 2456 | } |
| 2474 | bd += UCC_GETH_SIZE_OF_BD; | 2457 | bd += sizeof(struct qe_bd); |
| 2475 | } | 2458 | } |
| 2476 | 2459 | ||
| 2477 | kfree(ugeth->rx_skbuff[i]); | 2460 | kfree(ugeth->rx_skbuff[i]); |
| @@ -2496,11 +2479,11 @@ static void ucc_geth_memclean(ucc_geth_private_t *ugeth) | |||
| 2496 | 2479 | ||
| 2497 | static void ucc_geth_set_multi(struct net_device *dev) | 2480 | static void ucc_geth_set_multi(struct net_device *dev) |
| 2498 | { | 2481 | { |
| 2499 | ucc_geth_private_t *ugeth; | 2482 | struct ucc_geth_private *ugeth; |
| 2500 | struct dev_mc_list *dmi; | 2483 | struct dev_mc_list *dmi; |
| 2501 | ucc_fast_t *uf_regs; | 2484 | struct ucc_fast *uf_regs; |
| 2502 | ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; | 2485 | struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; |
| 2503 | enet_addr_t tempaddr; | 2486 | u8 tempaddr[6]; |
| 2504 | u8 *mcptr, *tdptr; | 2487 | u8 *mcptr, *tdptr; |
| 2505 | int i, j; | 2488 | int i, j; |
| 2506 | 2489 | ||
| @@ -2517,7 +2500,7 @@ static void ucc_geth_set_multi(struct net_device *dev) | |||
| 2517 | uf_regs->upsmr &= ~UPSMR_PRO; | 2500 | uf_regs->upsmr &= ~UPSMR_PRO; |
| 2518 | 2501 | ||
| 2519 | p_82xx_addr_filt = | 2502 | p_82xx_addr_filt = |
| 2520 | (ucc_geth_82xx_address_filtering_pram_t *) ugeth-> | 2503 | (struct ucc_geth_82xx_address_filtering_pram *) ugeth-> |
| 2521 | p_rx_glbl_pram->addressfiltering; | 2504 | p_rx_glbl_pram->addressfiltering; |
| 2522 | 2505 | ||
| 2523 | if (dev->flags & IFF_ALLMULTI) { | 2506 | if (dev->flags & IFF_ALLMULTI) { |
| @@ -2546,23 +2529,22 @@ static void ucc_geth_set_multi(struct net_device *dev) | |||
| 2546 | * copy bytes MSB first from dmi_addr. | 2529 | * copy bytes MSB first from dmi_addr. |
| 2547 | */ | 2530 | */ |
| 2548 | mcptr = (u8 *) dmi->dmi_addr + 5; | 2531 | mcptr = (u8 *) dmi->dmi_addr + 5; |
| 2549 | tdptr = (u8 *) & tempaddr; | 2532 | tdptr = (u8 *) tempaddr; |
| 2550 | for (j = 0; j < 6; j++) | 2533 | for (j = 0; j < 6; j++) |
| 2551 | *tdptr++ = *mcptr--; | 2534 | *tdptr++ = *mcptr--; |
| 2552 | 2535 | ||
| 2553 | /* Ask CPM to run CRC and set bit in | 2536 | /* Ask CPM to run CRC and set bit in |
| 2554 | * filter mask. | 2537 | * filter mask. |
| 2555 | */ | 2538 | */ |
| 2556 | hw_add_addr_in_hash(ugeth, &tempaddr); | 2539 | hw_add_addr_in_hash(ugeth, tempaddr); |
| 2557 | |||
| 2558 | } | 2540 | } |
| 2559 | } | 2541 | } |
| 2560 | } | 2542 | } |
| 2561 | } | 2543 | } |
| 2562 | 2544 | ||
| 2563 | static void ucc_geth_stop(ucc_geth_private_t *ugeth) | 2545 | static void ucc_geth_stop(struct ucc_geth_private *ugeth) |
| 2564 | { | 2546 | { |
| 2565 | ucc_geth_t *ug_regs = ugeth->ug_regs; | 2547 | struct ucc_geth *ug_regs = ugeth->ug_regs; |
| 2566 | u32 tempval; | 2548 | u32 tempval; |
| 2567 | 2549 | ||
| 2568 | ugeth_vdbg("%s: IN", __FUNCTION__); | 2550 | ugeth_vdbg("%s: IN", __FUNCTION__); |
| @@ -2605,15 +2587,15 @@ static void ucc_geth_stop(ucc_geth_private_t *ugeth) | |||
| 2605 | ucc_geth_memclean(ugeth); | 2587 | ucc_geth_memclean(ugeth); |
| 2606 | } | 2588 | } |
| 2607 | 2589 | ||
| 2608 | static int ucc_geth_startup(ucc_geth_private_t *ugeth) | 2590 | static int ucc_geth_startup(struct ucc_geth_private *ugeth) |
| 2609 | { | 2591 | { |
| 2610 | ucc_geth_82xx_address_filtering_pram_t *p_82xx_addr_filt; | 2592 | struct ucc_geth_82xx_address_filtering_pram *p_82xx_addr_filt; |
| 2611 | ucc_geth_init_pram_t *p_init_enet_pram; | 2593 | struct ucc_geth_init_pram *p_init_enet_pram; |
| 2612 | ucc_fast_private_t *uccf; | 2594 | struct ucc_fast_private *uccf; |
| 2613 | ucc_geth_info_t *ug_info; | 2595 | struct ucc_geth_info *ug_info; |
| 2614 | ucc_fast_info_t *uf_info; | 2596 | struct ucc_fast_info *uf_info; |
| 2615 | ucc_fast_t *uf_regs; | 2597 | struct ucc_fast *uf_regs; |
| 2616 | ucc_geth_t *ug_regs; | 2598 | struct ucc_geth *ug_regs; |
| 2617 | int ret_val = -EINVAL; | 2599 | int ret_val = -EINVAL; |
| 2618 | u32 remoder = UCC_GETH_REMODER_INIT; | 2600 | u32 remoder = UCC_GETH_REMODER_INIT; |
| 2619 | u32 init_enet_pram_offset, cecr_subblock, command, maccfg1; | 2601 | u32 init_enet_pram_offset, cecr_subblock, command, maccfg1; |
| @@ -2788,7 +2770,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 2788 | UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP); | 2770 | UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP); |
| 2789 | 2771 | ||
| 2790 | uf_regs = uccf->uf_regs; | 2772 | uf_regs = uccf->uf_regs; |
| 2791 | ug_regs = (ucc_geth_t *) (uccf->uf_regs); | 2773 | ug_regs = (struct ucc_geth *) (uccf->uf_regs); |
| 2792 | ugeth->ug_regs = ug_regs; | 2774 | ugeth->ug_regs = ug_regs; |
| 2793 | 2775 | ||
| 2794 | init_default_reg_vals(&uf_regs->upsmr, | 2776 | init_default_reg_vals(&uf_regs->upsmr, |
| @@ -2869,10 +2851,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 2869 | /* Allocate in multiple of | 2851 | /* Allocate in multiple of |
| 2870 | UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT, | 2852 | UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT, |
| 2871 | according to spec */ | 2853 | according to spec */ |
| 2872 | length = ((ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD) | 2854 | length = ((ug_info->bdRingLenTx[j] * sizeof(struct qe_bd)) |
| 2873 | / UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT) | 2855 | / UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT) |
| 2874 | * UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT; | 2856 | * UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT; |
| 2875 | if ((ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD) % | 2857 | if ((ug_info->bdRingLenTx[j] * sizeof(struct qe_bd)) % |
| 2876 | UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT) | 2858 | UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT) |
| 2877 | length += UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT; | 2859 | length += UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT; |
| 2878 | if (uf_info->bd_mem_part == MEM_PART_SYSTEM) { | 2860 | if (uf_info->bd_mem_part == MEM_PART_SYSTEM) { |
| @@ -2904,13 +2886,13 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 2904 | } | 2886 | } |
| 2905 | /* Zero unused end of bd ring, according to spec */ | 2887 | /* Zero unused end of bd ring, according to spec */ |
| 2906 | memset(ugeth->p_tx_bd_ring[j] + | 2888 | memset(ugeth->p_tx_bd_ring[j] + |
| 2907 | ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD, 0, | 2889 | ug_info->bdRingLenTx[j] * sizeof(struct qe_bd), 0, |
| 2908 | length - ug_info->bdRingLenTx[j] * UCC_GETH_SIZE_OF_BD); | 2890 | length - ug_info->bdRingLenTx[j] * sizeof(struct qe_bd)); |
| 2909 | } | 2891 | } |
| 2910 | 2892 | ||
| 2911 | /* Allocate Rx bds */ | 2893 | /* Allocate Rx bds */ |
| 2912 | for (j = 0; j < ug_info->numQueuesRx; j++) { | 2894 | for (j = 0; j < ug_info->numQueuesRx; j++) { |
| 2913 | length = ug_info->bdRingLenRx[j] * UCC_GETH_SIZE_OF_BD; | 2895 | length = ug_info->bdRingLenRx[j] * sizeof(struct qe_bd); |
| 2914 | if (uf_info->bd_mem_part == MEM_PART_SYSTEM) { | 2896 | if (uf_info->bd_mem_part == MEM_PART_SYSTEM) { |
| 2915 | u32 align = 4; | 2897 | u32 align = 4; |
| 2916 | if (UCC_GETH_RX_BD_RING_ALIGNMENT > 4) | 2898 | if (UCC_GETH_RX_BD_RING_ALIGNMENT > 4) |
| @@ -2960,12 +2942,15 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 2960 | ugeth->skb_curtx[j] = ugeth->skb_dirtytx[j] = 0; | 2942 | ugeth->skb_curtx[j] = ugeth->skb_dirtytx[j] = 0; |
| 2961 | bd = ugeth->confBd[j] = ugeth->txBd[j] = ugeth->p_tx_bd_ring[j]; | 2943 | bd = ugeth->confBd[j] = ugeth->txBd[j] = ugeth->p_tx_bd_ring[j]; |
| 2962 | for (i = 0; i < ug_info->bdRingLenTx[j]; i++) { | 2944 | for (i = 0; i < ug_info->bdRingLenTx[j]; i++) { |
| 2963 | BD_BUFFER_CLEAR(bd); | 2945 | /* clear bd buffer */ |
| 2964 | BD_STATUS_AND_LENGTH_SET(bd, 0); | 2946 | out_be32(&((struct qe_bd *)bd)->buf, 0); |
| 2965 | bd += UCC_GETH_SIZE_OF_BD; | 2947 | /* set bd status and length */ |
| 2948 | out_be32((u32 *)bd, 0); | ||
| 2949 | bd += sizeof(struct qe_bd); | ||
| 2966 | } | 2950 | } |
| 2967 | bd -= UCC_GETH_SIZE_OF_BD; | 2951 | bd -= sizeof(struct qe_bd); |
| 2968 | BD_STATUS_AND_LENGTH_SET(bd, T_W);/* for last BD set Wrap bit */ | 2952 | /* set bd status and length */ |
| 2953 | out_be32((u32 *)bd, T_W); /* for last BD set Wrap bit */ | ||
| 2969 | } | 2954 | } |
| 2970 | 2955 | ||
| 2971 | /* Init Rx bds */ | 2956 | /* Init Rx bds */ |
| @@ -2989,12 +2974,15 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 2989 | ugeth->skb_currx[j] = 0; | 2974 | ugeth->skb_currx[j] = 0; |
| 2990 | bd = ugeth->rxBd[j] = ugeth->p_rx_bd_ring[j]; | 2975 | bd = ugeth->rxBd[j] = ugeth->p_rx_bd_ring[j]; |
| 2991 | for (i = 0; i < ug_info->bdRingLenRx[j]; i++) { | 2976 | for (i = 0; i < ug_info->bdRingLenRx[j]; i++) { |
| 2992 | BD_STATUS_AND_LENGTH_SET(bd, R_I); | 2977 | /* set bd status and length */ |
| 2993 | BD_BUFFER_CLEAR(bd); | 2978 | out_be32((u32 *)bd, R_I); |
| 2994 | bd += UCC_GETH_SIZE_OF_BD; | 2979 | /* clear bd buffer */ |
| 2980 | out_be32(&((struct qe_bd *)bd)->buf, 0); | ||
| 2981 | bd += sizeof(struct qe_bd); | ||
| 2995 | } | 2982 | } |
| 2996 | bd -= UCC_GETH_SIZE_OF_BD; | 2983 | bd -= sizeof(struct qe_bd); |
| 2997 | BD_STATUS_AND_LENGTH_SET(bd, R_W);/* for last BD set Wrap bit */ | 2984 | /* set bd status and length */ |
| 2985 | out_be32((u32 *)bd, R_W); /* for last BD set Wrap bit */ | ||
| 2998 | } | 2986 | } |
| 2999 | 2987 | ||
| 3000 | /* | 2988 | /* |
| @@ -3003,7 +2991,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3003 | /* Tx global PRAM */ | 2991 | /* Tx global PRAM */ |
| 3004 | /* Allocate global tx parameter RAM page */ | 2992 | /* Allocate global tx parameter RAM page */ |
| 3005 | ugeth->tx_glbl_pram_offset = | 2993 | ugeth->tx_glbl_pram_offset = |
| 3006 | qe_muram_alloc(sizeof(ucc_geth_tx_global_pram_t), | 2994 | qe_muram_alloc(sizeof(struct ucc_geth_tx_global_pram), |
| 3007 | UCC_GETH_TX_GLOBAL_PRAM_ALIGNMENT); | 2995 | UCC_GETH_TX_GLOBAL_PRAM_ALIGNMENT); |
| 3008 | if (IS_MURAM_ERR(ugeth->tx_glbl_pram_offset)) { | 2996 | if (IS_MURAM_ERR(ugeth->tx_glbl_pram_offset)) { |
| 3009 | ugeth_err | 2997 | ugeth_err |
| @@ -3013,10 +3001,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3013 | return -ENOMEM; | 3001 | return -ENOMEM; |
| 3014 | } | 3002 | } |
| 3015 | ugeth->p_tx_glbl_pram = | 3003 | ugeth->p_tx_glbl_pram = |
| 3016 | (ucc_geth_tx_global_pram_t *) qe_muram_addr(ugeth-> | 3004 | (struct ucc_geth_tx_global_pram *) qe_muram_addr(ugeth-> |
| 3017 | tx_glbl_pram_offset); | 3005 | tx_glbl_pram_offset); |
| 3018 | /* Zero out p_tx_glbl_pram */ | 3006 | /* Zero out p_tx_glbl_pram */ |
| 3019 | memset(ugeth->p_tx_glbl_pram, 0, sizeof(ucc_geth_tx_global_pram_t)); | 3007 | memset(ugeth->p_tx_glbl_pram, 0, sizeof(struct ucc_geth_tx_global_pram)); |
| 3020 | 3008 | ||
| 3021 | /* Fill global PRAM */ | 3009 | /* Fill global PRAM */ |
| 3022 | 3010 | ||
| @@ -3024,7 +3012,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3024 | /* Size varies with number of Tx threads */ | 3012 | /* Size varies with number of Tx threads */ |
| 3025 | ugeth->thread_dat_tx_offset = | 3013 | ugeth->thread_dat_tx_offset = |
| 3026 | qe_muram_alloc(numThreadsTxNumerical * | 3014 | qe_muram_alloc(numThreadsTxNumerical * |
| 3027 | sizeof(ucc_geth_thread_data_tx_t) + | 3015 | sizeof(struct ucc_geth_thread_data_tx) + |
| 3028 | 32 * (numThreadsTxNumerical == 1), | 3016 | 32 * (numThreadsTxNumerical == 1), |
| 3029 | UCC_GETH_THREAD_DATA_ALIGNMENT); | 3017 | UCC_GETH_THREAD_DATA_ALIGNMENT); |
| 3030 | if (IS_MURAM_ERR(ugeth->thread_dat_tx_offset)) { | 3018 | if (IS_MURAM_ERR(ugeth->thread_dat_tx_offset)) { |
| @@ -3036,7 +3024,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3036 | } | 3024 | } |
| 3037 | 3025 | ||
| 3038 | ugeth->p_thread_data_tx = | 3026 | ugeth->p_thread_data_tx = |
| 3039 | (ucc_geth_thread_data_tx_t *) qe_muram_addr(ugeth-> | 3027 | (struct ucc_geth_thread_data_tx *) qe_muram_addr(ugeth-> |
| 3040 | thread_dat_tx_offset); | 3028 | thread_dat_tx_offset); |
| 3041 | out_be32(&ugeth->p_tx_glbl_pram->tqptr, ugeth->thread_dat_tx_offset); | 3029 | out_be32(&ugeth->p_tx_glbl_pram->tqptr, ugeth->thread_dat_tx_offset); |
| 3042 | 3030 | ||
| @@ -3053,7 +3041,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3053 | /* Size varies with number of Tx queues */ | 3041 | /* Size varies with number of Tx queues */ |
| 3054 | ugeth->send_q_mem_reg_offset = | 3042 | ugeth->send_q_mem_reg_offset = |
| 3055 | qe_muram_alloc(ug_info->numQueuesTx * | 3043 | qe_muram_alloc(ug_info->numQueuesTx * |
| 3056 | sizeof(ucc_geth_send_queue_qd_t), | 3044 | sizeof(struct ucc_geth_send_queue_qd), |
| 3057 | UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT); | 3045 | UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT); |
| 3058 | if (IS_MURAM_ERR(ugeth->send_q_mem_reg_offset)) { | 3046 | if (IS_MURAM_ERR(ugeth->send_q_mem_reg_offset)) { |
| 3059 | ugeth_err | 3047 | ugeth_err |
| @@ -3064,7 +3052,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3064 | } | 3052 | } |
| 3065 | 3053 | ||
| 3066 | ugeth->p_send_q_mem_reg = | 3054 | ugeth->p_send_q_mem_reg = |
| 3067 | (ucc_geth_send_queue_mem_region_t *) qe_muram_addr(ugeth-> | 3055 | (struct ucc_geth_send_queue_mem_region *) qe_muram_addr(ugeth-> |
| 3068 | send_q_mem_reg_offset); | 3056 | send_q_mem_reg_offset); |
| 3069 | out_be32(&ugeth->p_tx_glbl_pram->sqptr, ugeth->send_q_mem_reg_offset); | 3057 | out_be32(&ugeth->p_tx_glbl_pram->sqptr, ugeth->send_q_mem_reg_offset); |
| 3070 | 3058 | ||
| @@ -3073,7 +3061,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3073 | for (i = 0; i < ug_info->numQueuesTx; i++) { | 3061 | for (i = 0; i < ug_info->numQueuesTx; i++) { |
| 3074 | endOfRing = | 3062 | endOfRing = |
| 3075 | ugeth->p_tx_bd_ring[i] + (ug_info->bdRingLenTx[i] - | 3063 | ugeth->p_tx_bd_ring[i] + (ug_info->bdRingLenTx[i] - |
| 3076 | 1) * UCC_GETH_SIZE_OF_BD; | 3064 | 1) * sizeof(struct qe_bd); |
| 3077 | if (ugeth->ug_info->uf_info.bd_mem_part == MEM_PART_SYSTEM) { | 3065 | if (ugeth->ug_info->uf_info.bd_mem_part == MEM_PART_SYSTEM) { |
| 3078 | out_be32(&ugeth->p_send_q_mem_reg->sqqd[i].bd_ring_base, | 3066 | out_be32(&ugeth->p_send_q_mem_reg->sqqd[i].bd_ring_base, |
| 3079 | (u32) virt_to_phys(ugeth->p_tx_bd_ring[i])); | 3067 | (u32) virt_to_phys(ugeth->p_tx_bd_ring[i])); |
| @@ -3096,7 +3084,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3096 | if (ug_info->numQueuesTx > 1) { | 3084 | if (ug_info->numQueuesTx > 1) { |
| 3097 | /* scheduler exists only if more than 1 tx queue */ | 3085 | /* scheduler exists only if more than 1 tx queue */ |
| 3098 | ugeth->scheduler_offset = | 3086 | ugeth->scheduler_offset = |
| 3099 | qe_muram_alloc(sizeof(ucc_geth_scheduler_t), | 3087 | qe_muram_alloc(sizeof(struct ucc_geth_scheduler), |
| 3100 | UCC_GETH_SCHEDULER_ALIGNMENT); | 3088 | UCC_GETH_SCHEDULER_ALIGNMENT); |
| 3101 | if (IS_MURAM_ERR(ugeth->scheduler_offset)) { | 3089 | if (IS_MURAM_ERR(ugeth->scheduler_offset)) { |
| 3102 | ugeth_err | 3090 | ugeth_err |
| @@ -3107,12 +3095,12 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3107 | } | 3095 | } |
| 3108 | 3096 | ||
| 3109 | ugeth->p_scheduler = | 3097 | ugeth->p_scheduler = |
| 3110 | (ucc_geth_scheduler_t *) qe_muram_addr(ugeth-> | 3098 | (struct ucc_geth_scheduler *) qe_muram_addr(ugeth-> |
| 3111 | scheduler_offset); | 3099 | scheduler_offset); |
| 3112 | out_be32(&ugeth->p_tx_glbl_pram->schedulerbasepointer, | 3100 | out_be32(&ugeth->p_tx_glbl_pram->schedulerbasepointer, |
| 3113 | ugeth->scheduler_offset); | 3101 | ugeth->scheduler_offset); |
| 3114 | /* Zero out p_scheduler */ | 3102 | /* Zero out p_scheduler */ |
| 3115 | memset(ugeth->p_scheduler, 0, sizeof(ucc_geth_scheduler_t)); | 3103 | memset(ugeth->p_scheduler, 0, sizeof(struct ucc_geth_scheduler)); |
| 3116 | 3104 | ||
| 3117 | /* Set values in scheduler */ | 3105 | /* Set values in scheduler */ |
| 3118 | out_be32(&ugeth->p_scheduler->mblinterval, | 3106 | out_be32(&ugeth->p_scheduler->mblinterval, |
| @@ -3144,7 +3132,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3144 | statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_TX) { | 3132 | statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_TX) { |
| 3145 | ugeth->tx_fw_statistics_pram_offset = | 3133 | ugeth->tx_fw_statistics_pram_offset = |
| 3146 | qe_muram_alloc(sizeof | 3134 | qe_muram_alloc(sizeof |
| 3147 | (ucc_geth_tx_firmware_statistics_pram_t), | 3135 | (struct ucc_geth_tx_firmware_statistics_pram), |
| 3148 | UCC_GETH_TX_STATISTICS_ALIGNMENT); | 3136 | UCC_GETH_TX_STATISTICS_ALIGNMENT); |
| 3149 | if (IS_MURAM_ERR(ugeth->tx_fw_statistics_pram_offset)) { | 3137 | if (IS_MURAM_ERR(ugeth->tx_fw_statistics_pram_offset)) { |
| 3150 | ugeth_err | 3138 | ugeth_err |
| @@ -3154,11 +3142,11 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3154 | return -ENOMEM; | 3142 | return -ENOMEM; |
| 3155 | } | 3143 | } |
| 3156 | ugeth->p_tx_fw_statistics_pram = | 3144 | ugeth->p_tx_fw_statistics_pram = |
| 3157 | (ucc_geth_tx_firmware_statistics_pram_t *) | 3145 | (struct ucc_geth_tx_firmware_statistics_pram *) |
| 3158 | qe_muram_addr(ugeth->tx_fw_statistics_pram_offset); | 3146 | qe_muram_addr(ugeth->tx_fw_statistics_pram_offset); |
| 3159 | /* Zero out p_tx_fw_statistics_pram */ | 3147 | /* Zero out p_tx_fw_statistics_pram */ |
| 3160 | memset(ugeth->p_tx_fw_statistics_pram, | 3148 | memset(ugeth->p_tx_fw_statistics_pram, |
| 3161 | 0, sizeof(ucc_geth_tx_firmware_statistics_pram_t)); | 3149 | 0, sizeof(struct ucc_geth_tx_firmware_statistics_pram)); |
| 3162 | } | 3150 | } |
| 3163 | 3151 | ||
| 3164 | /* temoder */ | 3152 | /* temoder */ |
| @@ -3183,7 +3171,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3183 | /* Rx global PRAM */ | 3171 | /* Rx global PRAM */ |
| 3184 | /* Allocate global rx parameter RAM page */ | 3172 | /* Allocate global rx parameter RAM page */ |
| 3185 | ugeth->rx_glbl_pram_offset = | 3173 | ugeth->rx_glbl_pram_offset = |
| 3186 | qe_muram_alloc(sizeof(ucc_geth_rx_global_pram_t), | 3174 | qe_muram_alloc(sizeof(struct ucc_geth_rx_global_pram), |
| 3187 | UCC_GETH_RX_GLOBAL_PRAM_ALIGNMENT); | 3175 | UCC_GETH_RX_GLOBAL_PRAM_ALIGNMENT); |
| 3188 | if (IS_MURAM_ERR(ugeth->rx_glbl_pram_offset)) { | 3176 | if (IS_MURAM_ERR(ugeth->rx_glbl_pram_offset)) { |
| 3189 | ugeth_err | 3177 | ugeth_err |
| @@ -3193,10 +3181,10 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3193 | return -ENOMEM; | 3181 | return -ENOMEM; |
| 3194 | } | 3182 | } |
| 3195 | ugeth->p_rx_glbl_pram = | 3183 | ugeth->p_rx_glbl_pram = |
| 3196 | (ucc_geth_rx_global_pram_t *) qe_muram_addr(ugeth-> | 3184 | (struct ucc_geth_rx_global_pram *) qe_muram_addr(ugeth-> |
| 3197 | rx_glbl_pram_offset); | 3185 | rx_glbl_pram_offset); |
| 3198 | /* Zero out p_rx_glbl_pram */ | 3186 | /* Zero out p_rx_glbl_pram */ |
| 3199 | memset(ugeth->p_rx_glbl_pram, 0, sizeof(ucc_geth_rx_global_pram_t)); | 3187 | memset(ugeth->p_rx_glbl_pram, 0, sizeof(struct ucc_geth_rx_global_pram)); |
| 3200 | 3188 | ||
| 3201 | /* Fill global PRAM */ | 3189 | /* Fill global PRAM */ |
| 3202 | 3190 | ||
| @@ -3204,7 +3192,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3204 | /* Size varies with number of Rx threads */ | 3192 | /* Size varies with number of Rx threads */ |
| 3205 | ugeth->thread_dat_rx_offset = | 3193 | ugeth->thread_dat_rx_offset = |
| 3206 | qe_muram_alloc(numThreadsRxNumerical * | 3194 | qe_muram_alloc(numThreadsRxNumerical * |
| 3207 | sizeof(ucc_geth_thread_data_rx_t), | 3195 | sizeof(struct ucc_geth_thread_data_rx), |
| 3208 | UCC_GETH_THREAD_DATA_ALIGNMENT); | 3196 | UCC_GETH_THREAD_DATA_ALIGNMENT); |
| 3209 | if (IS_MURAM_ERR(ugeth->thread_dat_rx_offset)) { | 3197 | if (IS_MURAM_ERR(ugeth->thread_dat_rx_offset)) { |
| 3210 | ugeth_err | 3198 | ugeth_err |
| @@ -3215,7 +3203,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3215 | } | 3203 | } |
| 3216 | 3204 | ||
| 3217 | ugeth->p_thread_data_rx = | 3205 | ugeth->p_thread_data_rx = |
| 3218 | (ucc_geth_thread_data_rx_t *) qe_muram_addr(ugeth-> | 3206 | (struct ucc_geth_thread_data_rx *) qe_muram_addr(ugeth-> |
| 3219 | thread_dat_rx_offset); | 3207 | thread_dat_rx_offset); |
| 3220 | out_be32(&ugeth->p_rx_glbl_pram->rqptr, ugeth->thread_dat_rx_offset); | 3208 | out_be32(&ugeth->p_rx_glbl_pram->rqptr, ugeth->thread_dat_rx_offset); |
| 3221 | 3209 | ||
| @@ -3227,7 +3215,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3227 | statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_RX) { | 3215 | statisticsMode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_RX) { |
| 3228 | ugeth->rx_fw_statistics_pram_offset = | 3216 | ugeth->rx_fw_statistics_pram_offset = |
| 3229 | qe_muram_alloc(sizeof | 3217 | qe_muram_alloc(sizeof |
| 3230 | (ucc_geth_rx_firmware_statistics_pram_t), | 3218 | (struct ucc_geth_rx_firmware_statistics_pram), |
| 3231 | UCC_GETH_RX_STATISTICS_ALIGNMENT); | 3219 | UCC_GETH_RX_STATISTICS_ALIGNMENT); |
| 3232 | if (IS_MURAM_ERR(ugeth->rx_fw_statistics_pram_offset)) { | 3220 | if (IS_MURAM_ERR(ugeth->rx_fw_statistics_pram_offset)) { |
| 3233 | ugeth_err | 3221 | ugeth_err |
| @@ -3237,11 +3225,11 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3237 | return -ENOMEM; | 3225 | return -ENOMEM; |
| 3238 | } | 3226 | } |
| 3239 | ugeth->p_rx_fw_statistics_pram = | 3227 | ugeth->p_rx_fw_statistics_pram = |
| 3240 | (ucc_geth_rx_firmware_statistics_pram_t *) | 3228 | (struct ucc_geth_rx_firmware_statistics_pram *) |
| 3241 | qe_muram_addr(ugeth->rx_fw_statistics_pram_offset); | 3229 | qe_muram_addr(ugeth->rx_fw_statistics_pram_offset); |
| 3242 | /* Zero out p_rx_fw_statistics_pram */ | 3230 | /* Zero out p_rx_fw_statistics_pram */ |
| 3243 | memset(ugeth->p_rx_fw_statistics_pram, 0, | 3231 | memset(ugeth->p_rx_fw_statistics_pram, 0, |
| 3244 | sizeof(ucc_geth_rx_firmware_statistics_pram_t)); | 3232 | sizeof(struct ucc_geth_rx_firmware_statistics_pram)); |
| 3245 | } | 3233 | } |
| 3246 | 3234 | ||
| 3247 | /* intCoalescingPtr */ | 3235 | /* intCoalescingPtr */ |
| @@ -3249,7 +3237,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3249 | /* Size varies with number of Rx queues */ | 3237 | /* Size varies with number of Rx queues */ |
| 3250 | ugeth->rx_irq_coalescing_tbl_offset = | 3238 | ugeth->rx_irq_coalescing_tbl_offset = |
| 3251 | qe_muram_alloc(ug_info->numQueuesRx * | 3239 | qe_muram_alloc(ug_info->numQueuesRx * |
| 3252 | sizeof(ucc_geth_rx_interrupt_coalescing_entry_t), | 3240 | sizeof(struct ucc_geth_rx_interrupt_coalescing_entry), |
| 3253 | UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT); | 3241 | UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT); |
| 3254 | if (IS_MURAM_ERR(ugeth->rx_irq_coalescing_tbl_offset)) { | 3242 | if (IS_MURAM_ERR(ugeth->rx_irq_coalescing_tbl_offset)) { |
| 3255 | ugeth_err | 3243 | ugeth_err |
| @@ -3260,7 +3248,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3260 | } | 3248 | } |
| 3261 | 3249 | ||
| 3262 | ugeth->p_rx_irq_coalescing_tbl = | 3250 | ugeth->p_rx_irq_coalescing_tbl = |
| 3263 | (ucc_geth_rx_interrupt_coalescing_table_t *) | 3251 | (struct ucc_geth_rx_interrupt_coalescing_table *) |
| 3264 | qe_muram_addr(ugeth->rx_irq_coalescing_tbl_offset); | 3252 | qe_muram_addr(ugeth->rx_irq_coalescing_tbl_offset); |
| 3265 | out_be32(&ugeth->p_rx_glbl_pram->intcoalescingptr, | 3253 | out_be32(&ugeth->p_rx_glbl_pram->intcoalescingptr, |
| 3266 | ugeth->rx_irq_coalescing_tbl_offset); | 3254 | ugeth->rx_irq_coalescing_tbl_offset); |
| @@ -3300,7 +3288,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3300 | l3qt = 0; | 3288 | l3qt = 0; |
| 3301 | for (i = 0; i < 8; i++) | 3289 | for (i = 0; i < 8; i++) |
| 3302 | l3qt |= (ug_info->l3qt[j + i] << (28 - 4 * i)); | 3290 | l3qt |= (ug_info->l3qt[j + i] << (28 - 4 * i)); |
| 3303 | out_be32(&ugeth->p_rx_glbl_pram->l3qt[j], l3qt); | 3291 | out_be32(&ugeth->p_rx_glbl_pram->l3qt[j/8], l3qt); |
| 3304 | } | 3292 | } |
| 3305 | 3293 | ||
| 3306 | /* vlantype */ | 3294 | /* vlantype */ |
| @@ -3316,8 +3304,8 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3316 | /* Size varies with number of Rx queues */ | 3304 | /* Size varies with number of Rx queues */ |
| 3317 | ugeth->rx_bd_qs_tbl_offset = | 3305 | ugeth->rx_bd_qs_tbl_offset = |
| 3318 | qe_muram_alloc(ug_info->numQueuesRx * | 3306 | qe_muram_alloc(ug_info->numQueuesRx * |
| 3319 | (sizeof(ucc_geth_rx_bd_queues_entry_t) + | 3307 | (sizeof(struct ucc_geth_rx_bd_queues_entry) + |
| 3320 | sizeof(ucc_geth_rx_prefetched_bds_t)), | 3308 | sizeof(struct ucc_geth_rx_prefetched_bds)), |
| 3321 | UCC_GETH_RX_BD_QUEUES_ALIGNMENT); | 3309 | UCC_GETH_RX_BD_QUEUES_ALIGNMENT); |
| 3322 | if (IS_MURAM_ERR(ugeth->rx_bd_qs_tbl_offset)) { | 3310 | if (IS_MURAM_ERR(ugeth->rx_bd_qs_tbl_offset)) { |
| 3323 | ugeth_err | 3311 | ugeth_err |
| @@ -3328,14 +3316,14 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3328 | } | 3316 | } |
| 3329 | 3317 | ||
| 3330 | ugeth->p_rx_bd_qs_tbl = | 3318 | ugeth->p_rx_bd_qs_tbl = |
| 3331 | (ucc_geth_rx_bd_queues_entry_t *) qe_muram_addr(ugeth-> | 3319 | (struct ucc_geth_rx_bd_queues_entry *) qe_muram_addr(ugeth-> |
| 3332 | rx_bd_qs_tbl_offset); | 3320 | rx_bd_qs_tbl_offset); |
| 3333 | out_be32(&ugeth->p_rx_glbl_pram->rbdqptr, ugeth->rx_bd_qs_tbl_offset); | 3321 | out_be32(&ugeth->p_rx_glbl_pram->rbdqptr, ugeth->rx_bd_qs_tbl_offset); |
| 3334 | /* Zero out p_rx_bd_qs_tbl */ | 3322 | /* Zero out p_rx_bd_qs_tbl */ |
| 3335 | memset(ugeth->p_rx_bd_qs_tbl, | 3323 | memset(ugeth->p_rx_bd_qs_tbl, |
| 3336 | 0, | 3324 | 0, |
| 3337 | ug_info->numQueuesRx * (sizeof(ucc_geth_rx_bd_queues_entry_t) + | 3325 | ug_info->numQueuesRx * (sizeof(struct ucc_geth_rx_bd_queues_entry) + |
| 3338 | sizeof(ucc_geth_rx_prefetched_bds_t))); | 3326 | sizeof(struct ucc_geth_rx_prefetched_bds))); |
| 3339 | 3327 | ||
| 3340 | /* Setup the table */ | 3328 | /* Setup the table */ |
| 3341 | /* Assume BD rings are already established */ | 3329 | /* Assume BD rings are already established */ |
| @@ -3406,7 +3394,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3406 | /* Allocate memory for extended filtering Mode Global | 3394 | /* Allocate memory for extended filtering Mode Global |
| 3407 | Parameters */ | 3395 | Parameters */ |
| 3408 | ugeth->exf_glbl_param_offset = | 3396 | ugeth->exf_glbl_param_offset = |
| 3409 | qe_muram_alloc(sizeof(ucc_geth_exf_global_pram_t), | 3397 | qe_muram_alloc(sizeof(struct ucc_geth_exf_global_pram), |
| 3410 | UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT); | 3398 | UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT); |
| 3411 | if (IS_MURAM_ERR(ugeth->exf_glbl_param_offset)) { | 3399 | if (IS_MURAM_ERR(ugeth->exf_glbl_param_offset)) { |
| 3412 | ugeth_err | 3400 | ugeth_err |
| @@ -3417,7 +3405,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3417 | } | 3405 | } |
| 3418 | 3406 | ||
| 3419 | ugeth->p_exf_glbl_param = | 3407 | ugeth->p_exf_glbl_param = |
| 3420 | (ucc_geth_exf_global_pram_t *) qe_muram_addr(ugeth-> | 3408 | (struct ucc_geth_exf_global_pram *) qe_muram_addr(ugeth-> |
| 3421 | exf_glbl_param_offset); | 3409 | exf_glbl_param_offset); |
| 3422 | out_be32(&ugeth->p_rx_glbl_pram->exfGlobalParam, | 3410 | out_be32(&ugeth->p_rx_glbl_pram->exfGlobalParam, |
| 3423 | ugeth->exf_glbl_param_offset); | 3411 | ugeth->exf_glbl_param_offset); |
| @@ -3439,7 +3427,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3439 | INIT_LIST_HEAD(&ugeth->ind_hash_q); | 3427 | INIT_LIST_HEAD(&ugeth->ind_hash_q); |
| 3440 | } | 3428 | } |
| 3441 | p_82xx_addr_filt = | 3429 | p_82xx_addr_filt = |
| 3442 | (ucc_geth_82xx_address_filtering_pram_t *) ugeth-> | 3430 | (struct ucc_geth_82xx_address_filtering_pram *) ugeth-> |
| 3443 | p_rx_glbl_pram->addressfiltering; | 3431 | p_rx_glbl_pram->addressfiltering; |
| 3444 | 3432 | ||
| 3445 | ugeth_82xx_filtering_clear_all_addr_in_hash(ugeth, | 3433 | ugeth_82xx_filtering_clear_all_addr_in_hash(ugeth, |
| @@ -3462,7 +3450,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3462 | * allocated resources can be released when the channel is freed. | 3450 | * allocated resources can be released when the channel is freed. |
| 3463 | */ | 3451 | */ |
| 3464 | if (!(ugeth->p_init_enet_param_shadow = | 3452 | if (!(ugeth->p_init_enet_param_shadow = |
| 3465 | (ucc_geth_init_pram_t *) kmalloc(sizeof(ucc_geth_init_pram_t), | 3453 | (struct ucc_geth_init_pram *) kmalloc(sizeof(struct ucc_geth_init_pram), |
| 3466 | GFP_KERNEL))) { | 3454 | GFP_KERNEL))) { |
| 3467 | ugeth_err | 3455 | ugeth_err |
| 3468 | ("%s: Can not allocate memory for" | 3456 | ("%s: Can not allocate memory for" |
| @@ -3472,7 +3460,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3472 | } | 3460 | } |
| 3473 | /* Zero out *p_init_enet_param_shadow */ | 3461 | /* Zero out *p_init_enet_param_shadow */ |
| 3474 | memset((char *)ugeth->p_init_enet_param_shadow, | 3462 | memset((char *)ugeth->p_init_enet_param_shadow, |
| 3475 | 0, sizeof(ucc_geth_init_pram_t)); | 3463 | 0, sizeof(struct ucc_geth_init_pram)); |
| 3476 | 3464 | ||
| 3477 | /* Fill shadow InitEnet command parameter structure */ | 3465 | /* Fill shadow InitEnet command parameter structure */ |
| 3478 | 3466 | ||
| @@ -3506,7 +3494,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3506 | } | 3494 | } |
| 3507 | ugeth->p_init_enet_param_shadow->largestexternallookupkeysize = | 3495 | ugeth->p_init_enet_param_shadow->largestexternallookupkeysize = |
| 3508 | ug_info->largestexternallookupkeysize; | 3496 | ug_info->largestexternallookupkeysize; |
| 3509 | size = sizeof(ucc_geth_thread_rx_pram_t); | 3497 | size = sizeof(struct ucc_geth_thread_rx_pram); |
| 3510 | if (ug_info->rxExtendedFiltering) { | 3498 | if (ug_info->rxExtendedFiltering) { |
| 3511 | size += THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING; | 3499 | size += THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING; |
| 3512 | if (ug_info->largestexternallookupkeysize == | 3500 | if (ug_info->largestexternallookupkeysize == |
| @@ -3537,7 +3525,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3537 | fill_init_enet_entries(ugeth, | 3525 | fill_init_enet_entries(ugeth, |
| 3538 | &(ugeth->p_init_enet_param_shadow-> | 3526 | &(ugeth->p_init_enet_param_shadow-> |
| 3539 | txthread[0]), numThreadsTxNumerical, | 3527 | txthread[0]), numThreadsTxNumerical, |
| 3540 | sizeof(ucc_geth_thread_tx_pram_t), | 3528 | sizeof(struct ucc_geth_thread_tx_pram), |
| 3541 | UCC_GETH_THREAD_TX_PRAM_ALIGNMENT, | 3529 | UCC_GETH_THREAD_TX_PRAM_ALIGNMENT, |
| 3542 | ug_info->riscTx, 0)) != 0) { | 3530 | ug_info->riscTx, 0)) != 0) { |
| 3543 | ugeth_err("%s: Can not fill p_init_enet_param_shadow.", | 3531 | ugeth_err("%s: Can not fill p_init_enet_param_shadow.", |
| @@ -3557,7 +3545,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3557 | } | 3545 | } |
| 3558 | 3546 | ||
| 3559 | /* Allocate InitEnet command parameter structure */ | 3547 | /* Allocate InitEnet command parameter structure */ |
| 3560 | init_enet_pram_offset = qe_muram_alloc(sizeof(ucc_geth_init_pram_t), 4); | 3548 | init_enet_pram_offset = qe_muram_alloc(sizeof(struct ucc_geth_init_pram), 4); |
| 3561 | if (IS_MURAM_ERR(init_enet_pram_offset)) { | 3549 | if (IS_MURAM_ERR(init_enet_pram_offset)) { |
| 3562 | ugeth_err | 3550 | ugeth_err |
| 3563 | ("%s: Can not allocate DPRAM memory for p_init_enet_pram.", | 3551 | ("%s: Can not allocate DPRAM memory for p_init_enet_pram.", |
| @@ -3566,7 +3554,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3566 | return -ENOMEM; | 3554 | return -ENOMEM; |
| 3567 | } | 3555 | } |
| 3568 | p_init_enet_pram = | 3556 | p_init_enet_pram = |
| 3569 | (ucc_geth_init_pram_t *) qe_muram_addr(init_enet_pram_offset); | 3557 | (struct ucc_geth_init_pram *) qe_muram_addr(init_enet_pram_offset); |
| 3570 | 3558 | ||
| 3571 | /* Copy shadow InitEnet command parameter structure into PRAM */ | 3559 | /* Copy shadow InitEnet command parameter structure into PRAM */ |
| 3572 | p_init_enet_pram->resinit1 = ugeth->p_init_enet_param_shadow->resinit1; | 3560 | p_init_enet_pram->resinit1 = ugeth->p_init_enet_param_shadow->resinit1; |
| @@ -3591,7 +3579,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3591 | /* Issue QE command */ | 3579 | /* Issue QE command */ |
| 3592 | cecr_subblock = | 3580 | cecr_subblock = |
| 3593 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); | 3581 | ucc_fast_get_qe_cr_subblock(ugeth->ug_info->uf_info.ucc_num); |
| 3594 | qe_issue_cmd(command, cecr_subblock, (u8) QE_CR_PROTOCOL_ETHERNET, | 3582 | qe_issue_cmd(command, cecr_subblock, QE_CR_PROTOCOL_ETHERNET, |
| 3595 | init_enet_pram_offset); | 3583 | init_enet_pram_offset); |
| 3596 | 3584 | ||
| 3597 | /* Free InitEnet command parameter */ | 3585 | /* Free InitEnet command parameter */ |
| @@ -3603,7 +3591,7 @@ static int ucc_geth_startup(ucc_geth_private_t *ugeth) | |||
| 3603 | /* returns a net_device_stats structure pointer */ | 3591 | /* returns a net_device_stats structure pointer */ |
| 3604 | static struct net_device_stats *ucc_geth_get_stats(struct net_device *dev) | 3592 | static struct net_device_stats *ucc_geth_get_stats(struct net_device *dev) |
| 3605 | { | 3593 | { |
| 3606 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3594 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 3607 | 3595 | ||
| 3608 | return &(ugeth->stats); | 3596 | return &(ugeth->stats); |
| 3609 | } | 3597 | } |
| @@ -3614,7 +3602,7 @@ static struct net_device_stats *ucc_geth_get_stats(struct net_device *dev) | |||
| 3614 | * starting over will fix the problem. */ | 3602 | * starting over will fix the problem. */ |
| 3615 | static void ucc_geth_timeout(struct net_device *dev) | 3603 | static void ucc_geth_timeout(struct net_device *dev) |
| 3616 | { | 3604 | { |
| 3617 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3605 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 3618 | 3606 | ||
| 3619 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3607 | ugeth_vdbg("%s: IN", __FUNCTION__); |
| 3620 | 3608 | ||
| @@ -3634,7 +3622,7 @@ static void ucc_geth_timeout(struct net_device *dev) | |||
| 3634 | /* It is pointed to by the dev->hard_start_xmit function pointer */ | 3622 | /* It is pointed to by the dev->hard_start_xmit function pointer */ |
| 3635 | static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) | 3623 | static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| 3636 | { | 3624 | { |
| 3637 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3625 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 3638 | u8 *bd; /* BD pointer */ | 3626 | u8 *bd; /* BD pointer */ |
| 3639 | u32 bd_status; | 3627 | u32 bd_status; |
| 3640 | u8 txQ = 0; | 3628 | u8 txQ = 0; |
| @@ -3647,7 +3635,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 3647 | 3635 | ||
| 3648 | /* Start from the next BD that should be filled */ | 3636 | /* Start from the next BD that should be filled */ |
| 3649 | bd = ugeth->txBd[txQ]; | 3637 | bd = ugeth->txBd[txQ]; |
| 3650 | bd_status = BD_STATUS_AND_LENGTH(bd); | 3638 | bd_status = in_be32((u32 *)bd); |
| 3651 | /* Save the skb pointer so we can free it later */ | 3639 | /* Save the skb pointer so we can free it later */ |
| 3652 | ugeth->tx_skbuff[txQ][ugeth->skb_curtx[txQ]] = skb; | 3640 | ugeth->tx_skbuff[txQ][ugeth->skb_curtx[txQ]] = skb; |
| 3653 | 3641 | ||
| @@ -3657,20 +3645,21 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 3657 | 1) & TX_RING_MOD_MASK(ugeth->ug_info->bdRingLenTx[txQ]); | 3645 | 1) & TX_RING_MOD_MASK(ugeth->ug_info->bdRingLenTx[txQ]); |
| 3658 | 3646 | ||
| 3659 | /* set up the buffer descriptor */ | 3647 | /* set up the buffer descriptor */ |
| 3660 | BD_BUFFER_SET(bd, | 3648 | out_be32(&((struct qe_bd *)bd)->buf, |
| 3661 | dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE)); | 3649 | dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE)); |
| 3662 | 3650 | ||
| 3663 | //printk(KERN_DEBUG"skb->data is 0x%x\n",skb->data); | 3651 | /* printk(KERN_DEBUG"skb->data is 0x%x\n",skb->data); */ |
| 3664 | 3652 | ||
| 3665 | bd_status = (bd_status & T_W) | T_R | T_I | T_L | skb->len; | 3653 | bd_status = (bd_status & T_W) | T_R | T_I | T_L | skb->len; |
| 3666 | 3654 | ||
| 3667 | BD_STATUS_AND_LENGTH_SET(bd, bd_status); | 3655 | /* set bd status and length */ |
| 3656 | out_be32((u32 *)bd, bd_status); | ||
| 3668 | 3657 | ||
| 3669 | dev->trans_start = jiffies; | 3658 | dev->trans_start = jiffies; |
| 3670 | 3659 | ||
| 3671 | /* Move to next BD in the ring */ | 3660 | /* Move to next BD in the ring */ |
| 3672 | if (!(bd_status & T_W)) | 3661 | if (!(bd_status & T_W)) |
| 3673 | ugeth->txBd[txQ] = bd + UCC_GETH_SIZE_OF_BD; | 3662 | ugeth->txBd[txQ] = bd + sizeof(struct qe_bd); |
| 3674 | else | 3663 | else |
| 3675 | ugeth->txBd[txQ] = ugeth->p_tx_bd_ring[txQ]; | 3664 | ugeth->txBd[txQ] = ugeth->p_tx_bd_ring[txQ]; |
| 3676 | 3665 | ||
| @@ -3695,7 +3684,7 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 3695 | return 0; | 3684 | return 0; |
| 3696 | } | 3685 | } |
| 3697 | 3686 | ||
| 3698 | static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit) | 3687 | static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit) |
| 3699 | { | 3688 | { |
| 3700 | struct sk_buff *skb; | 3689 | struct sk_buff *skb; |
| 3701 | u8 *bd; | 3690 | u8 *bd; |
| @@ -3709,11 +3698,11 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit) | |||
| 3709 | /* collect received buffers */ | 3698 | /* collect received buffers */ |
| 3710 | bd = ugeth->rxBd[rxQ]; | 3699 | bd = ugeth->rxBd[rxQ]; |
| 3711 | 3700 | ||
| 3712 | bd_status = BD_STATUS_AND_LENGTH(bd); | 3701 | bd_status = in_be32((u32 *)bd); |
| 3713 | 3702 | ||
| 3714 | /* while there are received buffers and BD is full (~R_E) */ | 3703 | /* while there are received buffers and BD is full (~R_E) */ |
| 3715 | while (!((bd_status & (R_E)) || (--rx_work_limit < 0))) { | 3704 | while (!((bd_status & (R_E)) || (--rx_work_limit < 0))) { |
| 3716 | bdBuffer = (u8 *) BD_BUFFER(bd); | 3705 | bdBuffer = (u8 *) in_be32(&((struct qe_bd *)bd)->buf); |
| 3717 | length = (u16) ((bd_status & BD_LENGTH_MASK) - 4); | 3706 | length = (u16) ((bd_status & BD_LENGTH_MASK) - 4); |
| 3718 | skb = ugeth->rx_skbuff[rxQ][ugeth->skb_currx[rxQ]]; | 3707 | skb = ugeth->rx_skbuff[rxQ][ugeth->skb_currx[rxQ]]; |
| 3719 | 3708 | ||
| @@ -3768,9 +3757,9 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit) | |||
| 3768 | if (bd_status & R_W) | 3757 | if (bd_status & R_W) |
| 3769 | bd = ugeth->p_rx_bd_ring[rxQ]; | 3758 | bd = ugeth->p_rx_bd_ring[rxQ]; |
| 3770 | else | 3759 | else |
| 3771 | bd += UCC_GETH_SIZE_OF_BD; | 3760 | bd += sizeof(struct qe_bd); |
| 3772 | 3761 | ||
| 3773 | bd_status = BD_STATUS_AND_LENGTH(bd); | 3762 | bd_status = in_be32((u32 *)bd); |
| 3774 | } | 3763 | } |
| 3775 | 3764 | ||
| 3776 | ugeth->rxBd[rxQ] = bd; | 3765 | ugeth->rxBd[rxQ] = bd; |
| @@ -3781,12 +3770,12 @@ static int ucc_geth_rx(ucc_geth_private_t *ugeth, u8 rxQ, int rx_work_limit) | |||
| 3781 | static int ucc_geth_tx(struct net_device *dev, u8 txQ) | 3770 | static int ucc_geth_tx(struct net_device *dev, u8 txQ) |
| 3782 | { | 3771 | { |
| 3783 | /* Start from the next BD that should be filled */ | 3772 | /* Start from the next BD that should be filled */ |
| 3784 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3773 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 3785 | u8 *bd; /* BD pointer */ | 3774 | u8 *bd; /* BD pointer */ |
| 3786 | u32 bd_status; | 3775 | u32 bd_status; |
| 3787 | 3776 | ||
| 3788 | bd = ugeth->confBd[txQ]; | 3777 | bd = ugeth->confBd[txQ]; |
| 3789 | bd_status = BD_STATUS_AND_LENGTH(bd); | 3778 | bd_status = in_be32((u32 *)bd); |
| 3790 | 3779 | ||
| 3791 | /* Normal processing. */ | 3780 | /* Normal processing. */ |
| 3792 | while ((bd_status & T_R) == 0) { | 3781 | while ((bd_status & T_R) == 0) { |
| @@ -3813,7 +3802,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ) | |||
| 3813 | 3802 | ||
| 3814 | /* Advance the confirmation BD pointer */ | 3803 | /* Advance the confirmation BD pointer */ |
| 3815 | if (!(bd_status & T_W)) | 3804 | if (!(bd_status & T_W)) |
| 3816 | ugeth->confBd[txQ] += UCC_GETH_SIZE_OF_BD; | 3805 | ugeth->confBd[txQ] += sizeof(struct qe_bd); |
| 3817 | else | 3806 | else |
| 3818 | ugeth->confBd[txQ] = ugeth->p_tx_bd_ring[txQ]; | 3807 | ugeth->confBd[txQ] = ugeth->p_tx_bd_ring[txQ]; |
| 3819 | } | 3808 | } |
| @@ -3823,7 +3812,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ) | |||
| 3823 | #ifdef CONFIG_UGETH_NAPI | 3812 | #ifdef CONFIG_UGETH_NAPI |
| 3824 | static int ucc_geth_poll(struct net_device *dev, int *budget) | 3813 | static int ucc_geth_poll(struct net_device *dev, int *budget) |
| 3825 | { | 3814 | { |
| 3826 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3815 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 3827 | int howmany; | 3816 | int howmany; |
| 3828 | int rx_work_limit = *budget; | 3817 | int rx_work_limit = *budget; |
| 3829 | u8 rxQ = 0; | 3818 | u8 rxQ = 0; |
| @@ -3847,9 +3836,9 @@ static int ucc_geth_poll(struct net_device *dev, int *budget) | |||
| 3847 | static irqreturn_t ucc_geth_irq_handler(int irq, void *info) | 3836 | static irqreturn_t ucc_geth_irq_handler(int irq, void *info) |
| 3848 | { | 3837 | { |
| 3849 | struct net_device *dev = (struct net_device *)info; | 3838 | struct net_device *dev = (struct net_device *)info; |
| 3850 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3839 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 3851 | ucc_fast_private_t *uccf; | 3840 | struct ucc_fast_private *uccf; |
| 3852 | ucc_geth_info_t *ug_info; | 3841 | struct ucc_geth_info *ug_info; |
| 3853 | register u32 ucce = 0; | 3842 | register u32 ucce = 0; |
| 3854 | register u32 bit_mask = UCCE_RXBF_SINGLE_MASK; | 3843 | register u32 bit_mask = UCCE_RXBF_SINGLE_MASK; |
| 3855 | register u32 tx_mask = UCCE_TXBF_SINGLE_MASK; | 3844 | register u32 tx_mask = UCCE_TXBF_SINGLE_MASK; |
| @@ -3912,7 +3901,7 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info) | |||
| 3912 | static irqreturn_t phy_interrupt(int irq, void *dev_id) | 3901 | static irqreturn_t phy_interrupt(int irq, void *dev_id) |
| 3913 | { | 3902 | { |
| 3914 | struct net_device *dev = (struct net_device *)dev_id; | 3903 | struct net_device *dev = (struct net_device *)dev_id; |
| 3915 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3904 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 3916 | 3905 | ||
| 3917 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3906 | ugeth_vdbg("%s: IN", __FUNCTION__); |
| 3918 | 3907 | ||
| @@ -3932,8 +3921,8 @@ static irqreturn_t phy_interrupt(int irq, void *dev_id) | |||
| 3932 | static void ugeth_phy_change(void *data) | 3921 | static void ugeth_phy_change(void *data) |
| 3933 | { | 3922 | { |
| 3934 | struct net_device *dev = (struct net_device *)data; | 3923 | struct net_device *dev = (struct net_device *)data; |
| 3935 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3924 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 3936 | ucc_geth_t *ug_regs; | 3925 | struct ucc_geth *ug_regs; |
| 3937 | int result = 0; | 3926 | int result = 0; |
| 3938 | 3927 | ||
| 3939 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3928 | ugeth_vdbg("%s: IN", __FUNCTION__); |
| @@ -3963,7 +3952,7 @@ static void ugeth_phy_change(void *data) | |||
| 3963 | static void ugeth_phy_timer(unsigned long data) | 3952 | static void ugeth_phy_timer(unsigned long data) |
| 3964 | { | 3953 | { |
| 3965 | struct net_device *dev = (struct net_device *)data; | 3954 | struct net_device *dev = (struct net_device *)data; |
| 3966 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3955 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 3967 | 3956 | ||
| 3968 | schedule_work(&ugeth->tq); | 3957 | schedule_work(&ugeth->tq); |
| 3969 | 3958 | ||
| @@ -3979,7 +3968,7 @@ static void ugeth_phy_timer(unsigned long data) | |||
| 3979 | static void ugeth_phy_startup_timer(unsigned long data) | 3968 | static void ugeth_phy_startup_timer(unsigned long data) |
| 3980 | { | 3969 | { |
| 3981 | struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data; | 3970 | struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data; |
| 3982 | ucc_geth_private_t *ugeth = netdev_priv(mii_info->dev); | 3971 | struct ucc_geth_private *ugeth = netdev_priv(mii_info->dev); |
| 3983 | static int secondary = UGETH_AN_TIMEOUT; | 3972 | static int secondary = UGETH_AN_TIMEOUT; |
| 3984 | int result; | 3973 | int result; |
| 3985 | 3974 | ||
| @@ -4034,7 +4023,7 @@ static void ugeth_phy_startup_timer(unsigned long data) | |||
| 4034 | /* Returns 0 for success. */ | 4023 | /* Returns 0 for success. */ |
| 4035 | static int ucc_geth_open(struct net_device *dev) | 4024 | static int ucc_geth_open(struct net_device *dev) |
| 4036 | { | 4025 | { |
| 4037 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 4026 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 4038 | int err; | 4027 | int err; |
| 4039 | 4028 | ||
| 4040 | ugeth_vdbg("%s: IN", __FUNCTION__); | 4029 | ugeth_vdbg("%s: IN", __FUNCTION__); |
| @@ -4111,7 +4100,7 @@ static int ucc_geth_open(struct net_device *dev) | |||
| 4111 | /* Stops the kernel queue, and halts the controller */ | 4100 | /* Stops the kernel queue, and halts the controller */ |
| 4112 | static int ucc_geth_close(struct net_device *dev) | 4101 | static int ucc_geth_close(struct net_device *dev) |
| 4113 | { | 4102 | { |
| 4114 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 4103 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 4115 | 4104 | ||
| 4116 | ugeth_vdbg("%s: IN", __FUNCTION__); | 4105 | ugeth_vdbg("%s: IN", __FUNCTION__); |
| 4117 | 4106 | ||
| @@ -4130,30 +4119,53 @@ static int ucc_geth_close(struct net_device *dev) | |||
| 4130 | 4119 | ||
| 4131 | const struct ethtool_ops ucc_geth_ethtool_ops = { }; | 4120 | const struct ethtool_ops ucc_geth_ethtool_ops = { }; |
| 4132 | 4121 | ||
| 4133 | static int ucc_geth_probe(struct device *device) | 4122 | static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match) |
| 4134 | { | 4123 | { |
| 4135 | struct platform_device *pdev = to_platform_device(device); | 4124 | struct device *device = &ofdev->dev; |
| 4136 | struct ucc_geth_platform_data *ugeth_pdata; | 4125 | struct device_node *np = ofdev->node; |
| 4137 | struct net_device *dev = NULL; | 4126 | struct net_device *dev = NULL; |
| 4138 | struct ucc_geth_private *ugeth = NULL; | 4127 | struct ucc_geth_private *ugeth = NULL; |
| 4139 | struct ucc_geth_info *ug_info; | 4128 | struct ucc_geth_info *ug_info; |
| 4140 | int err; | 4129 | struct resource res; |
| 4130 | struct device_node *phy; | ||
| 4131 | int err, ucc_num, phy_interface; | ||
| 4141 | static int mii_mng_configured = 0; | 4132 | static int mii_mng_configured = 0; |
| 4133 | const phandle *ph; | ||
| 4134 | const unsigned int *prop; | ||
| 4142 | 4135 | ||
| 4143 | ugeth_vdbg("%s: IN", __FUNCTION__); | 4136 | ugeth_vdbg("%s: IN", __FUNCTION__); |
| 4144 | 4137 | ||
| 4145 | ugeth_pdata = (struct ucc_geth_platform_data *)pdev->dev.platform_data; | 4138 | prop = get_property(np, "device-id", NULL); |
| 4139 | ucc_num = *prop - 1; | ||
| 4140 | if ((ucc_num < 0) || (ucc_num > 7)) | ||
| 4141 | return -ENODEV; | ||
| 4142 | |||
| 4143 | ug_info = &ugeth_info[ucc_num]; | ||
| 4144 | ug_info->uf_info.ucc_num = ucc_num; | ||
| 4145 | prop = get_property(np, "rx-clock", NULL); | ||
| 4146 | ug_info->uf_info.rx_clock = *prop; | ||
| 4147 | prop = get_property(np, "tx-clock", NULL); | ||
| 4148 | ug_info->uf_info.tx_clock = *prop; | ||
| 4149 | err = of_address_to_resource(np, 0, &res); | ||
| 4150 | if (err) | ||
| 4151 | return -EINVAL; | ||
| 4152 | |||
| 4153 | ug_info->uf_info.regs = res.start; | ||
| 4154 | ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); | ||
| 4155 | |||
| 4156 | ph = get_property(np, "phy-handle", NULL); | ||
| 4157 | phy = of_find_node_by_phandle(*ph); | ||
| 4146 | 4158 | ||
| 4147 | ug_info = &ugeth_info[pdev->id]; | 4159 | if (phy == NULL) |
| 4148 | ug_info->uf_info.ucc_num = pdev->id; | 4160 | return -ENODEV; |
| 4149 | ug_info->uf_info.rx_clock = ugeth_pdata->rx_clock; | 4161 | |
| 4150 | ug_info->uf_info.tx_clock = ugeth_pdata->tx_clock; | 4162 | prop = get_property(phy, "reg", NULL); |
| 4151 | ug_info->uf_info.regs = ugeth_pdata->phy_reg_addr; | 4163 | ug_info->phy_address = *prop; |
| 4152 | ug_info->uf_info.irq = platform_get_irq(pdev, 0); | 4164 | prop = get_property(phy, "interface", NULL); |
| 4153 | ug_info->phy_address = ugeth_pdata->phy_id; | 4165 | ug_info->enet_interface = *prop; |
| 4154 | ug_info->enet_interface = ugeth_pdata->phy_interface; | 4166 | ug_info->phy_interrupt = irq_of_parse_and_map(phy, 0); |
| 4155 | ug_info->board_flags = ugeth_pdata->board_flags; | 4167 | ug_info->board_flags = (ug_info->phy_interrupt == NO_IRQ)? |
| 4156 | ug_info->phy_interrupt = ugeth_pdata->phy_interrupt; | 4168 | 0:FSL_UGETH_BRD_HAS_PHY_INTR; |
| 4157 | 4169 | ||
| 4158 | printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n", | 4170 | printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n", |
| 4159 | ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs, | 4171 | ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs, |
| @@ -4161,12 +4173,44 @@ static int ucc_geth_probe(struct device *device) | |||
| 4161 | 4173 | ||
| 4162 | if (ug_info == NULL) { | 4174 | if (ug_info == NULL) { |
| 4163 | ugeth_err("%s: [%d] Missing additional data!", __FUNCTION__, | 4175 | ugeth_err("%s: [%d] Missing additional data!", __FUNCTION__, |
| 4164 | pdev->id); | 4176 | ucc_num); |
| 4165 | return -ENODEV; | 4177 | return -ENODEV; |
| 4166 | } | 4178 | } |
| 4167 | 4179 | ||
| 4180 | /* FIXME: Work around for early chip rev. */ | ||
| 4181 | /* There's a bug in initial chip rev(s) in the RGMII ac */ | ||
| 4182 | /* timing. */ | ||
| 4183 | /* The following compensates by writing to the reserved */ | ||
| 4184 | /* QE Port Output Hold Registers (CPOH1?). */ | ||
| 4185 | prop = get_property(phy, "interface", NULL); | ||
| 4186 | phy_interface = *prop; | ||
| 4187 | if ((phy_interface == ENET_1000_RGMII) || | ||
| 4188 | (phy_interface == ENET_100_RGMII) || | ||
| 4189 | (phy_interface == ENET_10_RGMII)) { | ||
| 4190 | struct device_node *soc; | ||
| 4191 | phys_addr_t immrbase = -1; | ||
| 4192 | u32 *tmp_reg; | ||
| 4193 | u32 tmp_val; | ||
| 4194 | |||
| 4195 | soc = of_find_node_by_type(NULL, "soc"); | ||
| 4196 | if (soc) { | ||
| 4197 | unsigned int size; | ||
| 4198 | const void *prop = get_property(soc, "reg", &size); | ||
| 4199 | immrbase = of_translate_address(soc, prop); | ||
| 4200 | of_node_put(soc); | ||
| 4201 | }; | ||
| 4202 | |||
| 4203 | tmp_reg = (u32 *) ioremap(immrbase + 0x14A8, 0x4); | ||
| 4204 | tmp_val = in_be32(tmp_reg); | ||
| 4205 | if (ucc_num == 1) | ||
| 4206 | out_be32(tmp_reg, tmp_val | 0x00003000); | ||
| 4207 | else if (ucc_num == 2) | ||
| 4208 | out_be32(tmp_reg, tmp_val | 0x0c000000); | ||
| 4209 | iounmap(tmp_reg); | ||
| 4210 | } | ||
| 4211 | |||
| 4168 | if (!mii_mng_configured) { | 4212 | if (!mii_mng_configured) { |
| 4169 | ucc_set_qe_mux_mii_mng(ug_info->uf_info.ucc_num); | 4213 | ucc_set_qe_mux_mii_mng(ucc_num); |
| 4170 | mii_mng_configured = 1; | 4214 | mii_mng_configured = 1; |
| 4171 | } | 4215 | } |
| 4172 | 4216 | ||
| @@ -4213,13 +4257,14 @@ static int ucc_geth_probe(struct device *device) | |||
| 4213 | 4257 | ||
| 4214 | ugeth->ug_info = ug_info; | 4258 | ugeth->ug_info = ug_info; |
| 4215 | ugeth->dev = dev; | 4259 | ugeth->dev = dev; |
| 4216 | memcpy(dev->dev_addr, ugeth_pdata->mac_addr, 6); | 4260 | memcpy(dev->dev_addr, get_property(np, "mac-address", NULL), 6); |
| 4217 | 4261 | ||
| 4218 | return 0; | 4262 | return 0; |
| 4219 | } | 4263 | } |
| 4220 | 4264 | ||
| 4221 | static int ucc_geth_remove(struct device *device) | 4265 | static int ucc_geth_remove(struct of_device* ofdev) |
| 4222 | { | 4266 | { |
| 4267 | struct device *device = &ofdev->dev; | ||
| 4223 | struct net_device *dev = dev_get_drvdata(device); | 4268 | struct net_device *dev = dev_get_drvdata(device); |
| 4224 | struct ucc_geth_private *ugeth = netdev_priv(dev); | 4269 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 4225 | 4270 | ||
| @@ -4230,28 +4275,38 @@ static int ucc_geth_remove(struct device *device) | |||
| 4230 | return 0; | 4275 | return 0; |
| 4231 | } | 4276 | } |
| 4232 | 4277 | ||
| 4233 | /* Structure for a device driver */ | 4278 | static struct of_device_id ucc_geth_match[] = { |
| 4234 | static struct device_driver ucc_geth_driver = { | 4279 | { |
| 4235 | .name = DRV_NAME, | 4280 | .type = "network", |
| 4236 | .bus = &platform_bus_type, | 4281 | .compatible = "ucc_geth", |
| 4237 | .probe = ucc_geth_probe, | 4282 | }, |
| 4238 | .remove = ucc_geth_remove, | 4283 | {}, |
| 4284 | }; | ||
| 4285 | |||
| 4286 | MODULE_DEVICE_TABLE(of, ucc_geth_match); | ||
| 4287 | |||
| 4288 | static struct of_platform_driver ucc_geth_driver = { | ||
| 4289 | .name = DRV_NAME, | ||
| 4290 | .match_table = ucc_geth_match, | ||
| 4291 | .probe = ucc_geth_probe, | ||
| 4292 | .remove = ucc_geth_remove, | ||
| 4239 | }; | 4293 | }; |
| 4240 | 4294 | ||
| 4241 | static int __init ucc_geth_init(void) | 4295 | static int __init ucc_geth_init(void) |
| 4242 | { | 4296 | { |
| 4243 | int i; | 4297 | int i; |
| 4298 | |||
| 4244 | printk(KERN_INFO "ucc_geth: " DRV_DESC "\n"); | 4299 | printk(KERN_INFO "ucc_geth: " DRV_DESC "\n"); |
| 4245 | for (i = 0; i < 8; i++) | 4300 | for (i = 0; i < 8; i++) |
| 4246 | memcpy(&(ugeth_info[i]), &ugeth_primary_info, | 4301 | memcpy(&(ugeth_info[i]), &ugeth_primary_info, |
| 4247 | sizeof(ugeth_primary_info)); | 4302 | sizeof(ugeth_primary_info)); |
| 4248 | 4303 | ||
| 4249 | return driver_register(&ucc_geth_driver); | 4304 | return of_register_driver(&ucc_geth_driver); |
| 4250 | } | 4305 | } |
| 4251 | 4306 | ||
| 4252 | static void __exit ucc_geth_exit(void) | 4307 | static void __exit ucc_geth_exit(void) |
| 4253 | { | 4308 | { |
| 4254 | driver_unregister(&ucc_geth_driver); | 4309 | of_unregister_driver(&ucc_geth_driver); |
| 4255 | } | 4310 | } |
| 4256 | 4311 | ||
| 4257 | module_init(ucc_geth_init); | 4312 | module_init(ucc_geth_init); |
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h index 005965f5dd9b..a66561253593 100644 --- a/drivers/net/ucc_geth.h +++ b/drivers/net/ucc_geth.h | |||
| @@ -36,24 +36,24 @@ | |||
| 36 | #define ENET_INIT_PARAM_MAX_ENTRIES_RX 9 | 36 | #define ENET_INIT_PARAM_MAX_ENTRIES_RX 9 |
| 37 | #define ENET_INIT_PARAM_MAX_ENTRIES_TX 8 | 37 | #define ENET_INIT_PARAM_MAX_ENTRIES_TX 8 |
| 38 | 38 | ||
| 39 | typedef struct ucc_mii_mng { | 39 | struct ucc_mii_mng { |
| 40 | u32 miimcfg; /* MII management configuration reg */ | 40 | u32 miimcfg; /* MII management configuration reg */ |
| 41 | u32 miimcom; /* MII management command reg */ | 41 | u32 miimcom; /* MII management command reg */ |
| 42 | u32 miimadd; /* MII management address reg */ | 42 | u32 miimadd; /* MII management address reg */ |
| 43 | u32 miimcon; /* MII management control reg */ | 43 | u32 miimcon; /* MII management control reg */ |
| 44 | u32 miimstat; /* MII management status reg */ | 44 | u32 miimstat; /* MII management status reg */ |
| 45 | u32 miimind; /* MII management indication reg */ | 45 | u32 miimind; /* MII management indication reg */ |
| 46 | } __attribute__ ((packed)) ucc_mii_mng_t; | 46 | } __attribute__ ((packed)); |
| 47 | 47 | ||
| 48 | typedef struct ucc_geth { | 48 | struct ucc_geth { |
| 49 | ucc_fast_t uccf; | 49 | struct ucc_fast uccf; |
| 50 | 50 | ||
| 51 | u32 maccfg1; /* mac configuration reg. 1 */ | 51 | u32 maccfg1; /* mac configuration reg. 1 */ |
| 52 | u32 maccfg2; /* mac configuration reg. 2 */ | 52 | u32 maccfg2; /* mac configuration reg. 2 */ |
| 53 | u32 ipgifg; /* interframe gap reg. */ | 53 | u32 ipgifg; /* interframe gap reg. */ |
| 54 | u32 hafdup; /* half-duplex reg. */ | 54 | u32 hafdup; /* half-duplex reg. */ |
| 55 | u8 res1[0x10]; | 55 | u8 res1[0x10]; |
| 56 | ucc_mii_mng_t miimng; /* MII management structure */ | 56 | struct ucc_mii_mng miimng; /* MII management structure */ |
| 57 | u32 ifctl; /* interface control reg */ | 57 | u32 ifctl; /* interface control reg */ |
| 58 | u32 ifstat; /* interface statux reg */ | 58 | u32 ifstat; /* interface statux reg */ |
| 59 | u32 macstnaddr1; /* mac station address part 1 reg */ | 59 | u32 macstnaddr1; /* mac station address part 1 reg */ |
| @@ -111,7 +111,7 @@ typedef struct ucc_geth { | |||
| 111 | u32 scar; /* Statistics carry register */ | 111 | u32 scar; /* Statistics carry register */ |
| 112 | u32 scam; /* Statistics caryy mask register */ | 112 | u32 scam; /* Statistics caryy mask register */ |
| 113 | u8 res5[0x200 - 0x1c4]; | 113 | u8 res5[0x200 - 0x1c4]; |
| 114 | } __attribute__ ((packed)) ucc_geth_t; | 114 | } __attribute__ ((packed)); |
| 115 | 115 | ||
| 116 | /* UCC GETH TEMODR Register */ | 116 | /* UCC GETH TEMODR Register */ |
| 117 | #define TEMODER_TX_RMON_STATISTICS_ENABLE 0x0100 /* enable Tx statistics | 117 | #define TEMODER_TX_RMON_STATISTICS_ENABLE 0x0100 /* enable Tx statistics |
| @@ -508,39 +508,39 @@ typedef struct ucc_geth { | |||
| 508 | /* UCC GETH UDSR (Data Synchronization Register) */ | 508 | /* UCC GETH UDSR (Data Synchronization Register) */ |
| 509 | #define UDSR_MAGIC 0x067E | 509 | #define UDSR_MAGIC 0x067E |
| 510 | 510 | ||
| 511 | typedef struct ucc_geth_thread_data_tx { | 511 | struct ucc_geth_thread_data_tx { |
| 512 | u8 res0[104]; | 512 | u8 res0[104]; |
| 513 | } __attribute__ ((packed)) ucc_geth_thread_data_tx_t; | 513 | } __attribute__ ((packed)); |
| 514 | 514 | ||
| 515 | typedef struct ucc_geth_thread_data_rx { | 515 | struct ucc_geth_thread_data_rx { |
| 516 | u8 res0[40]; | 516 | u8 res0[40]; |
| 517 | } __attribute__ ((packed)) ucc_geth_thread_data_rx_t; | 517 | } __attribute__ ((packed)); |
| 518 | 518 | ||
| 519 | /* Send Queue Queue-Descriptor */ | 519 | /* Send Queue Queue-Descriptor */ |
| 520 | typedef struct ucc_geth_send_queue_qd { | 520 | struct ucc_geth_send_queue_qd { |
| 521 | u32 bd_ring_base; /* pointer to BD ring base address */ | 521 | u32 bd_ring_base; /* pointer to BD ring base address */ |
| 522 | u8 res0[0x8]; | 522 | u8 res0[0x8]; |
| 523 | u32 last_bd_completed_address;/* initialize to last entry in BD ring */ | 523 | u32 last_bd_completed_address;/* initialize to last entry in BD ring */ |
| 524 | u8 res1[0x30]; | 524 | u8 res1[0x30]; |
| 525 | } __attribute__ ((packed)) ucc_geth_send_queue_qd_t; | 525 | } __attribute__ ((packed)); |
| 526 | 526 | ||
| 527 | typedef struct ucc_geth_send_queue_mem_region { | 527 | struct ucc_geth_send_queue_mem_region { |
| 528 | ucc_geth_send_queue_qd_t sqqd[NUM_TX_QUEUES]; | 528 | struct ucc_geth_send_queue_qd sqqd[NUM_TX_QUEUES]; |
| 529 | } __attribute__ ((packed)) ucc_geth_send_queue_mem_region_t; | 529 | } __attribute__ ((packed)); |
| 530 | 530 | ||
| 531 | typedef struct ucc_geth_thread_tx_pram { | 531 | struct ucc_geth_thread_tx_pram { |
| 532 | u8 res0[64]; | 532 | u8 res0[64]; |
| 533 | } __attribute__ ((packed)) ucc_geth_thread_tx_pram_t; | 533 | } __attribute__ ((packed)); |
| 534 | 534 | ||
| 535 | typedef struct ucc_geth_thread_rx_pram { | 535 | struct ucc_geth_thread_rx_pram { |
| 536 | u8 res0[128]; | 536 | u8 res0[128]; |
| 537 | } __attribute__ ((packed)) ucc_geth_thread_rx_pram_t; | 537 | } __attribute__ ((packed)); |
| 538 | 538 | ||
| 539 | #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING 64 | 539 | #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING 64 |
| 540 | #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_8 64 | 540 | #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_8 64 |
| 541 | #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_16 96 | 541 | #define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_16 96 |
| 542 | 542 | ||
| 543 | typedef struct ucc_geth_scheduler { | 543 | struct ucc_geth_scheduler { |
| 544 | u16 cpucount0; /* CPU packet counter */ | 544 | u16 cpucount0; /* CPU packet counter */ |
| 545 | u16 cpucount1; /* CPU packet counter */ | 545 | u16 cpucount1; /* CPU packet counter */ |
| 546 | u16 cecount0; /* QE packet counter */ | 546 | u16 cecount0; /* QE packet counter */ |
| @@ -574,9 +574,9 @@ typedef struct ucc_geth_scheduler { | |||
| 574 | /**< weight factor for queues */ | 574 | /**< weight factor for queues */ |
| 575 | u32 minw; /* temporary variable handled by QE */ | 575 | u32 minw; /* temporary variable handled by QE */ |
| 576 | u8 res1[0x70 - 0x64]; | 576 | u8 res1[0x70 - 0x64]; |
| 577 | } __attribute__ ((packed)) ucc_geth_scheduler_t; | 577 | } __attribute__ ((packed)); |
| 578 | 578 | ||
| 579 | typedef struct ucc_geth_tx_firmware_statistics_pram { | 579 | struct ucc_geth_tx_firmware_statistics_pram { |
| 580 | u32 sicoltx; /* single collision */ | 580 | u32 sicoltx; /* single collision */ |
| 581 | u32 mulcoltx; /* multiple collision */ | 581 | u32 mulcoltx; /* multiple collision */ |
| 582 | u32 latecoltxfr; /* late collision */ | 582 | u32 latecoltxfr; /* late collision */ |
| @@ -596,9 +596,9 @@ typedef struct ucc_geth_tx_firmware_statistics_pram { | |||
| 596 | and 1518 octets */ | 596 | and 1518 octets */ |
| 597 | u32 txpktsjumbo; /* total packets (including bad) between 1024 | 597 | u32 txpktsjumbo; /* total packets (including bad) between 1024 |
| 598 | and MAXLength octets */ | 598 | and MAXLength octets */ |
| 599 | } __attribute__ ((packed)) ucc_geth_tx_firmware_statistics_pram_t; | 599 | } __attribute__ ((packed)); |
| 600 | 600 | ||
| 601 | typedef struct ucc_geth_rx_firmware_statistics_pram { | 601 | struct ucc_geth_rx_firmware_statistics_pram { |
| 602 | u32 frrxfcser; /* frames with crc error */ | 602 | u32 frrxfcser; /* frames with crc error */ |
| 603 | u32 fraligner; /* frames with alignment error */ | 603 | u32 fraligner; /* frames with alignment error */ |
| 604 | u32 inrangelenrxer; /* in range length error */ | 604 | u32 inrangelenrxer; /* in range length error */ |
| @@ -630,33 +630,33 @@ typedef struct ucc_geth_rx_firmware_statistics_pram { | |||
| 630 | replaced */ | 630 | replaced */ |
| 631 | u32 insertvlan; /* total frames that had their VLAN tag | 631 | u32 insertvlan; /* total frames that had their VLAN tag |
| 632 | inserted */ | 632 | inserted */ |
| 633 | } __attribute__ ((packed)) ucc_geth_rx_firmware_statistics_pram_t; | 633 | } __attribute__ ((packed)); |
| 634 | 634 | ||
| 635 | typedef struct ucc_geth_rx_interrupt_coalescing_entry { | 635 | struct ucc_geth_rx_interrupt_coalescing_entry { |
| 636 | u32 interruptcoalescingmaxvalue; /* interrupt coalescing max | 636 | u32 interruptcoalescingmaxvalue; /* interrupt coalescing max |
| 637 | value */ | 637 | value */ |
| 638 | u32 interruptcoalescingcounter; /* interrupt coalescing counter, | 638 | u32 interruptcoalescingcounter; /* interrupt coalescing counter, |
| 639 | initialize to | 639 | initialize to |
| 640 | interruptcoalescingmaxvalue */ | 640 | interruptcoalescingmaxvalue */ |
| 641 | } __attribute__ ((packed)) ucc_geth_rx_interrupt_coalescing_entry_t; | 641 | } __attribute__ ((packed)); |
| 642 | 642 | ||
| 643 | typedef struct ucc_geth_rx_interrupt_coalescing_table { | 643 | struct ucc_geth_rx_interrupt_coalescing_table { |
| 644 | ucc_geth_rx_interrupt_coalescing_entry_t coalescingentry[NUM_RX_QUEUES]; | 644 | struct ucc_geth_rx_interrupt_coalescing_entry coalescingentry[NUM_RX_QUEUES]; |
| 645 | /**< interrupt coalescing entry */ | 645 | /**< interrupt coalescing entry */ |
| 646 | } __attribute__ ((packed)) ucc_geth_rx_interrupt_coalescing_table_t; | 646 | } __attribute__ ((packed)); |
| 647 | 647 | ||
| 648 | typedef struct ucc_geth_rx_prefetched_bds { | 648 | struct ucc_geth_rx_prefetched_bds { |
| 649 | qe_bd_t bd[NUM_BDS_IN_PREFETCHED_BDS]; /* prefetched bd */ | 649 | struct qe_bd bd[NUM_BDS_IN_PREFETCHED_BDS]; /* prefetched bd */ |
| 650 | } __attribute__ ((packed)) ucc_geth_rx_prefetched_bds_t; | 650 | } __attribute__ ((packed)); |
| 651 | 651 | ||
| 652 | typedef struct ucc_geth_rx_bd_queues_entry { | 652 | struct ucc_geth_rx_bd_queues_entry { |
| 653 | u32 bdbaseptr; /* BD base pointer */ | 653 | u32 bdbaseptr; /* BD base pointer */ |
| 654 | u32 bdptr; /* BD pointer */ | 654 | u32 bdptr; /* BD pointer */ |
| 655 | u32 externalbdbaseptr; /* external BD base pointer */ | 655 | u32 externalbdbaseptr; /* external BD base pointer */ |
| 656 | u32 externalbdptr; /* external BD pointer */ | 656 | u32 externalbdptr; /* external BD pointer */ |
| 657 | } __attribute__ ((packed)) ucc_geth_rx_bd_queues_entry_t; | 657 | } __attribute__ ((packed)); |
| 658 | 658 | ||
| 659 | typedef struct ucc_geth_tx_global_pram { | 659 | struct ucc_geth_tx_global_pram { |
| 660 | u16 temoder; | 660 | u16 temoder; |
| 661 | u8 res0[0x38 - 0x02]; | 661 | u8 res0[0x38 - 0x02]; |
| 662 | u32 sqptr; /* a base pointer to send queue memory region */ | 662 | u32 sqptr; /* a base pointer to send queue memory region */ |
| @@ -670,15 +670,15 @@ typedef struct ucc_geth_tx_global_pram { | |||
| 670 | u32 tqptr; /* a base pointer to the Tx Queues Memory | 670 | u32 tqptr; /* a base pointer to the Tx Queues Memory |
| 671 | Region */ | 671 | Region */ |
| 672 | u8 res2[0x80 - 0x74]; | 672 | u8 res2[0x80 - 0x74]; |
| 673 | } __attribute__ ((packed)) ucc_geth_tx_global_pram_t; | 673 | } __attribute__ ((packed)); |
| 674 | 674 | ||
| 675 | /* structure representing Extended Filtering Global Parameters in PRAM */ | 675 | /* structure representing Extended Filtering Global Parameters in PRAM */ |
| 676 | typedef struct ucc_geth_exf_global_pram { | 676 | struct ucc_geth_exf_global_pram { |
| 677 | u32 l2pcdptr; /* individual address filter, high */ | 677 | u32 l2pcdptr; /* individual address filter, high */ |
| 678 | u8 res0[0x10 - 0x04]; | 678 | u8 res0[0x10 - 0x04]; |
| 679 | } __attribute__ ((packed)) ucc_geth_exf_global_pram_t; | 679 | } __attribute__ ((packed)); |
| 680 | 680 | ||
| 681 | typedef struct ucc_geth_rx_global_pram { | 681 | struct ucc_geth_rx_global_pram { |
| 682 | u32 remoder; /* ethernet mode reg. */ | 682 | u32 remoder; /* ethernet mode reg. */ |
| 683 | u32 rqptr; /* base pointer to the Rx Queues Memory Region*/ | 683 | u32 rqptr; /* base pointer to the Rx Queues Memory Region*/ |
| 684 | u32 res0[0x1]; | 684 | u32 res0[0x1]; |
| @@ -710,12 +710,12 @@ typedef struct ucc_geth_rx_global_pram { | |||
| 710 | u32 exfGlobalParam; /* base address for extended filtering global | 710 | u32 exfGlobalParam; /* base address for extended filtering global |
| 711 | parameters */ | 711 | parameters */ |
| 712 | u8 res6[0x100 - 0xC4]; /* Initialize to zero */ | 712 | u8 res6[0x100 - 0xC4]; /* Initialize to zero */ |
| 713 | } __attribute__ ((packed)) ucc_geth_rx_global_pram_t; | 713 | } __attribute__ ((packed)); |
| 714 | 714 | ||
| 715 | #define GRACEFUL_STOP_ACKNOWLEDGE_RX 0x01 | 715 | #define GRACEFUL_STOP_ACKNOWLEDGE_RX 0x01 |
| 716 | 716 | ||
| 717 | /* structure representing InitEnet command */ | 717 | /* structure representing InitEnet command */ |
| 718 | typedef struct ucc_geth_init_pram { | 718 | struct ucc_geth_init_pram { |
| 719 | u8 resinit1; | 719 | u8 resinit1; |
| 720 | u8 resinit2; | 720 | u8 resinit2; |
| 721 | u8 resinit3; | 721 | u8 resinit3; |
| @@ -729,7 +729,7 @@ typedef struct ucc_geth_init_pram { | |||
| 729 | u32 txglobal; /* tx global */ | 729 | u32 txglobal; /* tx global */ |
| 730 | u32 txthread[ENET_INIT_PARAM_MAX_ENTRIES_TX]; /* tx threads */ | 730 | u32 txthread[ENET_INIT_PARAM_MAX_ENTRIES_TX]; /* tx threads */ |
| 731 | u8 res3[0x1]; | 731 | u8 res3[0x1]; |
| 732 | } __attribute__ ((packed)) ucc_geth_init_pram_t; | 732 | } __attribute__ ((packed)); |
| 733 | 733 | ||
| 734 | #define ENET_INIT_PARAM_RGF_SHIFT (32 - 4) | 734 | #define ENET_INIT_PARAM_RGF_SHIFT (32 - 4) |
| 735 | #define ENET_INIT_PARAM_TGF_SHIFT (32 - 8) | 735 | #define ENET_INIT_PARAM_TGF_SHIFT (32 - 8) |
| @@ -746,27 +746,27 @@ typedef struct ucc_geth_init_pram { | |||
| 746 | #define ENET_INIT_PARAM_MAGIC_RES_INIT5 0x0400 | 746 | #define ENET_INIT_PARAM_MAGIC_RES_INIT5 0x0400 |
| 747 | 747 | ||
| 748 | /* structure representing 82xx Address Filtering Enet Address in PRAM */ | 748 | /* structure representing 82xx Address Filtering Enet Address in PRAM */ |
| 749 | typedef struct ucc_geth_82xx_enet_address { | 749 | struct ucc_geth_82xx_enet_address { |
| 750 | u8 res1[0x2]; | 750 | u8 res1[0x2]; |
| 751 | u16 h; /* address (MSB) */ | 751 | u16 h; /* address (MSB) */ |
| 752 | u16 m; /* address */ | 752 | u16 m; /* address */ |
| 753 | u16 l; /* address (LSB) */ | 753 | u16 l; /* address (LSB) */ |
| 754 | } __attribute__ ((packed)) ucc_geth_82xx_enet_address_t; | 754 | } __attribute__ ((packed)); |
| 755 | 755 | ||
| 756 | /* structure representing 82xx Address Filtering PRAM */ | 756 | /* structure representing 82xx Address Filtering PRAM */ |
| 757 | typedef struct ucc_geth_82xx_address_filtering_pram { | 757 | struct ucc_geth_82xx_address_filtering_pram { |
| 758 | u32 iaddr_h; /* individual address filter, high */ | 758 | u32 iaddr_h; /* individual address filter, high */ |
| 759 | u32 iaddr_l; /* individual address filter, low */ | 759 | u32 iaddr_l; /* individual address filter, low */ |
| 760 | u32 gaddr_h; /* group address filter, high */ | 760 | u32 gaddr_h; /* group address filter, high */ |
| 761 | u32 gaddr_l; /* group address filter, low */ | 761 | u32 gaddr_l; /* group address filter, low */ |
| 762 | ucc_geth_82xx_enet_address_t taddr; | 762 | struct ucc_geth_82xx_enet_address taddr; |
| 763 | ucc_geth_82xx_enet_address_t paddr[NUM_OF_PADDRS]; | 763 | struct ucc_geth_82xx_enet_address paddr[NUM_OF_PADDRS]; |
| 764 | u8 res0[0x40 - 0x38]; | 764 | u8 res0[0x40 - 0x38]; |
| 765 | } __attribute__ ((packed)) ucc_geth_82xx_address_filtering_pram_t; | 765 | } __attribute__ ((packed)); |
| 766 | 766 | ||
| 767 | /* GETH Tx firmware statistics structure, used when calling | 767 | /* GETH Tx firmware statistics structure, used when calling |
| 768 | UCC_GETH_GetStatistics. */ | 768 | UCC_GETH_GetStatistics. */ |
| 769 | typedef struct ucc_geth_tx_firmware_statistics { | 769 | struct ucc_geth_tx_firmware_statistics { |
| 770 | u32 sicoltx; /* single collision */ | 770 | u32 sicoltx; /* single collision */ |
| 771 | u32 mulcoltx; /* multiple collision */ | 771 | u32 mulcoltx; /* multiple collision */ |
| 772 | u32 latecoltxfr; /* late collision */ | 772 | u32 latecoltxfr; /* late collision */ |
| @@ -786,11 +786,11 @@ typedef struct ucc_geth_tx_firmware_statistics { | |||
| 786 | and 1518 octets */ | 786 | and 1518 octets */ |
| 787 | u32 txpktsjumbo; /* total packets (including bad) between 1024 | 787 | u32 txpktsjumbo; /* total packets (including bad) between 1024 |
| 788 | and MAXLength octets */ | 788 | and MAXLength octets */ |
| 789 | } __attribute__ ((packed)) ucc_geth_tx_firmware_statistics_t; | 789 | } __attribute__ ((packed)); |
| 790 | 790 | ||
| 791 | /* GETH Rx firmware statistics structure, used when calling | 791 | /* GETH Rx firmware statistics structure, used when calling |
| 792 | UCC_GETH_GetStatistics. */ | 792 | UCC_GETH_GetStatistics. */ |
| 793 | typedef struct ucc_geth_rx_firmware_statistics { | 793 | struct ucc_geth_rx_firmware_statistics { |
| 794 | u32 frrxfcser; /* frames with crc error */ | 794 | u32 frrxfcser; /* frames with crc error */ |
| 795 | u32 fraligner; /* frames with alignment error */ | 795 | u32 fraligner; /* frames with alignment error */ |
| 796 | u32 inrangelenrxer; /* in range length error */ | 796 | u32 inrangelenrxer; /* in range length error */ |
| @@ -822,11 +822,11 @@ typedef struct ucc_geth_rx_firmware_statistics { | |||
| 822 | replaced */ | 822 | replaced */ |
| 823 | u32 insertvlan; /* total frames that had their VLAN tag | 823 | u32 insertvlan; /* total frames that had their VLAN tag |
| 824 | inserted */ | 824 | inserted */ |
| 825 | } __attribute__ ((packed)) ucc_geth_rx_firmware_statistics_t; | 825 | } __attribute__ ((packed)); |
| 826 | 826 | ||
| 827 | /* GETH hardware statistics structure, used when calling | 827 | /* GETH hardware statistics structure, used when calling |
| 828 | UCC_GETH_GetStatistics. */ | 828 | UCC_GETH_GetStatistics. */ |
| 829 | typedef struct ucc_geth_hardware_statistics { | 829 | struct ucc_geth_hardware_statistics { |
| 830 | u32 tx64; /* Total number of frames (including bad | 830 | u32 tx64; /* Total number of frames (including bad |
| 831 | frames) transmitted that were exactly of the | 831 | frames) transmitted that were exactly of the |
| 832 | minimal length (64 for un tagged, 68 for | 832 | minimal length (64 for un tagged, 68 for |
| @@ -871,7 +871,7 @@ typedef struct ucc_geth_hardware_statistics { | |||
| 871 | u32 rbca; /* Total number of frames received succesfully | 871 | u32 rbca; /* Total number of frames received succesfully |
| 872 | that had destination address equal to the | 872 | that had destination address equal to the |
| 873 | broadcast address */ | 873 | broadcast address */ |
| 874 | } __attribute__ ((packed)) ucc_geth_hardware_statistics_t; | 874 | } __attribute__ ((packed)); |
| 875 | 875 | ||
| 876 | /* UCC GETH Tx errors returned via TxConf callback */ | 876 | /* UCC GETH Tx errors returned via TxConf callback */ |
| 877 | #define TX_ERRORS_DEF 0x0200 | 877 | #define TX_ERRORS_DEF 0x0200 |
| @@ -1013,21 +1013,21 @@ typedef struct ucc_geth_hardware_statistics { | |||
| 1013 | (MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_112) | 1013 | (MIIMCFG_MANAGEMENT_CLOCK_DIVIDE_BY_112) |
| 1014 | 1014 | ||
| 1015 | /* Ethernet speed */ | 1015 | /* Ethernet speed */ |
| 1016 | typedef enum enet_speed { | 1016 | enum enet_speed { |
| 1017 | ENET_SPEED_10BT, /* 10 Base T */ | 1017 | ENET_SPEED_10BT, /* 10 Base T */ |
| 1018 | ENET_SPEED_100BT, /* 100 Base T */ | 1018 | ENET_SPEED_100BT, /* 100 Base T */ |
| 1019 | ENET_SPEED_1000BT /* 1000 Base T */ | 1019 | ENET_SPEED_1000BT /* 1000 Base T */ |
| 1020 | } enet_speed_e; | 1020 | }; |
| 1021 | 1021 | ||
| 1022 | /* Ethernet Address Type. */ | 1022 | /* Ethernet Address Type. */ |
| 1023 | typedef enum enet_addr_type { | 1023 | enum enet_addr_type { |
| 1024 | ENET_ADDR_TYPE_INDIVIDUAL, | 1024 | ENET_ADDR_TYPE_INDIVIDUAL, |
| 1025 | ENET_ADDR_TYPE_GROUP, | 1025 | ENET_ADDR_TYPE_GROUP, |
| 1026 | ENET_ADDR_TYPE_BROADCAST | 1026 | ENET_ADDR_TYPE_BROADCAST |
| 1027 | } enet_addr_type_e; | 1027 | }; |
| 1028 | 1028 | ||
| 1029 | /* TBI / MII Set Register */ | 1029 | /* TBI / MII Set Register */ |
| 1030 | typedef enum enet_tbi_mii_reg { | 1030 | enum enet_tbi_mii_reg { |
| 1031 | ENET_TBI_MII_CR = 0x00, /* Control (CR ) */ | 1031 | ENET_TBI_MII_CR = 0x00, /* Control (CR ) */ |
| 1032 | ENET_TBI_MII_SR = 0x01, /* Status (SR ) */ | 1032 | ENET_TBI_MII_SR = 0x01, /* Status (SR ) */ |
| 1033 | ENET_TBI_MII_ANA = 0x04, /* AN advertisement (ANA ) */ | 1033 | ENET_TBI_MII_ANA = 0x04, /* AN advertisement (ANA ) */ |
| @@ -1040,10 +1040,10 @@ typedef enum enet_tbi_mii_reg { | |||
| 1040 | ENET_TBI_MII_EXST = 0x0F, /* Extended status (EXST ) */ | 1040 | ENET_TBI_MII_EXST = 0x0F, /* Extended status (EXST ) */ |
| 1041 | ENET_TBI_MII_JD = 0x10, /* Jitter diagnostics (JD ) */ | 1041 | ENET_TBI_MII_JD = 0x10, /* Jitter diagnostics (JD ) */ |
| 1042 | ENET_TBI_MII_TBICON = 0x11 /* TBI control (TBICON ) */ | 1042 | ENET_TBI_MII_TBICON = 0x11 /* TBI control (TBICON ) */ |
| 1043 | } enet_tbi_mii_reg_e; | 1043 | }; |
| 1044 | 1044 | ||
| 1045 | /* UCC GETH 82xx Ethernet Address Recognition Location */ | 1045 | /* UCC GETH 82xx Ethernet Address Recognition Location */ |
| 1046 | typedef enum ucc_geth_enet_address_recognition_location { | 1046 | enum ucc_geth_enet_address_recognition_location { |
| 1047 | UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_STATION_ADDRESS,/* station | 1047 | UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_STATION_ADDRESS,/* station |
| 1048 | address */ | 1048 | address */ |
| 1049 | UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_PADDR_FIRST, /* additional | 1049 | UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_PADDR_FIRST, /* additional |
| @@ -1065,10 +1065,10 @@ typedef enum ucc_geth_enet_address_recognition_location { | |||
| 1065 | UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_GROUP_HASH, /* group hash */ | 1065 | UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_GROUP_HASH, /* group hash */ |
| 1066 | UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_INDIVIDUAL_HASH /* individual | 1066 | UCC_GETH_ENET_ADDRESS_RECOGNITION_LOCATION_INDIVIDUAL_HASH /* individual |
| 1067 | hash */ | 1067 | hash */ |
| 1068 | } ucc_geth_enet_address_recognition_location_e; | 1068 | }; |
| 1069 | 1069 | ||
| 1070 | /* UCC GETH vlan operation tagged */ | 1070 | /* UCC GETH vlan operation tagged */ |
| 1071 | typedef enum ucc_geth_vlan_operation_tagged { | 1071 | enum ucc_geth_vlan_operation_tagged { |
| 1072 | UCC_GETH_VLAN_OPERATION_TAGGED_NOP = 0x0, /* Tagged - nop */ | 1072 | UCC_GETH_VLAN_OPERATION_TAGGED_NOP = 0x0, /* Tagged - nop */ |
| 1073 | UCC_GETH_VLAN_OPERATION_TAGGED_REPLACE_VID_PORTION_OF_Q_TAG | 1073 | UCC_GETH_VLAN_OPERATION_TAGGED_REPLACE_VID_PORTION_OF_Q_TAG |
| 1074 | = 0x1, /* Tagged - replace vid portion of q tag */ | 1074 | = 0x1, /* Tagged - replace vid portion of q tag */ |
| @@ -1076,18 +1076,18 @@ typedef enum ucc_geth_vlan_operation_tagged { | |||
| 1076 | = 0x2, /* Tagged - if vid0 replace vid with default value */ | 1076 | = 0x2, /* Tagged - if vid0 replace vid with default value */ |
| 1077 | UCC_GETH_VLAN_OPERATION_TAGGED_EXTRACT_Q_TAG_FROM_FRAME | 1077 | UCC_GETH_VLAN_OPERATION_TAGGED_EXTRACT_Q_TAG_FROM_FRAME |
| 1078 | = 0x3 /* Tagged - extract q tag from frame */ | 1078 | = 0x3 /* Tagged - extract q tag from frame */ |
| 1079 | } ucc_geth_vlan_operation_tagged_e; | 1079 | }; |
| 1080 | 1080 | ||
| 1081 | /* UCC GETH vlan operation non-tagged */ | 1081 | /* UCC GETH vlan operation non-tagged */ |
| 1082 | typedef enum ucc_geth_vlan_operation_non_tagged { | 1082 | enum ucc_geth_vlan_operation_non_tagged { |
| 1083 | UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP = 0x0, /* Non tagged - nop */ | 1083 | UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP = 0x0, /* Non tagged - nop */ |
| 1084 | UCC_GETH_VLAN_OPERATION_NON_TAGGED_Q_TAG_INSERT = 0x1 /* Non tagged - | 1084 | UCC_GETH_VLAN_OPERATION_NON_TAGGED_Q_TAG_INSERT = 0x1 /* Non tagged - |
| 1085 | q tag insert | 1085 | q tag insert |
| 1086 | */ | 1086 | */ |
| 1087 | } ucc_geth_vlan_operation_non_tagged_e; | 1087 | }; |
| 1088 | 1088 | ||
| 1089 | /* UCC GETH Rx Quality of Service Mode */ | 1089 | /* UCC GETH Rx Quality of Service Mode */ |
| 1090 | typedef enum ucc_geth_qos_mode { | 1090 | enum ucc_geth_qos_mode { |
| 1091 | UCC_GETH_QOS_MODE_DEFAULT = 0x0, /* default queue */ | 1091 | UCC_GETH_QOS_MODE_DEFAULT = 0x0, /* default queue */ |
| 1092 | UCC_GETH_QOS_MODE_QUEUE_NUM_FROM_L2_CRITERIA = 0x1, /* queue | 1092 | UCC_GETH_QOS_MODE_QUEUE_NUM_FROM_L2_CRITERIA = 0x1, /* queue |
| 1093 | determined | 1093 | determined |
| @@ -1097,11 +1097,11 @@ typedef enum ucc_geth_qos_mode { | |||
| 1097 | determined | 1097 | determined |
| 1098 | by L3 | 1098 | by L3 |
| 1099 | criteria */ | 1099 | criteria */ |
| 1100 | } ucc_geth_qos_mode_e; | 1100 | }; |
| 1101 | 1101 | ||
| 1102 | /* UCC GETH Statistics Gathering Mode - These are bit flags, 'or' them together | 1102 | /* UCC GETH Statistics Gathering Mode - These are bit flags, 'or' them together |
| 1103 | for combined functionality */ | 1103 | for combined functionality */ |
| 1104 | typedef enum ucc_geth_statistics_gathering_mode { | 1104 | enum ucc_geth_statistics_gathering_mode { |
| 1105 | UCC_GETH_STATISTICS_GATHERING_MODE_NONE = 0x00000000, /* No | 1105 | UCC_GETH_STATISTICS_GATHERING_MODE_NONE = 0x00000000, /* No |
| 1106 | statistics | 1106 | statistics |
| 1107 | gathering */ | 1107 | gathering */ |
| @@ -1122,10 +1122,10 @@ typedef enum ucc_geth_statistics_gathering_mode { | |||
| 1122 | statistics | 1122 | statistics |
| 1123 | gathering | 1123 | gathering |
| 1124 | */ | 1124 | */ |
| 1125 | } ucc_geth_statistics_gathering_mode_e; | 1125 | }; |
| 1126 | 1126 | ||
| 1127 | /* UCC GETH Pad and CRC Mode - Note, Padding without CRC is not possible */ | 1127 | /* UCC GETH Pad and CRC Mode - Note, Padding without CRC is not possible */ |
| 1128 | typedef enum ucc_geth_maccfg2_pad_and_crc_mode { | 1128 | enum ucc_geth_maccfg2_pad_and_crc_mode { |
| 1129 | UCC_GETH_PAD_AND_CRC_MODE_NONE | 1129 | UCC_GETH_PAD_AND_CRC_MODE_NONE |
| 1130 | = MACCFG2_PAD_AND_CRC_MODE_NONE, /* Neither Padding | 1130 | = MACCFG2_PAD_AND_CRC_MODE_NONE, /* Neither Padding |
| 1131 | short frames | 1131 | short frames |
| @@ -1135,61 +1135,59 @@ typedef enum ucc_geth_maccfg2_pad_and_crc_mode { | |||
| 1135 | CRC only */ | 1135 | CRC only */ |
| 1136 | UCC_GETH_PAD_AND_CRC_MODE_PAD_AND_CRC = | 1136 | UCC_GETH_PAD_AND_CRC_MODE_PAD_AND_CRC = |
| 1137 | MACCFG2_PAD_AND_CRC_MODE_PAD_AND_CRC | 1137 | MACCFG2_PAD_AND_CRC_MODE_PAD_AND_CRC |
| 1138 | } ucc_geth_maccfg2_pad_and_crc_mode_e; | 1138 | }; |
| 1139 | 1139 | ||
| 1140 | /* UCC GETH upsmr Flow Control Mode */ | 1140 | /* UCC GETH upsmr Flow Control Mode */ |
| 1141 | typedef enum ucc_geth_flow_control_mode { | 1141 | enum ucc_geth_flow_control_mode { |
| 1142 | UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_NONE = 0x00000000, /* No automatic | 1142 | UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_NONE = 0x00000000, /* No automatic |
| 1143 | flow control | 1143 | flow control |
| 1144 | */ | 1144 | */ |
| 1145 | UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_PAUSE_WHEN_EMERGENCY | 1145 | UPSMR_AUTOMATIC_FLOW_CONTROL_MODE_PAUSE_WHEN_EMERGENCY |
| 1146 | = 0x00004000 /* Send pause frame when RxFIFO reaches its | 1146 | = 0x00004000 /* Send pause frame when RxFIFO reaches its |
| 1147 | emergency threshold */ | 1147 | emergency threshold */ |
| 1148 | } ucc_geth_flow_control_mode_e; | 1148 | }; |
| 1149 | 1149 | ||
| 1150 | /* UCC GETH number of threads */ | 1150 | /* UCC GETH number of threads */ |
| 1151 | typedef enum ucc_geth_num_of_threads { | 1151 | enum ucc_geth_num_of_threads { |
| 1152 | UCC_GETH_NUM_OF_THREADS_1 = 0x1, /* 1 */ | 1152 | UCC_GETH_NUM_OF_THREADS_1 = 0x1, /* 1 */ |
| 1153 | UCC_GETH_NUM_OF_THREADS_2 = 0x2, /* 2 */ | 1153 | UCC_GETH_NUM_OF_THREADS_2 = 0x2, /* 2 */ |
| 1154 | UCC_GETH_NUM_OF_THREADS_4 = 0x0, /* 4 */ | 1154 | UCC_GETH_NUM_OF_THREADS_4 = 0x0, /* 4 */ |
| 1155 | UCC_GETH_NUM_OF_THREADS_6 = 0x3, /* 6 */ | 1155 | UCC_GETH_NUM_OF_THREADS_6 = 0x3, /* 6 */ |
| 1156 | UCC_GETH_NUM_OF_THREADS_8 = 0x4 /* 8 */ | 1156 | UCC_GETH_NUM_OF_THREADS_8 = 0x4 /* 8 */ |
| 1157 | } ucc_geth_num_of_threads_e; | 1157 | }; |
| 1158 | 1158 | ||
| 1159 | /* UCC GETH number of station addresses */ | 1159 | /* UCC GETH number of station addresses */ |
| 1160 | typedef enum ucc_geth_num_of_station_addresses { | 1160 | enum ucc_geth_num_of_station_addresses { |
| 1161 | UCC_GETH_NUM_OF_STATION_ADDRESSES_1, /* 1 */ | 1161 | UCC_GETH_NUM_OF_STATION_ADDRESSES_1, /* 1 */ |
| 1162 | UCC_GETH_NUM_OF_STATION_ADDRESSES_5 /* 5 */ | 1162 | UCC_GETH_NUM_OF_STATION_ADDRESSES_5 /* 5 */ |
| 1163 | } ucc_geth_num_of_station_addresses_e; | 1163 | }; |
| 1164 | |||
| 1165 | typedef u8 enet_addr_t[ENET_NUM_OCTETS_PER_ADDRESS]; | ||
| 1166 | 1164 | ||
| 1167 | /* UCC GETH 82xx Ethernet Address Container */ | 1165 | /* UCC GETH 82xx Ethernet Address Container */ |
| 1168 | typedef struct enet_addr_container { | 1166 | struct enet_addr_container { |
| 1169 | enet_addr_t address; /* ethernet address */ | 1167 | u8 address[ENET_NUM_OCTETS_PER_ADDRESS]; /* ethernet address */ |
| 1170 | ucc_geth_enet_address_recognition_location_e location; /* location in | 1168 | enum ucc_geth_enet_address_recognition_location location; /* location in |
| 1171 | 82xx address | 1169 | 82xx address |
| 1172 | recognition | 1170 | recognition |
| 1173 | hardware */ | 1171 | hardware */ |
| 1174 | struct list_head node; | 1172 | struct list_head node; |
| 1175 | } enet_addr_container_t; | 1173 | }; |
| 1176 | 1174 | ||
| 1177 | #define ENET_ADDR_CONT_ENTRY(ptr) list_entry(ptr, enet_addr_container_t, node) | 1175 | #define ENET_ADDR_CONT_ENTRY(ptr) list_entry(ptr, struct enet_addr_container, node) |
| 1178 | 1176 | ||
| 1179 | /* UCC GETH Termination Action Descriptor (TAD) structure. */ | 1177 | /* UCC GETH Termination Action Descriptor (TAD) structure. */ |
| 1180 | typedef struct ucc_geth_tad_params { | 1178 | struct ucc_geth_tad_params { |
| 1181 | int rx_non_dynamic_extended_features_mode; | 1179 | int rx_non_dynamic_extended_features_mode; |
| 1182 | int reject_frame; | 1180 | int reject_frame; |
| 1183 | ucc_geth_vlan_operation_tagged_e vtag_op; | 1181 | enum ucc_geth_vlan_operation_tagged vtag_op; |
| 1184 | ucc_geth_vlan_operation_non_tagged_e vnontag_op; | 1182 | enum ucc_geth_vlan_operation_non_tagged vnontag_op; |
| 1185 | ucc_geth_qos_mode_e rqos; | 1183 | enum ucc_geth_qos_mode rqos; |
| 1186 | u8 vpri; | 1184 | u8 vpri; |
| 1187 | u16 vid; | 1185 | u16 vid; |
| 1188 | } ucc_geth_tad_params_t; | 1186 | }; |
| 1189 | 1187 | ||
| 1190 | /* GETH protocol initialization structure */ | 1188 | /* GETH protocol initialization structure */ |
| 1191 | typedef struct ucc_geth_info { | 1189 | struct ucc_geth_info { |
| 1192 | ucc_fast_info_t uf_info; | 1190 | struct ucc_fast_info uf_info; |
| 1193 | u8 numQueuesTx; | 1191 | u8 numQueuesTx; |
| 1194 | u8 numQueuesRx; | 1192 | u8 numQueuesRx; |
| 1195 | int ipCheckSumCheck; | 1193 | int ipCheckSumCheck; |
| @@ -1251,51 +1249,51 @@ typedef struct ucc_geth_info { | |||
| 1251 | u8 iphoffset[TX_IP_OFFSET_ENTRY_MAX]; | 1249 | u8 iphoffset[TX_IP_OFFSET_ENTRY_MAX]; |
| 1252 | u16 bdRingLenTx[NUM_TX_QUEUES]; | 1250 | u16 bdRingLenTx[NUM_TX_QUEUES]; |
| 1253 | u16 bdRingLenRx[NUM_RX_QUEUES]; | 1251 | u16 bdRingLenRx[NUM_RX_QUEUES]; |
| 1254 | enet_interface_e enet_interface; | 1252 | enum enet_interface enet_interface; |
| 1255 | ucc_geth_num_of_station_addresses_e numStationAddresses; | 1253 | enum ucc_geth_num_of_station_addresses numStationAddresses; |
| 1256 | qe_fltr_largest_external_tbl_lookup_key_size_e | 1254 | enum qe_fltr_largest_external_tbl_lookup_key_size |
| 1257 | largestexternallookupkeysize; | 1255 | largestexternallookupkeysize; |
| 1258 | ucc_geth_statistics_gathering_mode_e statisticsMode; | 1256 | enum ucc_geth_statistics_gathering_mode statisticsMode; |
| 1259 | ucc_geth_vlan_operation_tagged_e vlanOperationTagged; | 1257 | enum ucc_geth_vlan_operation_tagged vlanOperationTagged; |
| 1260 | ucc_geth_vlan_operation_non_tagged_e vlanOperationNonTagged; | 1258 | enum ucc_geth_vlan_operation_non_tagged vlanOperationNonTagged; |
| 1261 | ucc_geth_qos_mode_e rxQoSMode; | 1259 | enum ucc_geth_qos_mode rxQoSMode; |
| 1262 | ucc_geth_flow_control_mode_e aufc; | 1260 | enum ucc_geth_flow_control_mode aufc; |
| 1263 | ucc_geth_maccfg2_pad_and_crc_mode_e padAndCrc; | 1261 | enum ucc_geth_maccfg2_pad_and_crc_mode padAndCrc; |
| 1264 | ucc_geth_num_of_threads_e numThreadsTx; | 1262 | enum ucc_geth_num_of_threads numThreadsTx; |
| 1265 | ucc_geth_num_of_threads_e numThreadsRx; | 1263 | enum ucc_geth_num_of_threads numThreadsRx; |
| 1266 | qe_risc_allocation_e riscTx; | 1264 | enum qe_risc_allocation riscTx; |
| 1267 | qe_risc_allocation_e riscRx; | 1265 | enum qe_risc_allocation riscRx; |
| 1268 | } ucc_geth_info_t; | 1266 | }; |
| 1269 | 1267 | ||
| 1270 | /* structure representing UCC GETH */ | 1268 | /* structure representing UCC GETH */ |
| 1271 | typedef struct ucc_geth_private { | 1269 | struct ucc_geth_private { |
| 1272 | ucc_geth_info_t *ug_info; | 1270 | struct ucc_geth_info *ug_info; |
| 1273 | ucc_fast_private_t *uccf; | 1271 | struct ucc_fast_private *uccf; |
| 1274 | struct net_device *dev; | 1272 | struct net_device *dev; |
| 1275 | struct net_device_stats stats; /* linux network statistics */ | 1273 | struct net_device_stats stats; /* linux network statistics */ |
| 1276 | ucc_geth_t *ug_regs; | 1274 | struct ucc_geth *ug_regs; |
| 1277 | ucc_geth_init_pram_t *p_init_enet_param_shadow; | 1275 | struct ucc_geth_init_pram *p_init_enet_param_shadow; |
| 1278 | ucc_geth_exf_global_pram_t *p_exf_glbl_param; | 1276 | struct ucc_geth_exf_global_pram *p_exf_glbl_param; |
| 1279 | u32 exf_glbl_param_offset; | 1277 | u32 exf_glbl_param_offset; |
| 1280 | ucc_geth_rx_global_pram_t *p_rx_glbl_pram; | 1278 | struct ucc_geth_rx_global_pram *p_rx_glbl_pram; |
| 1281 | u32 rx_glbl_pram_offset; | 1279 | u32 rx_glbl_pram_offset; |
| 1282 | ucc_geth_tx_global_pram_t *p_tx_glbl_pram; | 1280 | struct ucc_geth_tx_global_pram *p_tx_glbl_pram; |
| 1283 | u32 tx_glbl_pram_offset; | 1281 | u32 tx_glbl_pram_offset; |
| 1284 | ucc_geth_send_queue_mem_region_t *p_send_q_mem_reg; | 1282 | struct ucc_geth_send_queue_mem_region *p_send_q_mem_reg; |
| 1285 | u32 send_q_mem_reg_offset; | 1283 | u32 send_q_mem_reg_offset; |
| 1286 | ucc_geth_thread_data_tx_t *p_thread_data_tx; | 1284 | struct ucc_geth_thread_data_tx *p_thread_data_tx; |
| 1287 | u32 thread_dat_tx_offset; | 1285 | u32 thread_dat_tx_offset; |
| 1288 | ucc_geth_thread_data_rx_t *p_thread_data_rx; | 1286 | struct ucc_geth_thread_data_rx *p_thread_data_rx; |
| 1289 | u32 thread_dat_rx_offset; | 1287 | u32 thread_dat_rx_offset; |
| 1290 | ucc_geth_scheduler_t *p_scheduler; | 1288 | struct ucc_geth_scheduler *p_scheduler; |
| 1291 | u32 scheduler_offset; | 1289 | u32 scheduler_offset; |
| 1292 | ucc_geth_tx_firmware_statistics_pram_t *p_tx_fw_statistics_pram; | 1290 | struct ucc_geth_tx_firmware_statistics_pram *p_tx_fw_statistics_pram; |
| 1293 | u32 tx_fw_statistics_pram_offset; | 1291 | u32 tx_fw_statistics_pram_offset; |
| 1294 | ucc_geth_rx_firmware_statistics_pram_t *p_rx_fw_statistics_pram; | 1292 | struct ucc_geth_rx_firmware_statistics_pram *p_rx_fw_statistics_pram; |
| 1295 | u32 rx_fw_statistics_pram_offset; | 1293 | u32 rx_fw_statistics_pram_offset; |
| 1296 | ucc_geth_rx_interrupt_coalescing_table_t *p_rx_irq_coalescing_tbl; | 1294 | struct ucc_geth_rx_interrupt_coalescing_table *p_rx_irq_coalescing_tbl; |
| 1297 | u32 rx_irq_coalescing_tbl_offset; | 1295 | u32 rx_irq_coalescing_tbl_offset; |
| 1298 | ucc_geth_rx_bd_queues_entry_t *p_rx_bd_qs_tbl; | 1296 | struct ucc_geth_rx_bd_queues_entry *p_rx_bd_qs_tbl; |
| 1299 | u32 rx_bd_qs_tbl_offset; | 1297 | u32 rx_bd_qs_tbl_offset; |
| 1300 | u8 *p_tx_bd_ring[NUM_TX_QUEUES]; | 1298 | u8 *p_tx_bd_ring[NUM_TX_QUEUES]; |
| 1301 | u32 tx_bd_ring_offset[NUM_TX_QUEUES]; | 1299 | u32 tx_bd_ring_offset[NUM_TX_QUEUES]; |
| @@ -1308,7 +1306,7 @@ typedef struct ucc_geth_private { | |||
| 1308 | u16 cpucount[NUM_TX_QUEUES]; | 1306 | u16 cpucount[NUM_TX_QUEUES]; |
| 1309 | volatile u16 *p_cpucount[NUM_TX_QUEUES]; | 1307 | volatile u16 *p_cpucount[NUM_TX_QUEUES]; |
| 1310 | int indAddrRegUsed[NUM_OF_PADDRS]; | 1308 | int indAddrRegUsed[NUM_OF_PADDRS]; |
| 1311 | enet_addr_t paddr[NUM_OF_PADDRS]; | 1309 | u8 paddr[NUM_OF_PADDRS][ENET_NUM_OCTETS_PER_ADDRESS]; /* ethernet address */ |
| 1312 | u8 numGroupAddrInHash; | 1310 | u8 numGroupAddrInHash; |
| 1313 | u8 numIndAddrInHash; | 1311 | u8 numIndAddrInHash; |
| 1314 | u8 numIndAddrInReg; | 1312 | u8 numIndAddrInReg; |
| @@ -1334,6 +1332,6 @@ typedef struct ucc_geth_private { | |||
| 1334 | int oldspeed; | 1332 | int oldspeed; |
| 1335 | int oldduplex; | 1333 | int oldduplex; |
| 1336 | int oldlink; | 1334 | int oldlink; |
| 1337 | } ucc_geth_private_t; | 1335 | }; |
| 1338 | 1336 | ||
| 1339 | #endif /* __UCC_GETH_H__ */ | 1337 | #endif /* __UCC_GETH_H__ */ |
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c index 67260eb3188a..5360ec05eaa3 100644 --- a/drivers/net/ucc_geth_phy.c +++ b/drivers/net/ucc_geth_phy.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | 42 | ||
| 43 | #include "ucc_geth.h" | 43 | #include "ucc_geth.h" |
| 44 | #include "ucc_geth_phy.h" | 44 | #include "ucc_geth_phy.h" |
| 45 | #include <platforms/83xx/mpc8360e_pb.h> | ||
| 46 | 45 | ||
| 47 | #define ugphy_printk(level, format, arg...) \ | 46 | #define ugphy_printk(level, format, arg...) \ |
| 48 | printk(level format "\n", ## arg) | 47 | printk(level format "\n", ## arg) |
| @@ -72,16 +71,14 @@ static int genmii_read_status(struct ugeth_mii_info *mii_info); | |||
| 72 | u16 phy_read(struct ugeth_mii_info *mii_info, u16 regnum); | 71 | u16 phy_read(struct ugeth_mii_info *mii_info, u16 regnum); |
| 73 | void phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val); | 72 | void phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val); |
| 74 | 73 | ||
| 75 | static u8 *bcsr_regs = NULL; | ||
| 76 | |||
| 77 | /* Write value to the PHY for this device to the register at regnum, */ | 74 | /* Write value to the PHY for this device to the register at regnum, */ |
| 78 | /* waiting until the write is done before it returns. All PHY */ | 75 | /* waiting until the write is done before it returns. All PHY */ |
| 79 | /* configuration has to be done through the TSEC1 MIIM regs */ | 76 | /* configuration has to be done through the TSEC1 MIIM regs */ |
| 80 | void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value) | 77 | void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value) |
| 81 | { | 78 | { |
| 82 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 79 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 83 | ucc_mii_mng_t *mii_regs; | 80 | struct ucc_mii_mng *mii_regs; |
| 84 | enet_tbi_mii_reg_e mii_reg = (enet_tbi_mii_reg_e) regnum; | 81 | enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg) regnum; |
| 85 | u32 tmp_reg; | 82 | u32 tmp_reg; |
| 86 | 83 | ||
| 87 | ugphy_vdbg("%s: IN", __FUNCTION__); | 84 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| @@ -116,9 +113,9 @@ void write_phy_reg(struct net_device *dev, int mii_id, int regnum, int value) | |||
| 116 | /* configuration has to be done through the TSEC1 MIIM regs */ | 113 | /* configuration has to be done through the TSEC1 MIIM regs */ |
| 117 | int read_phy_reg(struct net_device *dev, int mii_id, int regnum) | 114 | int read_phy_reg(struct net_device *dev, int mii_id, int regnum) |
| 118 | { | 115 | { |
| 119 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 116 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
| 120 | ucc_mii_mng_t *mii_regs; | 117 | struct ucc_mii_mng *mii_regs; |
| 121 | enet_tbi_mii_reg_e mii_reg = (enet_tbi_mii_reg_e) regnum; | 118 | enum enet_tbi_mii_reg mii_reg = (enum enet_tbi_mii_reg) regnum; |
| 122 | u32 tmp_reg; | 119 | u32 tmp_reg; |
| 123 | u16 value; | 120 | u16 value; |
| 124 | 121 | ||
| @@ -634,11 +631,6 @@ static void dm9161_close(struct ugeth_mii_info *mii_info) | |||
| 634 | 631 | ||
| 635 | static int dm9161_ack_interrupt(struct ugeth_mii_info *mii_info) | 632 | static int dm9161_ack_interrupt(struct ugeth_mii_info *mii_info) |
| 636 | { | 633 | { |
| 637 | /* FIXME: This lines are for BUG fixing in the mpc8325. | ||
| 638 | Remove this from here when it's fixed */ | ||
| 639 | if (bcsr_regs == NULL) | ||
| 640 | bcsr_regs = (u8 *) ioremap(BCSR_PHYS_ADDR, BCSR_SIZE); | ||
| 641 | bcsr_regs[14] |= 0x40; | ||
| 642 | ugphy_vdbg("%s: IN", __FUNCTION__); | 634 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 643 | 635 | ||
| 644 | /* Clear the interrupts by reading the reg */ | 636 | /* Clear the interrupts by reading the reg */ |
| @@ -650,12 +642,6 @@ Remove this from here when it's fixed */ | |||
| 650 | 642 | ||
| 651 | static int dm9161_config_intr(struct ugeth_mii_info *mii_info) | 643 | static int dm9161_config_intr(struct ugeth_mii_info *mii_info) |
| 652 | { | 644 | { |
| 653 | /* FIXME: This lines are for BUG fixing in the mpc8325. | ||
| 654 | Remove this from here when it's fixed */ | ||
| 655 | if (bcsr_regs == NULL) { | ||
| 656 | bcsr_regs = (u8 *) ioremap(BCSR_PHYS_ADDR, BCSR_SIZE); | ||
| 657 | bcsr_regs[14] &= ~0x40; | ||
| 658 | } | ||
| 659 | ugphy_vdbg("%s: IN", __FUNCTION__); | 645 | ugphy_vdbg("%s: IN", __FUNCTION__); |
| 660 | 646 | ||
| 661 | if (mii_info->interrupts == MII_INTERRUPT_ENABLED) | 647 | if (mii_info->interrupts == MII_INTERRUPT_ENABLED) |
diff --git a/drivers/net/ucc_geth_phy.h b/drivers/net/ucc_geth_phy.h index 2f98b8f1bb0a..f5740783670f 100644 --- a/drivers/net/ucc_geth_phy.h +++ b/drivers/net/ucc_geth_phy.h | |||
| @@ -126,7 +126,7 @@ struct ugeth_mii_info { | |||
| 126 | /* And management functions */ | 126 | /* And management functions */ |
| 127 | struct phy_info *phyinfo; | 127 | struct phy_info *phyinfo; |
| 128 | 128 | ||
| 129 | ucc_mii_mng_t *mii_regs; | 129 | struct ucc_mii_mng *mii_regs; |
| 130 | 130 | ||
| 131 | /* forced speed & duplex (no autoneg) | 131 | /* forced speed & duplex (no autoneg) |
| 132 | * partner speed & duplex & pause (autoneg) | 132 | * partner speed & duplex & pause (autoneg) |
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index 5823e3bca178..36d1c3ff7078 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
| @@ -2867,7 +2867,6 @@ static int ch_config(pc300dev_t * d) | |||
| 2867 | uclong clktype = chan->conf.phys_settings.clock_type; | 2867 | uclong clktype = chan->conf.phys_settings.clock_type; |
| 2868 | ucshort encoding = chan->conf.proto_settings.encoding; | 2868 | ucshort encoding = chan->conf.proto_settings.encoding; |
| 2869 | ucshort parity = chan->conf.proto_settings.parity; | 2869 | ucshort parity = chan->conf.proto_settings.parity; |
| 2870 | int tmc, br; | ||
| 2871 | ucchar md0, md2; | 2870 | ucchar md0, md2; |
| 2872 | 2871 | ||
| 2873 | /* Reset the channel */ | 2872 | /* Reset the channel */ |
| @@ -2940,8 +2939,12 @@ static int ch_config(pc300dev_t * d) | |||
| 2940 | case PC300_RSV: | 2939 | case PC300_RSV: |
| 2941 | case PC300_X21: | 2940 | case PC300_X21: |
| 2942 | if (clktype == CLOCK_INT || clktype == CLOCK_TXINT) { | 2941 | if (clktype == CLOCK_INT || clktype == CLOCK_TXINT) { |
| 2942 | int tmc, br; | ||
| 2943 | |||
| 2943 | /* Calculate the clkrate parameters */ | 2944 | /* Calculate the clkrate parameters */ |
| 2944 | tmc = clock_rate_calc(clkrate, card->hw.clock, &br); | 2945 | tmc = clock_rate_calc(clkrate, card->hw.clock, &br); |
| 2946 | if (tmc < 0) | ||
| 2947 | return -EIO; | ||
| 2945 | cpc_writeb(scabase + M_REG(TMCT, ch), tmc); | 2948 | cpc_writeb(scabase + M_REG(TMCT, ch), tmc); |
| 2946 | cpc_writeb(scabase + M_REG(TXS, ch), | 2949 | cpc_writeb(scabase + M_REG(TXS, ch), |
| 2947 | (TXS_DTRXC | TXS_IBRG | br)); | 2950 | (TXS_DTRXC | TXS_IBRG | br)); |
| @@ -3097,14 +3100,16 @@ static int cpc_attach(struct net_device *dev, unsigned short encoding, | |||
| 3097 | return 0; | 3100 | return 0; |
| 3098 | } | 3101 | } |
| 3099 | 3102 | ||
| 3100 | static void cpc_opench(pc300dev_t * d) | 3103 | static int cpc_opench(pc300dev_t * d) |
| 3101 | { | 3104 | { |
| 3102 | pc300ch_t *chan = (pc300ch_t *) d->chan; | 3105 | pc300ch_t *chan = (pc300ch_t *) d->chan; |
| 3103 | pc300_t *card = (pc300_t *) chan->card; | 3106 | pc300_t *card = (pc300_t *) chan->card; |
| 3104 | int ch = chan->channel; | 3107 | int ch = chan->channel, rc; |
| 3105 | void __iomem *scabase = card->hw.scabase; | 3108 | void __iomem *scabase = card->hw.scabase; |
| 3106 | 3109 | ||
| 3107 | ch_config(d); | 3110 | rc = ch_config(d); |
| 3111 | if (rc) | ||
| 3112 | return rc; | ||
| 3108 | 3113 | ||
| 3109 | rx_config(d); | 3114 | rx_config(d); |
| 3110 | 3115 | ||
| @@ -3113,6 +3118,8 @@ static void cpc_opench(pc300dev_t * d) | |||
| 3113 | /* Assert RTS and DTR */ | 3118 | /* Assert RTS and DTR */ |
| 3114 | cpc_writeb(scabase + M_REG(CTL, ch), | 3119 | cpc_writeb(scabase + M_REG(CTL, ch), |
| 3115 | cpc_readb(scabase + M_REG(CTL, ch)) & ~(CTL_RTS | CTL_DTR)); | 3120 | cpc_readb(scabase + M_REG(CTL, ch)) & ~(CTL_RTS | CTL_DTR)); |
| 3121 | |||
| 3122 | return 0; | ||
| 3116 | } | 3123 | } |
| 3117 | 3124 | ||
| 3118 | static void cpc_closech(pc300dev_t * d) | 3125 | static void cpc_closech(pc300dev_t * d) |
| @@ -3168,9 +3175,16 @@ int cpc_open(struct net_device *dev) | |||
| 3168 | } | 3175 | } |
| 3169 | 3176 | ||
| 3170 | sprintf(ifr.ifr_name, "%s", dev->name); | 3177 | sprintf(ifr.ifr_name, "%s", dev->name); |
| 3171 | cpc_opench(d); | 3178 | result = cpc_opench(d); |
| 3179 | if (result) | ||
| 3180 | goto err_out; | ||
| 3181 | |||
| 3172 | netif_start_queue(dev); | 3182 | netif_start_queue(dev); |
| 3173 | return 0; | 3183 | return 0; |
| 3184 | |||
| 3185 | err_out: | ||
| 3186 | hdlc_close(dev); | ||
| 3187 | return result; | ||
| 3174 | } | 3188 | } |
| 3175 | 3189 | ||
| 3176 | static int cpc_close(struct net_device *dev) | 3190 | static int cpc_close(struct net_device *dev) |
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 0a33c8a56e13..efcdaf1c5f73 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
| @@ -2897,6 +2897,8 @@ static struct net_device *_init_airo_card( unsigned short irq, int port, | |||
| 2897 | goto err_out_map; | 2897 | goto err_out_map; |
| 2898 | } | 2898 | } |
| 2899 | ai->wifidev = init_wifidev(ai, dev); | 2899 | ai->wifidev = init_wifidev(ai, dev); |
| 2900 | if (!ai->wifidev) | ||
| 2901 | goto err_out_reg; | ||
| 2900 | 2902 | ||
| 2901 | set_bit(FLAG_REGISTERED,&ai->flags); | 2903 | set_bit(FLAG_REGISTERED,&ai->flags); |
| 2902 | airo_print_info(dev->name, "MAC enabled %x:%x:%x:%x:%x:%x", | 2904 | airo_print_info(dev->name, "MAC enabled %x:%x:%x:%x:%x:%x", |
| @@ -2908,11 +2910,18 @@ static struct net_device *_init_airo_card( unsigned short irq, int port, | |||
| 2908 | for( i = 0; i < MAX_FIDS; i++ ) | 2910 | for( i = 0; i < MAX_FIDS; i++ ) |
| 2909 | ai->fids[i] = transmit_allocate(ai,AIRO_DEF_MTU,i>=MAX_FIDS/2); | 2911 | ai->fids[i] = transmit_allocate(ai,AIRO_DEF_MTU,i>=MAX_FIDS/2); |
| 2910 | 2912 | ||
| 2911 | setup_proc_entry( dev, dev->priv ); /* XXX check for failure */ | 2913 | if (setup_proc_entry(dev, dev->priv) < 0) |
| 2914 | goto err_out_wifi; | ||
| 2915 | |||
| 2912 | netif_start_queue(dev); | 2916 | netif_start_queue(dev); |
| 2913 | SET_MODULE_OWNER(dev); | 2917 | SET_MODULE_OWNER(dev); |
| 2914 | return dev; | 2918 | return dev; |
| 2915 | 2919 | ||
| 2920 | err_out_wifi: | ||
| 2921 | unregister_netdev(ai->wifidev); | ||
| 2922 | free_netdev(ai->wifidev); | ||
| 2923 | err_out_reg: | ||
| 2924 | unregister_netdev(dev); | ||
| 2916 | err_out_map: | 2925 | err_out_map: |
| 2917 | if (test_bit(FLAG_MPI,&ai->flags) && pci) { | 2926 | if (test_bit(FLAG_MPI,&ai->flags) && pci) { |
| 2918 | pci_free_consistent(pci, PCI_SHARED_LEN, ai->shared, ai->shared_dma); | 2927 | pci_free_consistent(pci, PCI_SHARED_LEN, ai->shared, ai->shared_dma); |
| @@ -3089,7 +3098,8 @@ static int airo_thread(void *data) { | |||
| 3089 | set_bit(JOB_AUTOWEP, &ai->jobs); | 3098 | set_bit(JOB_AUTOWEP, &ai->jobs); |
| 3090 | break; | 3099 | break; |
| 3091 | } | 3100 | } |
| 3092 | if (!kthread_should_stop()) { | 3101 | if (!kthread_should_stop() && |
| 3102 | !freezing(current)) { | ||
| 3093 | unsigned long wake_at; | 3103 | unsigned long wake_at; |
| 3094 | if (!ai->expires || !ai->scan_timeout) { | 3104 | if (!ai->expires || !ai->scan_timeout) { |
| 3095 | wake_at = max(ai->expires, | 3105 | wake_at = max(ai->expires, |
| @@ -3101,7 +3111,8 @@ static int airo_thread(void *data) { | |||
| 3101 | schedule_timeout(wake_at - jiffies); | 3111 | schedule_timeout(wake_at - jiffies); |
| 3102 | continue; | 3112 | continue; |
| 3103 | } | 3113 | } |
| 3104 | } else if (!kthread_should_stop()) { | 3114 | } else if (!kthread_should_stop() && |
| 3115 | !freezing(current)) { | ||
| 3105 | schedule(); | 3116 | schedule(); |
| 3106 | continue; | 3117 | continue; |
| 3107 | } | 3118 | } |
| @@ -4495,91 +4506,128 @@ static int setup_proc_entry( struct net_device *dev, | |||
| 4495 | apriv->proc_entry = create_proc_entry(apriv->proc_name, | 4506 | apriv->proc_entry = create_proc_entry(apriv->proc_name, |
| 4496 | S_IFDIR|airo_perm, | 4507 | S_IFDIR|airo_perm, |
| 4497 | airo_entry); | 4508 | airo_entry); |
| 4498 | apriv->proc_entry->uid = proc_uid; | 4509 | if (!apriv->proc_entry) |
| 4499 | apriv->proc_entry->gid = proc_gid; | 4510 | goto fail; |
| 4500 | apriv->proc_entry->owner = THIS_MODULE; | 4511 | apriv->proc_entry->uid = proc_uid; |
| 4512 | apriv->proc_entry->gid = proc_gid; | ||
| 4513 | apriv->proc_entry->owner = THIS_MODULE; | ||
| 4501 | 4514 | ||
| 4502 | /* Setup the StatsDelta */ | 4515 | /* Setup the StatsDelta */ |
| 4503 | entry = create_proc_entry("StatsDelta", | 4516 | entry = create_proc_entry("StatsDelta", |
| 4504 | S_IFREG | (S_IRUGO&proc_perm), | 4517 | S_IFREG | (S_IRUGO&proc_perm), |
| 4505 | apriv->proc_entry); | 4518 | apriv->proc_entry); |
| 4506 | entry->uid = proc_uid; | 4519 | if (!entry) |
| 4507 | entry->gid = proc_gid; | 4520 | goto fail_stats_delta; |
| 4521 | entry->uid = proc_uid; | ||
| 4522 | entry->gid = proc_gid; | ||
| 4508 | entry->data = dev; | 4523 | entry->data = dev; |
| 4509 | entry->owner = THIS_MODULE; | 4524 | entry->owner = THIS_MODULE; |
| 4510 | SETPROC_OPS(entry, proc_statsdelta_ops); | 4525 | SETPROC_OPS(entry, proc_statsdelta_ops); |
| 4511 | 4526 | ||
| 4512 | /* Setup the Stats */ | 4527 | /* Setup the Stats */ |
| 4513 | entry = create_proc_entry("Stats", | 4528 | entry = create_proc_entry("Stats", |
| 4514 | S_IFREG | (S_IRUGO&proc_perm), | 4529 | S_IFREG | (S_IRUGO&proc_perm), |
| 4515 | apriv->proc_entry); | 4530 | apriv->proc_entry); |
| 4516 | entry->uid = proc_uid; | 4531 | if (!entry) |
| 4517 | entry->gid = proc_gid; | 4532 | goto fail_stats; |
| 4533 | entry->uid = proc_uid; | ||
| 4534 | entry->gid = proc_gid; | ||
| 4518 | entry->data = dev; | 4535 | entry->data = dev; |
| 4519 | entry->owner = THIS_MODULE; | 4536 | entry->owner = THIS_MODULE; |
| 4520 | SETPROC_OPS(entry, proc_stats_ops); | 4537 | SETPROC_OPS(entry, proc_stats_ops); |
| 4521 | 4538 | ||
| 4522 | /* Setup the Status */ | 4539 | /* Setup the Status */ |
| 4523 | entry = create_proc_entry("Status", | 4540 | entry = create_proc_entry("Status", |
| 4524 | S_IFREG | (S_IRUGO&proc_perm), | 4541 | S_IFREG | (S_IRUGO&proc_perm), |
| 4525 | apriv->proc_entry); | 4542 | apriv->proc_entry); |
| 4526 | entry->uid = proc_uid; | 4543 | if (!entry) |
| 4527 | entry->gid = proc_gid; | 4544 | goto fail_status; |
| 4545 | entry->uid = proc_uid; | ||
| 4546 | entry->gid = proc_gid; | ||
| 4528 | entry->data = dev; | 4547 | entry->data = dev; |
| 4529 | entry->owner = THIS_MODULE; | 4548 | entry->owner = THIS_MODULE; |
| 4530 | SETPROC_OPS(entry, proc_status_ops); | 4549 | SETPROC_OPS(entry, proc_status_ops); |
| 4531 | 4550 | ||
| 4532 | /* Setup the Config */ | 4551 | /* Setup the Config */ |
| 4533 | entry = create_proc_entry("Config", | 4552 | entry = create_proc_entry("Config", |
| 4534 | S_IFREG | proc_perm, | 4553 | S_IFREG | proc_perm, |
| 4535 | apriv->proc_entry); | 4554 | apriv->proc_entry); |
| 4536 | entry->uid = proc_uid; | 4555 | if (!entry) |
| 4537 | entry->gid = proc_gid; | 4556 | goto fail_config; |
| 4557 | entry->uid = proc_uid; | ||
| 4558 | entry->gid = proc_gid; | ||
| 4538 | entry->data = dev; | 4559 | entry->data = dev; |
| 4539 | entry->owner = THIS_MODULE; | 4560 | entry->owner = THIS_MODULE; |
| 4540 | SETPROC_OPS(entry, proc_config_ops); | 4561 | SETPROC_OPS(entry, proc_config_ops); |
| 4541 | 4562 | ||
| 4542 | /* Setup the SSID */ | 4563 | /* Setup the SSID */ |
| 4543 | entry = create_proc_entry("SSID", | 4564 | entry = create_proc_entry("SSID", |
| 4544 | S_IFREG | proc_perm, | 4565 | S_IFREG | proc_perm, |
| 4545 | apriv->proc_entry); | 4566 | apriv->proc_entry); |
| 4546 | entry->uid = proc_uid; | 4567 | if (!entry) |
| 4547 | entry->gid = proc_gid; | 4568 | goto fail_ssid; |
| 4569 | entry->uid = proc_uid; | ||
| 4570 | entry->gid = proc_gid; | ||
| 4548 | entry->data = dev; | 4571 | entry->data = dev; |
| 4549 | entry->owner = THIS_MODULE; | 4572 | entry->owner = THIS_MODULE; |
| 4550 | SETPROC_OPS(entry, proc_SSID_ops); | 4573 | SETPROC_OPS(entry, proc_SSID_ops); |
| 4551 | 4574 | ||
| 4552 | /* Setup the APList */ | 4575 | /* Setup the APList */ |
| 4553 | entry = create_proc_entry("APList", | 4576 | entry = create_proc_entry("APList", |
| 4554 | S_IFREG | proc_perm, | 4577 | S_IFREG | proc_perm, |
| 4555 | apriv->proc_entry); | 4578 | apriv->proc_entry); |
| 4556 | entry->uid = proc_uid; | 4579 | if (!entry) |
| 4557 | entry->gid = proc_gid; | 4580 | goto fail_aplist; |
| 4581 | entry->uid = proc_uid; | ||
| 4582 | entry->gid = proc_gid; | ||
| 4558 | entry->data = dev; | 4583 | entry->data = dev; |
| 4559 | entry->owner = THIS_MODULE; | 4584 | entry->owner = THIS_MODULE; |
| 4560 | SETPROC_OPS(entry, proc_APList_ops); | 4585 | SETPROC_OPS(entry, proc_APList_ops); |
| 4561 | 4586 | ||
| 4562 | /* Setup the BSSList */ | 4587 | /* Setup the BSSList */ |
| 4563 | entry = create_proc_entry("BSSList", | 4588 | entry = create_proc_entry("BSSList", |
| 4564 | S_IFREG | proc_perm, | 4589 | S_IFREG | proc_perm, |
| 4565 | apriv->proc_entry); | 4590 | apriv->proc_entry); |
| 4591 | if (!entry) | ||
| 4592 | goto fail_bsslist; | ||
| 4566 | entry->uid = proc_uid; | 4593 | entry->uid = proc_uid; |
| 4567 | entry->gid = proc_gid; | 4594 | entry->gid = proc_gid; |
| 4568 | entry->data = dev; | 4595 | entry->data = dev; |
| 4569 | entry->owner = THIS_MODULE; | 4596 | entry->owner = THIS_MODULE; |
| 4570 | SETPROC_OPS(entry, proc_BSSList_ops); | 4597 | SETPROC_OPS(entry, proc_BSSList_ops); |
| 4571 | 4598 | ||
| 4572 | /* Setup the WepKey */ | 4599 | /* Setup the WepKey */ |
| 4573 | entry = create_proc_entry("WepKey", | 4600 | entry = create_proc_entry("WepKey", |
| 4574 | S_IFREG | proc_perm, | 4601 | S_IFREG | proc_perm, |
| 4575 | apriv->proc_entry); | 4602 | apriv->proc_entry); |
| 4576 | entry->uid = proc_uid; | 4603 | if (!entry) |
| 4577 | entry->gid = proc_gid; | 4604 | goto fail_wepkey; |
| 4605 | entry->uid = proc_uid; | ||
| 4606 | entry->gid = proc_gid; | ||
| 4578 | entry->data = dev; | 4607 | entry->data = dev; |
| 4579 | entry->owner = THIS_MODULE; | 4608 | entry->owner = THIS_MODULE; |
| 4580 | SETPROC_OPS(entry, proc_wepkey_ops); | 4609 | SETPROC_OPS(entry, proc_wepkey_ops); |
| 4581 | 4610 | ||
| 4582 | return 0; | 4611 | return 0; |
| 4612 | |||
| 4613 | fail_wepkey: | ||
| 4614 | remove_proc_entry("BSSList", apriv->proc_entry); | ||
| 4615 | fail_bsslist: | ||
| 4616 | remove_proc_entry("APList", apriv->proc_entry); | ||
| 4617 | fail_aplist: | ||
| 4618 | remove_proc_entry("SSID", apriv->proc_entry); | ||
| 4619 | fail_ssid: | ||
| 4620 | remove_proc_entry("Config", apriv->proc_entry); | ||
| 4621 | fail_config: | ||
| 4622 | remove_proc_entry("Status", apriv->proc_entry); | ||
| 4623 | fail_status: | ||
| 4624 | remove_proc_entry("Stats", apriv->proc_entry); | ||
| 4625 | fail_stats: | ||
| 4626 | remove_proc_entry("StatsDelta", apriv->proc_entry); | ||
| 4627 | fail_stats_delta: | ||
| 4628 | remove_proc_entry(apriv->proc_name, airo_entry); | ||
| 4629 | fail: | ||
| 4630 | return -ENOMEM; | ||
| 4583 | } | 4631 | } |
| 4584 | 4632 | ||
| 4585 | static int takedown_proc_entry( struct net_device *dev, | 4633 | static int takedown_proc_entry( struct net_device *dev, |
| @@ -5924,7 +5972,6 @@ static int airo_get_essid(struct net_device *dev, | |||
| 5924 | 5972 | ||
| 5925 | /* Get the current SSID */ | 5973 | /* Get the current SSID */ |
| 5926 | memcpy(extra, status_rid.SSID, status_rid.SSIDlen); | 5974 | memcpy(extra, status_rid.SSID, status_rid.SSIDlen); |
| 5927 | extra[status_rid.SSIDlen] = '\0'; | ||
| 5928 | /* If none, we may want to get the one that was set */ | 5975 | /* If none, we may want to get the one that was set */ |
| 5929 | 5976 | ||
| 5930 | /* Push it out ! */ | 5977 | /* Push it out ! */ |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 31eed85de60f..0c07b8b7250d 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
| @@ -1678,11 +1678,9 @@ static int atmel_get_essid(struct net_device *dev, | |||
| 1678 | /* Get the current SSID */ | 1678 | /* Get the current SSID */ |
| 1679 | if (priv->new_SSID_size != 0) { | 1679 | if (priv->new_SSID_size != 0) { |
| 1680 | memcpy(extra, priv->new_SSID, priv->new_SSID_size); | 1680 | memcpy(extra, priv->new_SSID, priv->new_SSID_size); |
| 1681 | extra[priv->new_SSID_size] = '\0'; | ||
| 1682 | dwrq->length = priv->new_SSID_size; | 1681 | dwrq->length = priv->new_SSID_size; |
| 1683 | } else { | 1682 | } else { |
| 1684 | memcpy(extra, priv->SSID, priv->SSID_size); | 1683 | memcpy(extra, priv->SSID, priv->SSID_size); |
| 1685 | extra[priv->SSID_size] = '\0'; | ||
| 1686 | dwrq->length = priv->SSID_size; | 1684 | dwrq->length = priv->SSID_size; |
| 1687 | } | 1685 | } |
| 1688 | 1686 | ||
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c index 76e3aed4b471..978ed099e285 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c | |||
| @@ -705,11 +705,30 @@ int bcm43xx_dma_init(struct bcm43xx_private *bcm) | |||
| 705 | struct bcm43xx_dmaring *ring; | 705 | struct bcm43xx_dmaring *ring; |
| 706 | int err = -ENOMEM; | 706 | int err = -ENOMEM; |
| 707 | int dma64 = 0; | 707 | int dma64 = 0; |
| 708 | u32 sbtmstatehi; | 708 | u64 mask = bcm43xx_get_supported_dma_mask(bcm); |
| 709 | int nobits; | ||
| 709 | 710 | ||
| 710 | sbtmstatehi = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH); | 711 | if (mask == DMA_64BIT_MASK) { |
| 711 | if (sbtmstatehi & BCM43xx_SBTMSTATEHIGH_DMA64BIT) | ||
| 712 | dma64 = 1; | 712 | dma64 = 1; |
| 713 | nobits = 64; | ||
| 714 | } else if (mask == DMA_32BIT_MASK) | ||
| 715 | nobits = 32; | ||
| 716 | else | ||
| 717 | nobits = 30; | ||
| 718 | err = pci_set_dma_mask(bcm->pci_dev, mask); | ||
| 719 | err |= pci_set_consistent_dma_mask(bcm->pci_dev, mask); | ||
| 720 | if (err) { | ||
| 721 | #ifdef CONFIG_BCM43XX_PIO | ||
| 722 | printk(KERN_WARNING PFX "DMA not supported on this device." | ||
| 723 | " Falling back to PIO.\n"); | ||
| 724 | bcm->__using_pio = 1; | ||
| 725 | return -ENOSYS; | ||
| 726 | #else | ||
| 727 | printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. " | ||
| 728 | "Please recompile the driver with PIO support.\n"); | ||
| 729 | return -ENODEV; | ||
| 730 | #endif /* CONFIG_BCM43XX_PIO */ | ||
| 731 | } | ||
| 713 | 732 | ||
| 714 | /* setup TX DMA channels. */ | 733 | /* setup TX DMA channels. */ |
| 715 | ring = bcm43xx_setup_dmaring(bcm, 0, 1, dma64); | 734 | ring = bcm43xx_setup_dmaring(bcm, 0, 1, dma64); |
| @@ -755,8 +774,7 @@ int bcm43xx_dma_init(struct bcm43xx_private *bcm) | |||
| 755 | dma->rx_ring3 = ring; | 774 | dma->rx_ring3 = ring; |
| 756 | } | 775 | } |
| 757 | 776 | ||
| 758 | dprintk(KERN_INFO PFX "%s DMA initialized\n", | 777 | dprintk(KERN_INFO PFX "%d-bit DMA initialized\n", nobits); |
| 759 | dma64 ? "64-bit" : "32-bit"); | ||
| 760 | err = 0; | 778 | err = 0; |
| 761 | out: | 779 | out: |
| 762 | return err; | 780 | return err; |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h index e04bcaddd1d0..ea16078cfe98 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h | |||
| @@ -314,6 +314,23 @@ int bcm43xx_dma_tx(struct bcm43xx_private *bcm, | |||
| 314 | struct ieee80211_txb *txb); | 314 | struct ieee80211_txb *txb); |
| 315 | void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring); | 315 | void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring); |
| 316 | 316 | ||
| 317 | /* Helper function that returns the dma mask for this device. */ | ||
| 318 | static inline | ||
| 319 | u64 bcm43xx_get_supported_dma_mask(struct bcm43xx_private *bcm) | ||
| 320 | { | ||
| 321 | int dma64 = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH) & | ||
| 322 | BCM43xx_SBTMSTATEHIGH_DMA64BIT; | ||
| 323 | u16 mmio_base = bcm43xx_dmacontroller_base(dma64, 0); | ||
| 324 | u32 mask = BCM43xx_DMA32_TXADDREXT_MASK; | ||
| 325 | |||
| 326 | if (dma64) | ||
| 327 | return DMA_64BIT_MASK; | ||
| 328 | bcm43xx_write32(bcm, mmio_base + BCM43xx_DMA32_TXCTL, mask); | ||
| 329 | if (bcm43xx_read32(bcm, mmio_base + BCM43xx_DMA32_TXCTL) & mask) | ||
| 330 | return DMA_32BIT_MASK; | ||
| 331 | return DMA_30BIT_MASK; | ||
| 332 | } | ||
| 333 | |||
| 317 | #else /* CONFIG_BCM43XX_DMA */ | 334 | #else /* CONFIG_BCM43XX_DMA */ |
| 318 | 335 | ||
| 319 | 336 | ||
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c index c3f90c8563d9..2ddbec6bf15b 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c | |||
| @@ -242,7 +242,7 @@ void bcm43xx_leds_update(struct bcm43xx_private *bcm, int activity) | |||
| 242 | //TODO | 242 | //TODO |
| 243 | break; | 243 | break; |
| 244 | case BCM43xx_LED_ASSOC: | 244 | case BCM43xx_LED_ASSOC: |
| 245 | if (bcm->softmac->associated) | 245 | if (bcm->softmac->associnfo.associated) |
| 246 | turn_on = 1; | 246 | turn_on = 1; |
| 247 | break; | 247 | break; |
| 248 | #ifdef CONFIG_BCM43XX_DEBUG | 248 | #ifdef CONFIG_BCM43XX_DEBUG |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index bad3452ea893..a94c6d8826f8 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c | |||
| @@ -2925,10 +2925,13 @@ static int bcm43xx_wireless_core_init(struct bcm43xx_private *bcm, | |||
| 2925 | bcm43xx_write16(bcm, 0x043C, 0x000C); | 2925 | bcm43xx_write16(bcm, 0x043C, 0x000C); |
| 2926 | 2926 | ||
| 2927 | if (active_wlcore) { | 2927 | if (active_wlcore) { |
| 2928 | if (bcm43xx_using_pio(bcm)) | 2928 | if (bcm43xx_using_pio(bcm)) { |
| 2929 | err = bcm43xx_pio_init(bcm); | 2929 | err = bcm43xx_pio_init(bcm); |
| 2930 | else | 2930 | } else { |
| 2931 | err = bcm43xx_dma_init(bcm); | 2931 | err = bcm43xx_dma_init(bcm); |
| 2932 | if (err == -ENOSYS) | ||
| 2933 | err = bcm43xx_pio_init(bcm); | ||
| 2934 | } | ||
| 2932 | if (err) | 2935 | if (err) |
| 2933 | goto err_chip_cleanup; | 2936 | goto err_chip_cleanup; |
| 2934 | } | 2937 | } |
| @@ -3164,12 +3167,12 @@ static void bcm43xx_periodic_work_handler(void *d) | |||
| 3164 | u32 savedirqs = 0; | 3167 | u32 savedirqs = 0; |
| 3165 | int badness; | 3168 | int badness; |
| 3166 | 3169 | ||
| 3170 | mutex_lock(&bcm->mutex); | ||
| 3167 | badness = estimate_periodic_work_badness(bcm->periodic_state); | 3171 | badness = estimate_periodic_work_badness(bcm->periodic_state); |
| 3168 | if (badness > BADNESS_LIMIT) { | 3172 | if (badness > BADNESS_LIMIT) { |
| 3169 | /* Periodic work will take a long time, so we want it to | 3173 | /* Periodic work will take a long time, so we want it to |
| 3170 | * be preemtible. | 3174 | * be preemtible. |
| 3171 | */ | 3175 | */ |
| 3172 | mutex_lock(&bcm->mutex); | ||
| 3173 | netif_tx_disable(bcm->net_dev); | 3176 | netif_tx_disable(bcm->net_dev); |
| 3174 | spin_lock_irqsave(&bcm->irq_lock, flags); | 3177 | spin_lock_irqsave(&bcm->irq_lock, flags); |
| 3175 | bcm43xx_mac_suspend(bcm); | 3178 | bcm43xx_mac_suspend(bcm); |
| @@ -3182,7 +3185,6 @@ static void bcm43xx_periodic_work_handler(void *d) | |||
| 3182 | /* Periodic work should take short time, so we want low | 3185 | /* Periodic work should take short time, so we want low |
| 3183 | * locking overhead. | 3186 | * locking overhead. |
| 3184 | */ | 3187 | */ |
| 3185 | mutex_lock(&bcm->mutex); | ||
| 3186 | spin_lock_irqsave(&bcm->irq_lock, flags); | 3188 | spin_lock_irqsave(&bcm->irq_lock, flags); |
| 3187 | } | 3189 | } |
| 3188 | 3190 | ||
| @@ -3993,8 +3995,6 @@ static int bcm43xx_init_private(struct bcm43xx_private *bcm, | |||
| 3993 | struct net_device *net_dev, | 3995 | struct net_device *net_dev, |
| 3994 | struct pci_dev *pci_dev) | 3996 | struct pci_dev *pci_dev) |
| 3995 | { | 3997 | { |
| 3996 | int err; | ||
| 3997 | |||
| 3998 | bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT); | 3998 | bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT); |
| 3999 | bcm->ieee = netdev_priv(net_dev); | 3999 | bcm->ieee = netdev_priv(net_dev); |
| 4000 | bcm->softmac = ieee80211_priv(net_dev); | 4000 | bcm->softmac = ieee80211_priv(net_dev); |
| @@ -4012,22 +4012,8 @@ static int bcm43xx_init_private(struct bcm43xx_private *bcm, | |||
| 4012 | (void (*)(unsigned long))bcm43xx_interrupt_tasklet, | 4012 | (void (*)(unsigned long))bcm43xx_interrupt_tasklet, |
| 4013 | (unsigned long)bcm); | 4013 | (unsigned long)bcm); |
| 4014 | tasklet_disable_nosync(&bcm->isr_tasklet); | 4014 | tasklet_disable_nosync(&bcm->isr_tasklet); |
| 4015 | if (modparam_pio) { | 4015 | if (modparam_pio) |
| 4016 | bcm->__using_pio = 1; | 4016 | bcm->__using_pio = 1; |
| 4017 | } else { | ||
| 4018 | err = pci_set_dma_mask(pci_dev, DMA_30BIT_MASK); | ||
| 4019 | err |= pci_set_consistent_dma_mask(pci_dev, DMA_30BIT_MASK); | ||
| 4020 | if (err) { | ||
| 4021 | #ifdef CONFIG_BCM43XX_PIO | ||
| 4022 | printk(KERN_WARNING PFX "DMA not supported. Falling back to PIO.\n"); | ||
| 4023 | bcm->__using_pio = 1; | ||
| 4024 | #else | ||
| 4025 | printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. " | ||
| 4026 | "Recompile the driver with PIO support, please.\n"); | ||
| 4027 | return -ENODEV; | ||
| 4028 | #endif /* CONFIG_BCM43XX_PIO */ | ||
| 4029 | } | ||
| 4030 | } | ||
| 4031 | bcm->rts_threshold = BCM43xx_DEFAULT_RTS_THRESHOLD; | 4017 | bcm->rts_threshold = BCM43xx_DEFAULT_RTS_THRESHOLD; |
| 4032 | 4018 | ||
| 4033 | /* default to sw encryption for now */ | 4019 | /* default to sw encryption for now */ |
| @@ -4208,7 +4194,11 @@ static int bcm43xx_resume(struct pci_dev *pdev) | |||
| 4208 | dprintk(KERN_INFO PFX "Resuming...\n"); | 4194 | dprintk(KERN_INFO PFX "Resuming...\n"); |
| 4209 | 4195 | ||
| 4210 | pci_set_power_state(pdev, 0); | 4196 | pci_set_power_state(pdev, 0); |
| 4211 | pci_enable_device(pdev); | 4197 | err = pci_enable_device(pdev); |
| 4198 | if (err) { | ||
| 4199 | printk(KERN_ERR PFX "Failure with pci_enable_device!\n"); | ||
| 4200 | return err; | ||
| 4201 | } | ||
| 4212 | pci_restore_state(pdev); | 4202 | pci_restore_state(pdev); |
| 4213 | 4203 | ||
| 4214 | bcm43xx_chipset_attach(bcm); | 4204 | bcm43xx_chipset_attach(bcm); |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c index 9b7b15cf6561..d27016f8c736 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c | |||
| @@ -847,7 +847,7 @@ static struct iw_statistics *bcm43xx_get_wireless_stats(struct net_device *net_d | |||
| 847 | unsigned long flags; | 847 | unsigned long flags; |
| 848 | 848 | ||
| 849 | wstats = &bcm->stats.wstats; | 849 | wstats = &bcm->stats.wstats; |
| 850 | if (!mac->associated) { | 850 | if (!mac->associnfo.associated) { |
| 851 | wstats->miss.beacon = 0; | 851 | wstats->miss.beacon = 0; |
| 852 | // bcm->ieee->ieee_stats.tx_retry_limit_exceeded = 0; // FIXME: should this be cleared here? | 852 | // bcm->ieee->ieee_stats.tx_retry_limit_exceeded = 0; // FIXME: should this be cleared here? |
| 853 | wstats->discard.retries = 0; | 853 | wstats->discard.retries = 0; |
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index b779c7dcc1a8..336cabac13b3 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
| @@ -2457,6 +2457,7 @@ void free_orinocodev(struct net_device *dev) | |||
| 2457 | /* Wireless extensions */ | 2457 | /* Wireless extensions */ |
| 2458 | /********************************************************************/ | 2458 | /********************************************************************/ |
| 2459 | 2459 | ||
| 2460 | /* Return : < 0 -> error code ; >= 0 -> length */ | ||
| 2460 | static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active, | 2461 | static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active, |
| 2461 | char buf[IW_ESSID_MAX_SIZE+1]) | 2462 | char buf[IW_ESSID_MAX_SIZE+1]) |
| 2462 | { | 2463 | { |
| @@ -2501,9 +2502,9 @@ static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active, | |||
| 2501 | len = le16_to_cpu(essidbuf.len); | 2502 | len = le16_to_cpu(essidbuf.len); |
| 2502 | BUG_ON(len > IW_ESSID_MAX_SIZE); | 2503 | BUG_ON(len > IW_ESSID_MAX_SIZE); |
| 2503 | 2504 | ||
| 2504 | memset(buf, 0, IW_ESSID_MAX_SIZE+1); | 2505 | memset(buf, 0, IW_ESSID_MAX_SIZE); |
| 2505 | memcpy(buf, p, len); | 2506 | memcpy(buf, p, len); |
| 2506 | buf[len] = '\0'; | 2507 | err = len; |
| 2507 | 2508 | ||
| 2508 | fail_unlock: | 2509 | fail_unlock: |
| 2509 | orinoco_unlock(priv, &flags); | 2510 | orinoco_unlock(priv, &flags); |
| @@ -3027,17 +3028,18 @@ static int orinoco_ioctl_getessid(struct net_device *dev, | |||
| 3027 | 3028 | ||
| 3028 | if (netif_running(dev)) { | 3029 | if (netif_running(dev)) { |
| 3029 | err = orinoco_hw_get_essid(priv, &active, essidbuf); | 3030 | err = orinoco_hw_get_essid(priv, &active, essidbuf); |
| 3030 | if (err) | 3031 | if (err < 0) |
| 3031 | return err; | 3032 | return err; |
| 3033 | erq->length = err; | ||
| 3032 | } else { | 3034 | } else { |
| 3033 | if (orinoco_lock(priv, &flags) != 0) | 3035 | if (orinoco_lock(priv, &flags) != 0) |
| 3034 | return -EBUSY; | 3036 | return -EBUSY; |
| 3035 | memcpy(essidbuf, priv->desired_essid, IW_ESSID_MAX_SIZE + 1); | 3037 | memcpy(essidbuf, priv->desired_essid, IW_ESSID_MAX_SIZE); |
| 3038 | erq->length = strlen(priv->desired_essid); | ||
| 3036 | orinoco_unlock(priv, &flags); | 3039 | orinoco_unlock(priv, &flags); |
| 3037 | } | 3040 | } |
| 3038 | 3041 | ||
| 3039 | erq->flags = 1; | 3042 | erq->flags = 1; |
| 3040 | erq->length = strlen(essidbuf); | ||
| 3041 | 3043 | ||
| 3042 | return 0; | 3044 | return 0; |
| 3043 | } | 3045 | } |
| @@ -3075,10 +3077,10 @@ static int orinoco_ioctl_getnick(struct net_device *dev, | |||
| 3075 | if (orinoco_lock(priv, &flags) != 0) | 3077 | if (orinoco_lock(priv, &flags) != 0) |
| 3076 | return -EBUSY; | 3078 | return -EBUSY; |
| 3077 | 3079 | ||
| 3078 | memcpy(nickbuf, priv->nick, IW_ESSID_MAX_SIZE+1); | 3080 | memcpy(nickbuf, priv->nick, IW_ESSID_MAX_SIZE); |
| 3079 | orinoco_unlock(priv, &flags); | 3081 | orinoco_unlock(priv, &flags); |
| 3080 | 3082 | ||
| 3081 | nrq->length = strlen(nickbuf); | 3083 | nrq->length = strlen(priv->nick); |
| 3082 | 3084 | ||
| 3083 | return 0; | 3085 | return 0; |
| 3084 | } | 3086 | } |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 0b381d77015c..7fbfc9e41d07 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
| @@ -1198,7 +1198,6 @@ static int ray_get_essid(struct net_device *dev, | |||
| 1198 | 1198 | ||
| 1199 | /* Get the essid that was set */ | 1199 | /* Get the essid that was set */ |
| 1200 | memcpy(extra, local->sparm.b5.a_current_ess_id, IW_ESSID_MAX_SIZE); | 1200 | memcpy(extra, local->sparm.b5.a_current_ess_id, IW_ESSID_MAX_SIZE); |
| 1201 | extra[IW_ESSID_MAX_SIZE] = '\0'; | ||
| 1202 | 1201 | ||
| 1203 | /* Push it out ! */ | 1202 | /* Push it out ! */ |
| 1204 | dwrq->length = strlen(extra); | 1203 | dwrq->length = strlen(extra); |
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index 30057a335a7b..36b29ff05814 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
| @@ -193,10 +193,8 @@ static void zd1201_usbrx(struct urb *urb) | |||
| 193 | struct sk_buff *skb; | 193 | struct sk_buff *skb; |
| 194 | unsigned char type; | 194 | unsigned char type; |
| 195 | 195 | ||
| 196 | if (!zd) { | 196 | if (!zd) |
| 197 | free = 1; | 197 | return; |
| 198 | goto exit; | ||
| 199 | } | ||
| 200 | 198 | ||
| 201 | switch(urb->status) { | 199 | switch(urb->status) { |
| 202 | case -EILSEQ: | 200 | case -EILSEQ: |
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 2d12837052b0..a7d29bddb298 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
| @@ -1099,7 +1099,7 @@ static void link_led_handler(void *p) | |||
| 1099 | int r; | 1099 | int r; |
| 1100 | 1100 | ||
| 1101 | spin_lock_irq(&mac->lock); | 1101 | spin_lock_irq(&mac->lock); |
| 1102 | is_associated = sm->associated != 0; | 1102 | is_associated = sm->associnfo.associated != 0; |
| 1103 | spin_unlock_irq(&mac->lock); | 1103 | spin_unlock_irq(&mac->lock); |
| 1104 | 1104 | ||
| 1105 | r = zd_chip_control_leds(chip, | 1105 | r = zd_chip_control_leds(chip, |
diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h index 310b6186c0e5..2e7accf0f734 100644 --- a/drivers/pci/hotplug/rpaphp.h +++ b/drivers/pci/hotplug/rpaphp.h | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #define _PPC64PHP_H | 28 | #define _PPC64PHP_H |
| 29 | 29 | ||
| 30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 31 | #include "pci_hotplug.h" | 31 | #include <linux/pci_hotplug.h> |
| 32 | 32 | ||
| 33 | #define DR_INDICATOR 9002 | 33 | #define DR_INDICATOR 9002 |
| 34 | #define DR_ENTITY_SENSE 9003 | 34 | #define DR_ENTITY_SENSE 9003 |
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c index 811d8840707e..2dbb66d2f0a7 100644 --- a/drivers/scsi/eata_pio.c +++ b/drivers/scsi/eata_pio.c | |||
| @@ -203,7 +203,7 @@ static irqreturn_t do_eata_pio_int_handler(int irq, void *dev_id) | |||
| 203 | irqreturn_t ret; | 203 | irqreturn_t ret; |
| 204 | 204 | ||
| 205 | spin_lock_irqsave(dev->host_lock, flags); | 205 | spin_lock_irqsave(dev->host_lock, flags); |
| 206 | ret = eata_pio_int_handler(irq, dev_id, regs); | 206 | ret = eata_pio_int_handler(irq, dev_id); |
| 207 | spin_unlock_irqrestore(dev->host_lock, flags); | 207 | spin_unlock_irqrestore(dev->host_lock, flags); |
| 208 | return ret; | 208 | return ret; |
| 209 | } | 209 | } |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index b0d502622d94..0b71e7d18903 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -767,37 +767,37 @@ config SERIAL_CPM_SCC1 | |||
| 767 | bool "Support for SCC1 serial port" | 767 | bool "Support for SCC1 serial port" |
| 768 | depends on SERIAL_CPM=y | 768 | depends on SERIAL_CPM=y |
| 769 | help | 769 | help |
| 770 | Select the is option to use SCC1 as a serial port | 770 | Select this option to use SCC1 as a serial port |
| 771 | 771 | ||
| 772 | config SERIAL_CPM_SCC2 | 772 | config SERIAL_CPM_SCC2 |
| 773 | bool "Support for SCC2 serial port" | 773 | bool "Support for SCC2 serial port" |
| 774 | depends on SERIAL_CPM=y | 774 | depends on SERIAL_CPM=y |
| 775 | help | 775 | help |
| 776 | Select the is option to use SCC2 as a serial port | 776 | Select this option to use SCC2 as a serial port |
| 777 | 777 | ||
| 778 | config SERIAL_CPM_SCC3 | 778 | config SERIAL_CPM_SCC3 |
| 779 | bool "Support for SCC3 serial port" | 779 | bool "Support for SCC3 serial port" |
| 780 | depends on SERIAL_CPM=y | 780 | depends on SERIAL_CPM=y |
| 781 | help | 781 | help |
| 782 | Select the is option to use SCC3 as a serial port | 782 | Select this option to use SCC3 as a serial port |
| 783 | 783 | ||
| 784 | config SERIAL_CPM_SCC4 | 784 | config SERIAL_CPM_SCC4 |
| 785 | bool "Support for SCC4 serial port" | 785 | bool "Support for SCC4 serial port" |
| 786 | depends on SERIAL_CPM=y | 786 | depends on SERIAL_CPM=y |
| 787 | help | 787 | help |
| 788 | Select the is option to use SCC4 as a serial port | 788 | Select this option to use SCC4 as a serial port |
| 789 | 789 | ||
| 790 | config SERIAL_CPM_SMC1 | 790 | config SERIAL_CPM_SMC1 |
| 791 | bool "Support for SMC1 serial port" | 791 | bool "Support for SMC1 serial port" |
| 792 | depends on SERIAL_CPM=y | 792 | depends on SERIAL_CPM=y |
| 793 | help | 793 | help |
| 794 | Select the is option to use SMC1 as a serial port | 794 | Select this option to use SMC1 as a serial port |
| 795 | 795 | ||
| 796 | config SERIAL_CPM_SMC2 | 796 | config SERIAL_CPM_SMC2 |
| 797 | bool "Support for SMC2 serial port" | 797 | bool "Support for SMC2 serial port" |
| 798 | depends on SERIAL_CPM=y | 798 | depends on SERIAL_CPM=y |
| 799 | help | 799 | help |
| 800 | Select the is option to use SMC2 as a serial port | 800 | Select this option to use SMC2 as a serial port |
| 801 | 801 | ||
| 802 | config SERIAL_SGI_L1_CONSOLE | 802 | config SERIAL_SGI_L1_CONSOLE |
| 803 | bool "SGI Altix L1 serial console support" | 803 | bool "SGI Altix L1 serial console support" |
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index f42c00ef0bca..671c24bc6d75 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c | |||
| @@ -43,11 +43,11 @@ | |||
| 43 | #include <linux/mm.h> | 43 | #include <linux/mm.h> |
| 44 | #include <linux/platform_device.h> | 44 | #include <linux/platform_device.h> |
| 45 | #include <linux/dma-mapping.h> | 45 | #include <linux/dma-mapping.h> |
| 46 | #include <linux/irq.h> | ||
| 46 | 47 | ||
| 47 | #include <asm/byteorder.h> | 48 | #include <asm/byteorder.h> |
| 48 | #include <asm/dma.h> | 49 | #include <asm/dma.h> |
| 49 | #include <asm/io.h> | 50 | #include <asm/io.h> |
| 50 | #include <asm/irq.h> | ||
| 51 | #include <asm/system.h> | 51 | #include <asm/system.h> |
| 52 | #include <asm/mach-types.h> | 52 | #include <asm/mach-types.h> |
| 53 | #include <asm/unaligned.h> | 53 | #include <asm/unaligned.h> |
diff --git a/fs/Kconfig b/fs/Kconfig index 6a3df055280a..fee318e6f4bb 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -634,6 +634,10 @@ config FUSE_FS | |||
| 634 | If you want to develop a userspace FS, or if you want to use | 634 | If you want to develop a userspace FS, or if you want to use |
| 635 | a filesystem based on FUSE, answer Y or M. | 635 | a filesystem based on FUSE, answer Y or M. |
| 636 | 636 | ||
| 637 | config GENERIC_ACL | ||
| 638 | bool | ||
| 639 | select FS_POSIX_ACL | ||
| 640 | |||
| 637 | if BLOCK | 641 | if BLOCK |
| 638 | menu "CD-ROM/DVD Filesystems" | 642 | menu "CD-ROM/DVD Filesystems" |
| 639 | 643 | ||
| @@ -2080,10 +2084,6 @@ config 9P_FS | |||
| 2080 | 2084 | ||
| 2081 | If unsure, say N. | 2085 | If unsure, say N. |
| 2082 | 2086 | ||
| 2083 | config GENERIC_ACL | ||
| 2084 | bool | ||
| 2085 | select FS_POSIX_ACL | ||
| 2086 | |||
| 2087 | endmenu | 2087 | endmenu |
| 2088 | 2088 | ||
| 2089 | if BLOCK | 2089 | if BLOCK |
diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h index c7700d9b3f96..906ba5ce2261 100644 --- a/fs/autofs/autofs_i.h +++ b/fs/autofs/autofs_i.h | |||
| @@ -149,6 +149,7 @@ extern const struct file_operations autofs_root_operations; | |||
| 149 | /* Initializing function */ | 149 | /* Initializing function */ |
| 150 | 150 | ||
| 151 | int autofs_fill_super(struct super_block *, void *, int); | 151 | int autofs_fill_super(struct super_block *, void *, int); |
| 152 | void autofs_kill_sb(struct super_block *sb); | ||
| 152 | 153 | ||
| 153 | /* Queue management functions */ | 154 | /* Queue management functions */ |
| 154 | 155 | ||
diff --git a/fs/autofs/dirhash.c b/fs/autofs/dirhash.c index 3fded389d06b..bf8c8af98004 100644 --- a/fs/autofs/dirhash.c +++ b/fs/autofs/dirhash.c | |||
| @@ -246,5 +246,4 @@ void autofs_hash_nuke(struct autofs_sb_info *sbi) | |||
| 246 | kfree(ent); | 246 | kfree(ent); |
| 247 | } | 247 | } |
| 248 | } | 248 | } |
| 249 | shrink_dcache_sb(sbi->sb); | ||
| 250 | } | 249 | } |
diff --git a/fs/autofs/init.c b/fs/autofs/init.c index aca123752406..cea5219b4f37 100644 --- a/fs/autofs/init.c +++ b/fs/autofs/init.c | |||
| @@ -24,7 +24,7 @@ static struct file_system_type autofs_fs_type = { | |||
| 24 | .owner = THIS_MODULE, | 24 | .owner = THIS_MODULE, |
| 25 | .name = "autofs", | 25 | .name = "autofs", |
| 26 | .get_sb = autofs_get_sb, | 26 | .get_sb = autofs_get_sb, |
| 27 | .kill_sb = kill_anon_super, | 27 | .kill_sb = autofs_kill_sb, |
| 28 | }; | 28 | }; |
| 29 | 29 | ||
| 30 | static int __init init_autofs_fs(void) | 30 | static int __init init_autofs_fs(void) |
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c index 2c9759baad61..54c518c89e4c 100644 --- a/fs/autofs/inode.c +++ b/fs/autofs/inode.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include "autofs_i.h" | 20 | #include "autofs_i.h" |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | 22 | ||
| 23 | static void autofs_put_super(struct super_block *sb) | 23 | void autofs_kill_sb(struct super_block *sb) |
| 24 | { | 24 | { |
| 25 | struct autofs_sb_info *sbi = autofs_sbi(sb); | 25 | struct autofs_sb_info *sbi = autofs_sbi(sb); |
| 26 | unsigned int n; | 26 | unsigned int n; |
| @@ -37,13 +37,13 @@ static void autofs_put_super(struct super_block *sb) | |||
| 37 | kfree(sb->s_fs_info); | 37 | kfree(sb->s_fs_info); |
| 38 | 38 | ||
| 39 | DPRINTK(("autofs: shutting down\n")); | 39 | DPRINTK(("autofs: shutting down\n")); |
| 40 | kill_anon_super(sb); | ||
| 40 | } | 41 | } |
| 41 | 42 | ||
| 42 | static void autofs_read_inode(struct inode *inode); | 43 | static void autofs_read_inode(struct inode *inode); |
| 43 | 44 | ||
| 44 | static struct super_operations autofs_sops = { | 45 | static struct super_operations autofs_sops = { |
| 45 | .read_inode = autofs_read_inode, | 46 | .read_inode = autofs_read_inode, |
| 46 | .put_super = autofs_put_super, | ||
| 47 | .statfs = simple_statfs, | 47 | .statfs = simple_statfs, |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
diff --git a/fs/configfs/file.c b/fs/configfs/file.c index e6d5754a715e..cf33fac68c84 100644 --- a/fs/configfs/file.c +++ b/fs/configfs/file.c | |||
| @@ -275,13 +275,14 @@ static int check_perm(struct inode * inode, struct file * file) | |||
| 275 | * it in file->private_data for easy access. | 275 | * it in file->private_data for easy access. |
| 276 | */ | 276 | */ |
| 277 | buffer = kzalloc(sizeof(struct configfs_buffer),GFP_KERNEL); | 277 | buffer = kzalloc(sizeof(struct configfs_buffer),GFP_KERNEL); |
| 278 | if (buffer) { | 278 | if (!buffer) { |
| 279 | init_MUTEX(&buffer->sem); | ||
| 280 | buffer->needs_read_fill = 1; | ||
| 281 | buffer->ops = ops; | ||
| 282 | file->private_data = buffer; | ||
| 283 | } else | ||
| 284 | error = -ENOMEM; | 279 | error = -ENOMEM; |
| 280 | goto Enomem; | ||
| 281 | } | ||
| 282 | init_MUTEX(&buffer->sem); | ||
| 283 | buffer->needs_read_fill = 1; | ||
| 284 | buffer->ops = ops; | ||
| 285 | file->private_data = buffer; | ||
| 285 | goto Done; | 286 | goto Done; |
| 286 | 287 | ||
| 287 | Einval: | 288 | Einval: |
| @@ -289,6 +290,7 @@ static int check_perm(struct inode * inode, struct file * file) | |||
| 289 | goto Done; | 290 | goto Done; |
| 290 | Eaccess: | 291 | Eaccess: |
| 291 | error = -EACCES; | 292 | error = -EACCES; |
| 293 | Enomem: | ||
| 292 | module_put(attr->ca_owner); | 294 | module_put(attr->ca_owner); |
| 293 | Done: | 295 | Done: |
| 294 | if (error && item) | 296 | if (error && item) |
diff --git a/fs/dcache.c b/fs/dcache.c index 2bac4ba1d1d3..a1ff91eef108 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -1469,23 +1469,21 @@ static void switch_names(struct dentry *dentry, struct dentry *target) | |||
| 1469 | * deleted it. | 1469 | * deleted it. |
| 1470 | */ | 1470 | */ |
| 1471 | 1471 | ||
| 1472 | /** | 1472 | /* |
| 1473 | * d_move - move a dentry | 1473 | * d_move_locked - move a dentry |
| 1474 | * @dentry: entry to move | 1474 | * @dentry: entry to move |
| 1475 | * @target: new dentry | 1475 | * @target: new dentry |
| 1476 | * | 1476 | * |
| 1477 | * Update the dcache to reflect the move of a file name. Negative | 1477 | * Update the dcache to reflect the move of a file name. Negative |
| 1478 | * dcache entries should not be moved in this way. | 1478 | * dcache entries should not be moved in this way. |
| 1479 | */ | 1479 | */ |
| 1480 | 1480 | static void d_move_locked(struct dentry * dentry, struct dentry * target) | |
| 1481 | void d_move(struct dentry * dentry, struct dentry * target) | ||
| 1482 | { | 1481 | { |
| 1483 | struct hlist_head *list; | 1482 | struct hlist_head *list; |
| 1484 | 1483 | ||
| 1485 | if (!dentry->d_inode) | 1484 | if (!dentry->d_inode) |
| 1486 | printk(KERN_WARNING "VFS: moving negative dcache entry\n"); | 1485 | printk(KERN_WARNING "VFS: moving negative dcache entry\n"); |
| 1487 | 1486 | ||
| 1488 | spin_lock(&dcache_lock); | ||
| 1489 | write_seqlock(&rename_lock); | 1487 | write_seqlock(&rename_lock); |
| 1490 | /* | 1488 | /* |
| 1491 | * XXXX: do we really need to take target->d_lock? | 1489 | * XXXX: do we really need to take target->d_lock? |
| @@ -1536,10 +1534,84 @@ already_unhashed: | |||
| 1536 | fsnotify_d_move(dentry); | 1534 | fsnotify_d_move(dentry); |
| 1537 | spin_unlock(&dentry->d_lock); | 1535 | spin_unlock(&dentry->d_lock); |
| 1538 | write_sequnlock(&rename_lock); | 1536 | write_sequnlock(&rename_lock); |
| 1537 | } | ||
| 1538 | |||
| 1539 | /** | ||
| 1540 | * d_move - move a dentry | ||
| 1541 | * @dentry: entry to move | ||
| 1542 | * @target: new dentry | ||
| 1543 | * | ||
| 1544 | * Update the dcache to reflect the move of a file name. Negative | ||
| 1545 | * dcache entries should not be moved in this way. | ||
| 1546 | */ | ||
| 1547 | |||
| 1548 | void d_move(struct dentry * dentry, struct dentry * target) | ||
| 1549 | { | ||
| 1550 | spin_lock(&dcache_lock); | ||
| 1551 | d_move_locked(dentry, target); | ||
| 1539 | spin_unlock(&dcache_lock); | 1552 | spin_unlock(&dcache_lock); |
| 1540 | } | 1553 | } |
| 1541 | 1554 | ||
| 1542 | /* | 1555 | /* |
| 1556 | * Helper that returns 1 if p1 is a parent of p2, else 0 | ||
| 1557 | */ | ||
| 1558 | static int d_isparent(struct dentry *p1, struct dentry *p2) | ||
| 1559 | { | ||
| 1560 | struct dentry *p; | ||
| 1561 | |||
| 1562 | for (p = p2; p->d_parent != p; p = p->d_parent) { | ||
| 1563 | if (p->d_parent == p1) | ||
| 1564 | return 1; | ||
| 1565 | } | ||
| 1566 | return 0; | ||
| 1567 | } | ||
| 1568 | |||
| 1569 | /* | ||
| 1570 | * This helper attempts to cope with remotely renamed directories | ||
| 1571 | * | ||
| 1572 | * It assumes that the caller is already holding | ||
| 1573 | * dentry->d_parent->d_inode->i_mutex and the dcache_lock | ||
| 1574 | * | ||
| 1575 | * Note: If ever the locking in lock_rename() changes, then please | ||
| 1576 | * remember to update this too... | ||
| 1577 | * | ||
| 1578 | * On return, dcache_lock will have been unlocked. | ||
| 1579 | */ | ||
| 1580 | static struct dentry *__d_unalias(struct dentry *dentry, struct dentry *alias) | ||
| 1581 | { | ||
| 1582 | struct mutex *m1 = NULL, *m2 = NULL; | ||
| 1583 | struct dentry *ret; | ||
| 1584 | |||
| 1585 | /* If alias and dentry share a parent, then no extra locks required */ | ||
| 1586 | if (alias->d_parent == dentry->d_parent) | ||
| 1587 | goto out_unalias; | ||
| 1588 | |||
| 1589 | /* Check for loops */ | ||
| 1590 | ret = ERR_PTR(-ELOOP); | ||
| 1591 | if (d_isparent(alias, dentry)) | ||
| 1592 | goto out_err; | ||
| 1593 | |||
| 1594 | /* See lock_rename() */ | ||
| 1595 | ret = ERR_PTR(-EBUSY); | ||
| 1596 | if (!mutex_trylock(&dentry->d_sb->s_vfs_rename_mutex)) | ||
| 1597 | goto out_err; | ||
| 1598 | m1 = &dentry->d_sb->s_vfs_rename_mutex; | ||
| 1599 | if (!mutex_trylock(&alias->d_parent->d_inode->i_mutex)) | ||
| 1600 | goto out_err; | ||
| 1601 | m2 = &alias->d_parent->d_inode->i_mutex; | ||
| 1602 | out_unalias: | ||
| 1603 | d_move_locked(alias, dentry); | ||
| 1604 | ret = alias; | ||
| 1605 | out_err: | ||
| 1606 | spin_unlock(&dcache_lock); | ||
| 1607 | if (m2) | ||
| 1608 | mutex_unlock(m2); | ||
| 1609 | if (m1) | ||
| 1610 | mutex_unlock(m1); | ||
| 1611 | return ret; | ||
| 1612 | } | ||
| 1613 | |||
| 1614 | /* | ||
| 1543 | * Prepare an anonymous dentry for life in the superblock's dentry tree as a | 1615 | * Prepare an anonymous dentry for life in the superblock's dentry tree as a |
| 1544 | * named dentry in place of the dentry to be replaced. | 1616 | * named dentry in place of the dentry to be replaced. |
| 1545 | */ | 1617 | */ |
| @@ -1581,7 +1653,7 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon) | |||
| 1581 | */ | 1653 | */ |
| 1582 | struct dentry *d_materialise_unique(struct dentry *dentry, struct inode *inode) | 1654 | struct dentry *d_materialise_unique(struct dentry *dentry, struct inode *inode) |
| 1583 | { | 1655 | { |
| 1584 | struct dentry *alias, *actual; | 1656 | struct dentry *actual; |
| 1585 | 1657 | ||
| 1586 | BUG_ON(!d_unhashed(dentry)); | 1658 | BUG_ON(!d_unhashed(dentry)); |
| 1587 | 1659 | ||
| @@ -1593,26 +1665,27 @@ struct dentry *d_materialise_unique(struct dentry *dentry, struct inode *inode) | |||
| 1593 | goto found_lock; | 1665 | goto found_lock; |
| 1594 | } | 1666 | } |
| 1595 | 1667 | ||
| 1596 | /* See if a disconnected directory already exists as an anonymous root | 1668 | if (S_ISDIR(inode->i_mode)) { |
| 1597 | * that we should splice into the tree instead */ | 1669 | struct dentry *alias; |
| 1598 | if (S_ISDIR(inode->i_mode) && (alias = __d_find_alias(inode, 1))) { | 1670 | |
| 1599 | spin_lock(&alias->d_lock); | 1671 | /* Does an aliased dentry already exist? */ |
| 1600 | 1672 | alias = __d_find_alias(inode, 0); | |
| 1601 | /* Is this a mountpoint that we could splice into our tree? */ | 1673 | if (alias) { |
| 1602 | if (IS_ROOT(alias)) | 1674 | actual = alias; |
| 1603 | goto connect_mountpoint; | 1675 | /* Is this an anonymous mountpoint that we could splice |
| 1604 | 1676 | * into our tree? */ | |
| 1605 | if (alias->d_name.len == dentry->d_name.len && | 1677 | if (IS_ROOT(alias)) { |
| 1606 | alias->d_parent == dentry->d_parent && | 1678 | spin_lock(&alias->d_lock); |
| 1607 | memcmp(alias->d_name.name, | 1679 | __d_materialise_dentry(dentry, alias); |
| 1608 | dentry->d_name.name, | 1680 | __d_drop(alias); |
| 1609 | dentry->d_name.len) == 0) | 1681 | goto found; |
| 1610 | goto replace_with_alias; | 1682 | } |
| 1611 | 1683 | /* Nope, but we must(!) avoid directory aliasing */ | |
| 1612 | spin_unlock(&alias->d_lock); | 1684 | actual = __d_unalias(dentry, alias); |
| 1613 | 1685 | if (IS_ERR(actual)) | |
| 1614 | /* Doh! Seem to be aliasing directories for some reason... */ | 1686 | dput(alias); |
| 1615 | dput(alias); | 1687 | goto out_nolock; |
| 1688 | } | ||
| 1616 | } | 1689 | } |
| 1617 | 1690 | ||
| 1618 | /* Add a unique reference */ | 1691 | /* Add a unique reference */ |
| @@ -1628,7 +1701,7 @@ found: | |||
| 1628 | _d_rehash(actual); | 1701 | _d_rehash(actual); |
| 1629 | spin_unlock(&actual->d_lock); | 1702 | spin_unlock(&actual->d_lock); |
| 1630 | spin_unlock(&dcache_lock); | 1703 | spin_unlock(&dcache_lock); |
| 1631 | 1704 | out_nolock: | |
| 1632 | if (actual == dentry) { | 1705 | if (actual == dentry) { |
| 1633 | security_d_instantiate(dentry, inode); | 1706 | security_d_instantiate(dentry, inode); |
| 1634 | return NULL; | 1707 | return NULL; |
| @@ -1637,16 +1710,6 @@ found: | |||
| 1637 | iput(inode); | 1710 | iput(inode); |
| 1638 | return actual; | 1711 | return actual; |
| 1639 | 1712 | ||
| 1640 | /* Convert the anonymous/root alias into an ordinary dentry */ | ||
| 1641 | connect_mountpoint: | ||
| 1642 | __d_materialise_dentry(dentry, alias); | ||
| 1643 | |||
| 1644 | /* Replace the candidate dentry with the alias in the tree */ | ||
| 1645 | replace_with_alias: | ||
| 1646 | __d_drop(alias); | ||
| 1647 | actual = alias; | ||
| 1648 | goto found; | ||
| 1649 | |||
| 1650 | shouldnt_be_hashed: | 1713 | shouldnt_be_hashed: |
| 1651 | spin_unlock(&dcache_lock); | 1714 | spin_unlock(&dcache_lock); |
| 1652 | BUG(); | 1715 | BUG(); |
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 867f93d0417e..6da6b14d5a61 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c | |||
| @@ -519,6 +519,7 @@ static int receive_from_sock(void) | |||
| 519 | msg.msg_flags = 0; | 519 | msg.msg_flags = 0; |
| 520 | msg.msg_control = incmsg; | 520 | msg.msg_control = incmsg; |
| 521 | msg.msg_controllen = sizeof(incmsg); | 521 | msg.msg_controllen = sizeof(incmsg); |
| 522 | msg.msg_iovlen = 1; | ||
| 522 | 523 | ||
| 523 | /* I don't see why this circular buffer stuff is necessary for SCTP | 524 | /* I don't see why this circular buffer stuff is necessary for SCTP |
| 524 | * which is a packet-based protocol, but the whole thing breaks under | 525 | * which is a packet-based protocol, but the whole thing breaks under |
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index 7a11b8ae6644..5938a232d11b 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
| @@ -104,10 +104,7 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry, | |||
| 104 | inode->i_op = &ecryptfs_dir_iops; | 104 | inode->i_op = &ecryptfs_dir_iops; |
| 105 | if (S_ISDIR(lower_inode->i_mode)) | 105 | if (S_ISDIR(lower_inode->i_mode)) |
| 106 | inode->i_fop = &ecryptfs_dir_fops; | 106 | inode->i_fop = &ecryptfs_dir_fops; |
| 107 | /* TODO: Is there a better way to identify if the inode is | 107 | if (special_file(lower_inode->i_mode)) |
| 108 | * special? */ | ||
| 109 | if (S_ISBLK(lower_inode->i_mode) || S_ISCHR(lower_inode->i_mode) || | ||
| 110 | S_ISFIFO(lower_inode->i_mode) || S_ISSOCK(lower_inode->i_mode)) | ||
| 111 | init_special_inode(inode, lower_inode->i_mode, | 108 | init_special_inode(inode, lower_inode->i_mode, |
| 112 | lower_inode->i_rdev); | 109 | lower_inode->i_rdev); |
| 113 | dentry->d_op = &ecryptfs_dops; | 110 | dentry->d_op = &ecryptfs_dops; |
diff --git a/fs/fat/file.c b/fs/fat/file.c index f4b8f8b3fbdd..8337451e7897 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/smp_lock.h> | 13 | #include <linux/smp_lock.h> |
| 14 | #include <linux/buffer_head.h> | 14 | #include <linux/buffer_head.h> |
| 15 | #include <linux/writeback.h> | 15 | #include <linux/writeback.h> |
| 16 | #include <linux/backing-dev.h> | ||
| 16 | #include <linux/blkdev.h> | 17 | #include <linux/blkdev.h> |
| 17 | 18 | ||
| 18 | int fat_generic_ioctl(struct inode *inode, struct file *filp, | 19 | int fat_generic_ioctl(struct inode *inode, struct file *filp, |
| @@ -118,7 +119,7 @@ static int fat_file_release(struct inode *inode, struct file *filp) | |||
| 118 | if ((filp->f_mode & FMODE_WRITE) && | 119 | if ((filp->f_mode & FMODE_WRITE) && |
| 119 | MSDOS_SB(inode->i_sb)->options.flush) { | 120 | MSDOS_SB(inode->i_sb)->options.flush) { |
| 120 | fat_flush_inodes(inode->i_sb, inode, NULL); | 121 | fat_flush_inodes(inode->i_sb, inode, NULL); |
| 121 | blk_congestion_wait(WRITE, HZ/10); | 122 | congestion_wait(WRITE, HZ/10); |
| 122 | } | 123 | } |
| 123 | return 0; | 124 | return 0; |
| 124 | } | 125 | } |
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index cc57f2ecd219..06e9a8cb45e9 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c | |||
| @@ -434,8 +434,7 @@ static int lookup_block(struct gfs2_inode *ip, struct buffer_head *bh, | |||
| 434 | */ | 434 | */ |
| 435 | 435 | ||
| 436 | static int gfs2_block_pointers(struct inode *inode, u64 lblock, int create, | 436 | static int gfs2_block_pointers(struct inode *inode, u64 lblock, int create, |
| 437 | struct buffer_head *bh_map, struct metapath *mp, | 437 | struct buffer_head *bh_map, struct metapath *mp) |
| 438 | unsigned int maxlen) | ||
| 439 | { | 438 | { |
| 440 | struct gfs2_inode *ip = GFS2_I(inode); | 439 | struct gfs2_inode *ip = GFS2_I(inode); |
| 441 | struct gfs2_sbd *sdp = GFS2_SB(inode); | 440 | struct gfs2_sbd *sdp = GFS2_SB(inode); |
| @@ -448,6 +447,7 @@ static int gfs2_block_pointers(struct inode *inode, u64 lblock, int create, | |||
| 448 | int new = 0; | 447 | int new = 0; |
| 449 | u64 dblock = 0; | 448 | u64 dblock = 0; |
| 450 | int boundary; | 449 | int boundary; |
| 450 | unsigned int maxlen = bh_map->b_size >> inode->i_blkbits; | ||
| 451 | 451 | ||
| 452 | BUG_ON(maxlen == 0); | 452 | BUG_ON(maxlen == 0); |
| 453 | 453 | ||
| @@ -541,13 +541,13 @@ static inline void bmap_unlock(struct inode *inode, int create) | |||
| 541 | } | 541 | } |
| 542 | 542 | ||
| 543 | int gfs2_block_map(struct inode *inode, u64 lblock, int create, | 543 | int gfs2_block_map(struct inode *inode, u64 lblock, int create, |
| 544 | struct buffer_head *bh, unsigned int maxlen) | 544 | struct buffer_head *bh) |
| 545 | { | 545 | { |
| 546 | struct metapath mp; | 546 | struct metapath mp; |
| 547 | int ret; | 547 | int ret; |
| 548 | 548 | ||
| 549 | bmap_lock(inode, create); | 549 | bmap_lock(inode, create); |
| 550 | ret = gfs2_block_pointers(inode, lblock, create, bh, &mp, maxlen); | 550 | ret = gfs2_block_pointers(inode, lblock, create, bh, &mp); |
| 551 | bmap_unlock(inode, create); | 551 | bmap_unlock(inode, create); |
| 552 | return ret; | 552 | return ret; |
| 553 | } | 553 | } |
| @@ -555,7 +555,7 @@ int gfs2_block_map(struct inode *inode, u64 lblock, int create, | |||
| 555 | int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsigned *extlen) | 555 | int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsigned *extlen) |
| 556 | { | 556 | { |
| 557 | struct metapath mp; | 557 | struct metapath mp; |
| 558 | struct buffer_head bh = { .b_state = 0, .b_blocknr = 0, .b_size = 0 }; | 558 | struct buffer_head bh = { .b_state = 0, .b_blocknr = 0 }; |
| 559 | int ret; | 559 | int ret; |
| 560 | int create = *new; | 560 | int create = *new; |
| 561 | 561 | ||
| @@ -563,8 +563,9 @@ int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsi | |||
| 563 | BUG_ON(!dblock); | 563 | BUG_ON(!dblock); |
| 564 | BUG_ON(!new); | 564 | BUG_ON(!new); |
| 565 | 565 | ||
| 566 | bh.b_size = 1 << (inode->i_blkbits + 5); | ||
| 566 | bmap_lock(inode, create); | 567 | bmap_lock(inode, create); |
| 567 | ret = gfs2_block_pointers(inode, lblock, create, &bh, &mp, 32); | 568 | ret = gfs2_block_pointers(inode, lblock, create, &bh, &mp); |
| 568 | bmap_unlock(inode, create); | 569 | bmap_unlock(inode, create); |
| 569 | *extlen = bh.b_size >> inode->i_blkbits; | 570 | *extlen = bh.b_size >> inode->i_blkbits; |
| 570 | *dblock = bh.b_blocknr; | 571 | *dblock = bh.b_blocknr; |
diff --git a/fs/gfs2/bmap.h b/fs/gfs2/bmap.h index 0fd379b4cd9e..ac2fd04370dc 100644 --- a/fs/gfs2/bmap.h +++ b/fs/gfs2/bmap.h | |||
| @@ -15,7 +15,7 @@ struct gfs2_inode; | |||
| 15 | struct page; | 15 | struct page; |
| 16 | 16 | ||
| 17 | int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page); | 17 | int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page); |
| 18 | int gfs2_block_map(struct inode *inode, u64 lblock, int create, struct buffer_head *bh, unsigned int maxlen); | 18 | int gfs2_block_map(struct inode *inode, u64 lblock, int create, struct buffer_head *bh); |
| 19 | int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsigned *extlen); | 19 | int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsigned *extlen); |
| 20 | 20 | ||
| 21 | int gfs2_truncatei(struct gfs2_inode *ip, u64 size); | 21 | int gfs2_truncatei(struct gfs2_inode *ip, u64 size); |
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 459498cac93b..e24af28b1a12 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c | |||
| @@ -184,7 +184,7 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf, | |||
| 184 | while (copied < size) { | 184 | while (copied < size) { |
| 185 | unsigned int amount; | 185 | unsigned int amount; |
| 186 | struct buffer_head *bh; | 186 | struct buffer_head *bh; |
| 187 | int new; | 187 | int new = 0; |
| 188 | 188 | ||
| 189 | amount = size - copied; | 189 | amount = size - copied; |
| 190 | if (amount > sdp->sd_sb.sb_bsize - o) | 190 | if (amount > sdp->sd_sb.sb_bsize - o) |
| @@ -212,8 +212,6 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf, | |||
| 212 | gfs2_trans_add_bh(ip->i_gl, bh, 1); | 212 | gfs2_trans_add_bh(ip->i_gl, bh, 1); |
| 213 | memcpy(bh->b_data + o, buf, amount); | 213 | memcpy(bh->b_data + o, buf, amount); |
| 214 | brelse(bh); | 214 | brelse(bh); |
| 215 | if (error) | ||
| 216 | goto fail; | ||
| 217 | 215 | ||
| 218 | buf += amount; | 216 | buf += amount; |
| 219 | copied += amount; | 217 | copied += amount; |
| @@ -317,8 +315,7 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, char *buf, u64 offset, | |||
| 317 | if (!ra) | 315 | if (!ra) |
| 318 | extlen = 1; | 316 | extlen = 1; |
| 319 | bh = gfs2_meta_ra(ip->i_gl, dblock, extlen); | 317 | bh = gfs2_meta_ra(ip->i_gl, dblock, extlen); |
| 320 | } | 318 | } else { |
| 321 | if (!bh) { | ||
| 322 | error = gfs2_meta_read(ip->i_gl, dblock, DIO_WAIT, &bh); | 319 | error = gfs2_meta_read(ip->i_gl, dblock, DIO_WAIT, &bh); |
| 323 | if (error) | 320 | if (error) |
| 324 | goto fail; | 321 | goto fail; |
| @@ -332,7 +329,6 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, char *buf, u64 offset, | |||
| 332 | extlen--; | 329 | extlen--; |
| 333 | memcpy(buf, bh->b_data + o, amount); | 330 | memcpy(buf, bh->b_data + o, amount); |
| 334 | brelse(bh); | 331 | brelse(bh); |
| 335 | bh = NULL; | ||
| 336 | buf += amount; | 332 | buf += amount; |
| 337 | copied += amount; | 333 | copied += amount; |
| 338 | lblock++; | 334 | lblock++; |
| @@ -815,7 +811,7 @@ static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh, | |||
| 815 | leaf = (struct gfs2_leaf *)bh->b_data; | 811 | leaf = (struct gfs2_leaf *)bh->b_data; |
| 816 | leaf->lf_depth = cpu_to_be16(depth); | 812 | leaf->lf_depth = cpu_to_be16(depth); |
| 817 | leaf->lf_entries = 0; | 813 | leaf->lf_entries = 0; |
| 818 | leaf->lf_dirent_format = cpu_to_be16(GFS2_FORMAT_DE); | 814 | leaf->lf_dirent_format = cpu_to_be32(GFS2_FORMAT_DE); |
| 819 | leaf->lf_next = 0; | 815 | leaf->lf_next = 0; |
| 820 | memset(leaf->lf_reserved, 0, sizeof(leaf->lf_reserved)); | 816 | memset(leaf->lf_reserved, 0, sizeof(leaf->lf_reserved)); |
| 821 | dent = (struct gfs2_dirent *)(leaf+1); | 817 | dent = (struct gfs2_dirent *)(leaf+1); |
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 72eec6542d6a..0cace3da9dbb 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c | |||
| @@ -312,10 +312,12 @@ void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks) | |||
| 312 | 312 | ||
| 313 | static u64 log_bmap(struct gfs2_sbd *sdp, unsigned int lbn) | 313 | static u64 log_bmap(struct gfs2_sbd *sdp, unsigned int lbn) |
| 314 | { | 314 | { |
| 315 | struct inode *inode = sdp->sd_jdesc->jd_inode; | ||
| 315 | int error; | 316 | int error; |
| 316 | struct buffer_head bh_map; | 317 | struct buffer_head bh_map = { .b_state = 0, .b_blocknr = 0 }; |
| 317 | 318 | ||
| 318 | error = gfs2_block_map(sdp->sd_jdesc->jd_inode, lbn, 0, &bh_map, 1); | 319 | bh_map.b_size = 1 << inode->i_blkbits; |
| 320 | error = gfs2_block_map(inode, lbn, 0, &bh_map); | ||
| 319 | if (error || !bh_map.b_blocknr) | 321 | if (error || !bh_map.b_blocknr) |
| 320 | printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, bh_map.b_blocknr, lbn); | 322 | printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, bh_map.b_blocknr, lbn); |
| 321 | gfs2_assert_withdraw(sdp, !error && bh_map.b_blocknr); | 323 | gfs2_assert_withdraw(sdp, !error && bh_map.b_blocknr); |
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index e0599fed99ce..8d5963c7e123 100644 --- a/fs/gfs2/ops_address.c +++ b/fs/gfs2/ops_address.c | |||
| @@ -65,7 +65,7 @@ static void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page, | |||
| 65 | int gfs2_get_block(struct inode *inode, sector_t lblock, | 65 | int gfs2_get_block(struct inode *inode, sector_t lblock, |
| 66 | struct buffer_head *bh_result, int create) | 66 | struct buffer_head *bh_result, int create) |
| 67 | { | 67 | { |
| 68 | return gfs2_block_map(inode, lblock, create, bh_result, 32); | 68 | return gfs2_block_map(inode, lblock, create, bh_result); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | /** | 71 | /** |
| @@ -83,7 +83,7 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock, | |||
| 83 | { | 83 | { |
| 84 | int error; | 84 | int error; |
| 85 | 85 | ||
| 86 | error = gfs2_block_map(inode, lblock, 0, bh_result, 1); | 86 | error = gfs2_block_map(inode, lblock, 0, bh_result); |
| 87 | if (error) | 87 | if (error) |
| 88 | return error; | 88 | return error; |
| 89 | if (bh_result->b_blocknr == 0) | 89 | if (bh_result->b_blocknr == 0) |
| @@ -94,7 +94,7 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock, | |||
| 94 | static int gfs2_get_block_direct(struct inode *inode, sector_t lblock, | 94 | static int gfs2_get_block_direct(struct inode *inode, sector_t lblock, |
| 95 | struct buffer_head *bh_result, int create) | 95 | struct buffer_head *bh_result, int create) |
| 96 | { | 96 | { |
| 97 | return gfs2_block_map(inode, lblock, 0, bh_result, 32); | 97 | return gfs2_block_map(inode, lblock, 0, bh_result); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | /** | 100 | /** |
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index 178b33911843..882873a6bd69 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
| @@ -794,8 +794,8 @@ static int fill_super_meta(struct super_block *sb, struct super_block *new, | |||
| 794 | fs_err(sdp, "can't get root dentry\n"); | 794 | fs_err(sdp, "can't get root dentry\n"); |
| 795 | error = -ENOMEM; | 795 | error = -ENOMEM; |
| 796 | iput(inode); | 796 | iput(inode); |
| 797 | } | 797 | } else |
| 798 | new->s_root->d_op = &gfs2_dops; | 798 | new->s_root->d_op = &gfs2_dops; |
| 799 | 799 | ||
| 800 | return error; | 800 | return error; |
| 801 | } | 801 | } |
| @@ -854,7 +854,6 @@ static int gfs2_get_sb_meta(struct file_system_type *fs_type, int flags, | |||
| 854 | int error = 0; | 854 | int error = 0; |
| 855 | struct super_block *sb = NULL, *new; | 855 | struct super_block *sb = NULL, *new; |
| 856 | struct gfs2_sbd *sdp; | 856 | struct gfs2_sbd *sdp; |
| 857 | char *gfs2mnt = NULL; | ||
| 858 | 857 | ||
| 859 | sb = get_gfs2_sb(dev_name); | 858 | sb = get_gfs2_sb(dev_name); |
| 860 | if (!sb) { | 859 | if (!sb) { |
| @@ -892,8 +891,6 @@ static int gfs2_get_sb_meta(struct file_system_type *fs_type, int flags, | |||
| 892 | atomic_inc(&sdp->sd_gfs2mnt->mnt_count); | 891 | atomic_inc(&sdp->sd_gfs2mnt->mnt_count); |
| 893 | return simple_set_mnt(mnt, new); | 892 | return simple_set_mnt(mnt, new); |
| 894 | error: | 893 | error: |
| 895 | if (gfs2mnt) | ||
| 896 | kfree(gfs2mnt); | ||
| 897 | return error; | 894 | return error; |
| 898 | } | 895 | } |
| 899 | 896 | ||
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index c69b94a55588..a3deae7416c9 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c | |||
| @@ -251,7 +251,7 @@ static int bh_get(struct gfs2_quota_data *qd) | |||
| 251 | unsigned int block, offset; | 251 | unsigned int block, offset; |
| 252 | struct buffer_head *bh; | 252 | struct buffer_head *bh; |
| 253 | int error; | 253 | int error; |
| 254 | struct buffer_head bh_map; | 254 | struct buffer_head bh_map = { .b_state = 0, .b_blocknr = 0 }; |
| 255 | 255 | ||
| 256 | mutex_lock(&sdp->sd_quota_mutex); | 256 | mutex_lock(&sdp->sd_quota_mutex); |
| 257 | 257 | ||
| @@ -263,7 +263,8 @@ static int bh_get(struct gfs2_quota_data *qd) | |||
| 263 | block = qd->qd_slot / sdp->sd_qc_per_block; | 263 | block = qd->qd_slot / sdp->sd_qc_per_block; |
| 264 | offset = qd->qd_slot % sdp->sd_qc_per_block;; | 264 | offset = qd->qd_slot % sdp->sd_qc_per_block;; |
| 265 | 265 | ||
| 266 | error = gfs2_block_map(&ip->i_inode, block, 0, &bh_map, 1); | 266 | bh_map.b_size = 1 << ip->i_inode.i_blkbits; |
| 267 | error = gfs2_block_map(&ip->i_inode, block, 0, &bh_map); | ||
| 267 | if (error) | 268 | if (error) |
| 268 | goto fail; | 269 | goto fail; |
| 269 | error = gfs2_meta_read(ip->i_gl, bh_map.b_blocknr, DIO_WAIT, &bh); | 270 | error = gfs2_meta_read(ip->i_gl, bh_map.b_blocknr, DIO_WAIT, &bh); |
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c index 0a8a4b87dcc6..62cd223819b7 100644 --- a/fs/gfs2/recovery.c +++ b/fs/gfs2/recovery.c | |||
| @@ -372,11 +372,12 @@ static int clean_journal(struct gfs2_jdesc *jd, struct gfs2_log_header *head) | |||
| 372 | u32 hash; | 372 | u32 hash; |
| 373 | struct buffer_head *bh; | 373 | struct buffer_head *bh; |
| 374 | int error; | 374 | int error; |
| 375 | struct buffer_head bh_map; | 375 | struct buffer_head bh_map = { .b_state = 0, .b_blocknr = 0 }; |
| 376 | 376 | ||
| 377 | lblock = head->lh_blkno; | 377 | lblock = head->lh_blkno; |
| 378 | gfs2_replay_incr_blk(sdp, &lblock); | 378 | gfs2_replay_incr_blk(sdp, &lblock); |
| 379 | error = gfs2_block_map(&ip->i_inode, lblock, 0, &bh_map, 1); | 379 | bh_map.b_size = 1 << ip->i_inode.i_blkbits; |
| 380 | error = gfs2_block_map(&ip->i_inode, lblock, 0, &bh_map); | ||
| 380 | if (error) | 381 | if (error) |
| 381 | return error; | 382 | return error; |
| 382 | if (!bh_map.b_blocknr) { | 383 | if (!bh_map.b_blocknr) { |
diff --git a/fs/inode.c b/fs/inode.c index d9a21d122926..26cdb115ce67 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -1306,6 +1306,42 @@ void wake_up_inode(struct inode *inode) | |||
| 1306 | wake_up_bit(&inode->i_state, __I_LOCK); | 1306 | wake_up_bit(&inode->i_state, __I_LOCK); |
| 1307 | } | 1307 | } |
| 1308 | 1308 | ||
| 1309 | /* | ||
| 1310 | * We rarely want to lock two inodes that do not have a parent/child | ||
| 1311 | * relationship (such as directory, child inode) simultaneously. The | ||
| 1312 | * vast majority of file systems should be able to get along fine | ||
| 1313 | * without this. Do not use these functions except as a last resort. | ||
| 1314 | */ | ||
| 1315 | void inode_double_lock(struct inode *inode1, struct inode *inode2) | ||
| 1316 | { | ||
| 1317 | if (inode1 == NULL || inode2 == NULL || inode1 == inode2) { | ||
| 1318 | if (inode1) | ||
| 1319 | mutex_lock(&inode1->i_mutex); | ||
| 1320 | else if (inode2) | ||
| 1321 | mutex_lock(&inode2->i_mutex); | ||
| 1322 | return; | ||
| 1323 | } | ||
| 1324 | |||
| 1325 | if (inode1 < inode2) { | ||
| 1326 | mutex_lock_nested(&inode1->i_mutex, I_MUTEX_PARENT); | ||
| 1327 | mutex_lock_nested(&inode2->i_mutex, I_MUTEX_CHILD); | ||
| 1328 | } else { | ||
| 1329 | mutex_lock_nested(&inode2->i_mutex, I_MUTEX_PARENT); | ||
| 1330 | mutex_lock_nested(&inode1->i_mutex, I_MUTEX_CHILD); | ||
| 1331 | } | ||
| 1332 | } | ||
| 1333 | EXPORT_SYMBOL(inode_double_lock); | ||
| 1334 | |||
| 1335 | void inode_double_unlock(struct inode *inode1, struct inode *inode2) | ||
| 1336 | { | ||
| 1337 | if (inode1) | ||
| 1338 | mutex_unlock(&inode1->i_mutex); | ||
| 1339 | |||
| 1340 | if (inode2 && inode2 != inode1) | ||
| 1341 | mutex_unlock(&inode2->i_mutex); | ||
| 1342 | } | ||
| 1343 | EXPORT_SYMBOL(inode_double_unlock); | ||
| 1344 | |||
| 1309 | static __initdata unsigned long ihash_entries; | 1345 | static __initdata unsigned long ihash_entries; |
| 1310 | static int __init set_ihash_entries(char *str) | 1346 | static int __init set_ihash_entries(char *str) |
| 1311 | { | 1347 | { |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index e1b3c8af4d17..d5c63047a8b3 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
| @@ -1314,13 +1314,14 @@ int journal_stop(handle_t *handle) | |||
| 1314 | int old_handle_count, err; | 1314 | int old_handle_count, err; |
| 1315 | pid_t pid; | 1315 | pid_t pid; |
| 1316 | 1316 | ||
| 1317 | J_ASSERT(transaction->t_updates > 0); | ||
| 1318 | J_ASSERT(journal_current_handle() == handle); | 1317 | J_ASSERT(journal_current_handle() == handle); |
| 1319 | 1318 | ||
| 1320 | if (is_handle_aborted(handle)) | 1319 | if (is_handle_aborted(handle)) |
| 1321 | err = -EIO; | 1320 | err = -EIO; |
| 1322 | else | 1321 | else { |
| 1322 | J_ASSERT(transaction->t_updates > 0); | ||
| 1323 | err = 0; | 1323 | err = 0; |
| 1324 | } | ||
| 1324 | 1325 | ||
| 1325 | if (--handle->h_ref > 0) { | 1326 | if (--handle->h_ref > 0) { |
| 1326 | jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1, | 1327 | jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1, |
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 149957bef907..b6cf2be845a1 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
| @@ -1314,13 +1314,14 @@ int jbd2_journal_stop(handle_t *handle) | |||
| 1314 | int old_handle_count, err; | 1314 | int old_handle_count, err; |
| 1315 | pid_t pid; | 1315 | pid_t pid; |
| 1316 | 1316 | ||
| 1317 | J_ASSERT(transaction->t_updates > 0); | ||
| 1318 | J_ASSERT(journal_current_handle() == handle); | 1317 | J_ASSERT(journal_current_handle() == handle); |
| 1319 | 1318 | ||
| 1320 | if (is_handle_aborted(handle)) | 1319 | if (is_handle_aborted(handle)) |
| 1321 | err = -EIO; | 1320 | err = -EIO; |
| 1322 | else | 1321 | else { |
| 1322 | J_ASSERT(transaction->t_updates > 0); | ||
| 1323 | err = 0; | 1323 | err = 0; |
| 1324 | } | ||
| 1324 | 1325 | ||
| 1325 | if (--handle->h_ref > 0) { | 1326 | if (--handle->h_ref > 0) { |
| 1326 | jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1, | 1327 | jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1, |
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c index e8c7765419e8..b85a0ad2cfb6 100644 --- a/fs/lockd/clntlock.c +++ b/fs/lockd/clntlock.c | |||
| @@ -100,12 +100,12 @@ int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout) | |||
| 100 | /* | 100 | /* |
| 101 | * The server lockd has called us back to tell us the lock was granted | 101 | * The server lockd has called us back to tell us the lock was granted |
| 102 | */ | 102 | */ |
| 103 | u32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock) | 103 | __be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock) |
| 104 | { | 104 | { |
| 105 | const struct file_lock *fl = &lock->fl; | 105 | const struct file_lock *fl = &lock->fl; |
| 106 | const struct nfs_fh *fh = &lock->fh; | 106 | const struct nfs_fh *fh = &lock->fh; |
| 107 | struct nlm_wait *block; | 107 | struct nlm_wait *block; |
| 108 | u32 res = nlm_lck_denied; | 108 | __be32 res = nlm_lck_denied; |
| 109 | 109 | ||
| 110 | /* | 110 | /* |
| 111 | * Look up blocked request based on arguments. | 111 | * Look up blocked request based on arguments. |
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index e0179f8c327f..eb243edf8932 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c | |||
| @@ -148,8 +148,8 @@ nsm_create(void) | |||
| 148 | * XDR functions for NSM. | 148 | * XDR functions for NSM. |
| 149 | */ | 149 | */ |
| 150 | 150 | ||
| 151 | static u32 * | 151 | static __be32 * |
| 152 | xdr_encode_common(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) | 152 | xdr_encode_common(struct rpc_rqst *rqstp, __be32 *p, struct nsm_args *argp) |
| 153 | { | 153 | { |
| 154 | char buffer[20], *name; | 154 | char buffer[20], *name; |
| 155 | 155 | ||
| @@ -176,7 +176,7 @@ xdr_encode_common(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) | |||
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | static int | 178 | static int |
| 179 | xdr_encode_mon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) | 179 | xdr_encode_mon(struct rpc_rqst *rqstp, __be32 *p, struct nsm_args *argp) |
| 180 | { | 180 | { |
| 181 | p = xdr_encode_common(rqstp, p, argp); | 181 | p = xdr_encode_common(rqstp, p, argp); |
| 182 | if (IS_ERR(p)) | 182 | if (IS_ERR(p)) |
| @@ -192,7 +192,7 @@ xdr_encode_mon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) | |||
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | static int | 194 | static int |
| 195 | xdr_encode_unmon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) | 195 | xdr_encode_unmon(struct rpc_rqst *rqstp, __be32 *p, struct nsm_args *argp) |
| 196 | { | 196 | { |
| 197 | p = xdr_encode_common(rqstp, p, argp); | 197 | p = xdr_encode_common(rqstp, p, argp); |
| 198 | if (IS_ERR(p)) | 198 | if (IS_ERR(p)) |
| @@ -202,7 +202,7 @@ xdr_encode_unmon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) | |||
| 202 | } | 202 | } |
| 203 | 203 | ||
| 204 | static int | 204 | static int |
| 205 | xdr_decode_stat_res(struct rpc_rqst *rqstp, u32 *p, struct nsm_res *resp) | 205 | xdr_decode_stat_res(struct rpc_rqst *rqstp, __be32 *p, struct nsm_res *resp) |
| 206 | { | 206 | { |
| 207 | resp->status = ntohl(*p++); | 207 | resp->status = ntohl(*p++); |
| 208 | resp->state = ntohl(*p++); | 208 | resp->state = ntohl(*p++); |
| @@ -212,7 +212,7 @@ xdr_decode_stat_res(struct rpc_rqst *rqstp, u32 *p, struct nsm_res *resp) | |||
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | static int | 214 | static int |
| 215 | xdr_decode_stat(struct rpc_rqst *rqstp, u32 *p, struct nsm_res *resp) | 215 | xdr_decode_stat(struct rpc_rqst *rqstp, __be32 *p, struct nsm_res *resp) |
| 216 | { | 216 | { |
| 217 | resp->state = ntohl(*p++); | 217 | resp->state = ntohl(*p++); |
| 218 | return 0; | 218 | return 0; |
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index 399ad11b97be..0ce5c81ff507 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c | |||
| @@ -24,14 +24,14 @@ | |||
| 24 | /* | 24 | /* |
| 25 | * Obtain client and file from arguments | 25 | * Obtain client and file from arguments |
| 26 | */ | 26 | */ |
| 27 | static u32 | 27 | static __be32 |
| 28 | nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, | 28 | nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 29 | struct nlm_host **hostp, struct nlm_file **filp) | 29 | struct nlm_host **hostp, struct nlm_file **filp) |
| 30 | { | 30 | { |
| 31 | struct nlm_host *host = NULL; | 31 | struct nlm_host *host = NULL; |
| 32 | struct nlm_file *file = NULL; | 32 | struct nlm_file *file = NULL; |
| 33 | struct nlm_lock *lock = &argp->lock; | 33 | struct nlm_lock *lock = &argp->lock; |
| 34 | u32 error = 0; | 34 | __be32 error = 0; |
| 35 | 35 | ||
| 36 | /* nfsd callbacks must have been installed for this procedure */ | 36 | /* nfsd callbacks must have been installed for this procedure */ |
| 37 | if (!nlmsvc_ops) | 37 | if (!nlmsvc_ops) |
| @@ -68,7 +68,7 @@ no_locks: | |||
| 68 | /* | 68 | /* |
| 69 | * NULL: Test for presence of service | 69 | * NULL: Test for presence of service |
| 70 | */ | 70 | */ |
| 71 | static int | 71 | static __be32 |
| 72 | nlm4svc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | 72 | nlm4svc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) |
| 73 | { | 73 | { |
| 74 | dprintk("lockd: NULL called\n"); | 74 | dprintk("lockd: NULL called\n"); |
| @@ -78,7 +78,7 @@ nlm4svc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | |||
| 78 | /* | 78 | /* |
| 79 | * TEST: Check for conflicting lock | 79 | * TEST: Check for conflicting lock |
| 80 | */ | 80 | */ |
| 81 | static int | 81 | static __be32 |
| 82 | nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, | 82 | nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 83 | struct nlm_res *resp) | 83 | struct nlm_res *resp) |
| 84 | { | 84 | { |
| @@ -107,7 +107,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 107 | return rpc_success; | 107 | return rpc_success; |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | static int | 110 | static __be32 |
| 111 | nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | 111 | nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 112 | struct nlm_res *resp) | 112 | struct nlm_res *resp) |
| 113 | { | 113 | { |
| @@ -150,7 +150,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 150 | return rpc_success; | 150 | return rpc_success; |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | static int | 153 | static __be32 |
| 154 | nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, | 154 | nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 155 | struct nlm_res *resp) | 155 | struct nlm_res *resp) |
| 156 | { | 156 | { |
| @@ -183,7 +183,7 @@ nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 183 | /* | 183 | /* |
| 184 | * UNLOCK: release a lock | 184 | * UNLOCK: release a lock |
| 185 | */ | 185 | */ |
| 186 | static int | 186 | static __be32 |
| 187 | nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, | 187 | nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 188 | struct nlm_res *resp) | 188 | struct nlm_res *resp) |
| 189 | { | 189 | { |
| @@ -217,7 +217,7 @@ nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 217 | * GRANTED: A server calls us to tell that a process' lock request | 217 | * GRANTED: A server calls us to tell that a process' lock request |
| 218 | * was granted | 218 | * was granted |
| 219 | */ | 219 | */ |
| 220 | static int | 220 | static __be32 |
| 221 | nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, | 221 | nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 222 | struct nlm_res *resp) | 222 | struct nlm_res *resp) |
| 223 | { | 223 | { |
| @@ -253,12 +253,12 @@ static const struct rpc_call_ops nlm4svc_callback_ops = { | |||
| 253 | * because we send the callback before the reply proper. I hope this | 253 | * because we send the callback before the reply proper. I hope this |
| 254 | * doesn't break any clients. | 254 | * doesn't break any clients. |
| 255 | */ | 255 | */ |
| 256 | static int nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp, | 256 | static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp, |
| 257 | int (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res *)) | 257 | __be32 (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res *)) |
| 258 | { | 258 | { |
| 259 | struct nlm_host *host; | 259 | struct nlm_host *host; |
| 260 | struct nlm_rqst *call; | 260 | struct nlm_rqst *call; |
| 261 | int stat; | 261 | __be32 stat; |
| 262 | 262 | ||
| 263 | host = nlmsvc_lookup_host(rqstp, | 263 | host = nlmsvc_lookup_host(rqstp, |
| 264 | argp->lock.caller, | 264 | argp->lock.caller, |
| @@ -282,35 +282,35 @@ static int nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *a | |||
| 282 | return rpc_success; | 282 | return rpc_success; |
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | static int nlm4svc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | 285 | static __be32 nlm4svc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 286 | void *resp) | 286 | void *resp) |
| 287 | { | 287 | { |
| 288 | dprintk("lockd: TEST_MSG called\n"); | 288 | dprintk("lockd: TEST_MSG called\n"); |
| 289 | return nlm4svc_callback(rqstp, NLMPROC_TEST_RES, argp, nlm4svc_proc_test); | 289 | return nlm4svc_callback(rqstp, NLMPROC_TEST_RES, argp, nlm4svc_proc_test); |
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | static int nlm4svc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | 292 | static __be32 nlm4svc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 293 | void *resp) | 293 | void *resp) |
| 294 | { | 294 | { |
| 295 | dprintk("lockd: LOCK_MSG called\n"); | 295 | dprintk("lockd: LOCK_MSG called\n"); |
| 296 | return nlm4svc_callback(rqstp, NLMPROC_LOCK_RES, argp, nlm4svc_proc_lock); | 296 | return nlm4svc_callback(rqstp, NLMPROC_LOCK_RES, argp, nlm4svc_proc_lock); |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | static int nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | 299 | static __be32 nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 300 | void *resp) | 300 | void *resp) |
| 301 | { | 301 | { |
| 302 | dprintk("lockd: CANCEL_MSG called\n"); | 302 | dprintk("lockd: CANCEL_MSG called\n"); |
| 303 | return nlm4svc_callback(rqstp, NLMPROC_CANCEL_RES, argp, nlm4svc_proc_cancel); | 303 | return nlm4svc_callback(rqstp, NLMPROC_CANCEL_RES, argp, nlm4svc_proc_cancel); |
| 304 | } | 304 | } |
| 305 | 305 | ||
| 306 | static int nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | 306 | static __be32 nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 307 | void *resp) | 307 | void *resp) |
| 308 | { | 308 | { |
| 309 | dprintk("lockd: UNLOCK_MSG called\n"); | 309 | dprintk("lockd: UNLOCK_MSG called\n"); |
| 310 | return nlm4svc_callback(rqstp, NLMPROC_UNLOCK_RES, argp, nlm4svc_proc_unlock); | 310 | return nlm4svc_callback(rqstp, NLMPROC_UNLOCK_RES, argp, nlm4svc_proc_unlock); |
| 311 | } | 311 | } |
| 312 | 312 | ||
| 313 | static int nlm4svc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | 313 | static __be32 nlm4svc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 314 | void *resp) | 314 | void *resp) |
| 315 | { | 315 | { |
| 316 | dprintk("lockd: GRANTED_MSG called\n"); | 316 | dprintk("lockd: GRANTED_MSG called\n"); |
| @@ -320,7 +320,7 @@ static int nlm4svc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *arg | |||
| 320 | /* | 320 | /* |
| 321 | * SHARE: create a DOS share or alter existing share. | 321 | * SHARE: create a DOS share or alter existing share. |
| 322 | */ | 322 | */ |
| 323 | static int | 323 | static __be32 |
| 324 | nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, | 324 | nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 325 | struct nlm_res *resp) | 325 | struct nlm_res *resp) |
| 326 | { | 326 | { |
| @@ -353,7 +353,7 @@ nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 353 | /* | 353 | /* |
| 354 | * UNSHARE: Release a DOS share. | 354 | * UNSHARE: Release a DOS share. |
| 355 | */ | 355 | */ |
| 356 | static int | 356 | static __be32 |
| 357 | nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, | 357 | nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 358 | struct nlm_res *resp) | 358 | struct nlm_res *resp) |
| 359 | { | 359 | { |
| @@ -386,7 +386,7 @@ nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 386 | /* | 386 | /* |
| 387 | * NM_LOCK: Create an unmonitored lock | 387 | * NM_LOCK: Create an unmonitored lock |
| 388 | */ | 388 | */ |
| 389 | static int | 389 | static __be32 |
| 390 | nlm4svc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | 390 | nlm4svc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 391 | struct nlm_res *resp) | 391 | struct nlm_res *resp) |
| 392 | { | 392 | { |
| @@ -399,7 +399,7 @@ nlm4svc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 399 | /* | 399 | /* |
| 400 | * FREE_ALL: Release all locks and shares held by client | 400 | * FREE_ALL: Release all locks and shares held by client |
| 401 | */ | 401 | */ |
| 402 | static int | 402 | static __be32 |
| 403 | nlm4svc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, | 403 | nlm4svc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 404 | void *resp) | 404 | void *resp) |
| 405 | { | 405 | { |
| @@ -417,7 +417,7 @@ nlm4svc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 417 | /* | 417 | /* |
| 418 | * SM_NOTIFY: private callback from statd (not part of official NLM proto) | 418 | * SM_NOTIFY: private callback from statd (not part of official NLM proto) |
| 419 | */ | 419 | */ |
| 420 | static int | 420 | static __be32 |
| 421 | nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, | 421 | nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, |
| 422 | void *resp) | 422 | void *resp) |
| 423 | { | 423 | { |
| @@ -446,7 +446,7 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, | |||
| 446 | /* | 446 | /* |
| 447 | * client sent a GRANTED_RES, let's remove the associated block | 447 | * client sent a GRANTED_RES, let's remove the associated block |
| 448 | */ | 448 | */ |
| 449 | static int | 449 | static __be32 |
| 450 | nlm4svc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp, | 450 | nlm4svc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp, |
| 451 | void *resp) | 451 | void *resp) |
| 452 | { | 452 | { |
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 814c6064c9e0..7e219b938552 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c | |||
| @@ -334,13 +334,13 @@ static void nlmsvc_freegrantargs(struct nlm_rqst *call) | |||
| 334 | * Attempt to establish a lock, and if it can't be granted, block it | 334 | * Attempt to establish a lock, and if it can't be granted, block it |
| 335 | * if required. | 335 | * if required. |
| 336 | */ | 336 | */ |
| 337 | u32 | 337 | __be32 |
| 338 | nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, | 338 | nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, |
| 339 | struct nlm_lock *lock, int wait, struct nlm_cookie *cookie) | 339 | struct nlm_lock *lock, int wait, struct nlm_cookie *cookie) |
| 340 | { | 340 | { |
| 341 | struct nlm_block *block, *newblock = NULL; | 341 | struct nlm_block *block, *newblock = NULL; |
| 342 | int error; | 342 | int error; |
| 343 | u32 ret; | 343 | __be32 ret; |
| 344 | 344 | ||
| 345 | dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n", | 345 | dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n", |
| 346 | file->f_file->f_dentry->d_inode->i_sb->s_id, | 346 | file->f_file->f_dentry->d_inode->i_sb->s_id, |
| @@ -415,7 +415,7 @@ out: | |||
| 415 | /* | 415 | /* |
| 416 | * Test for presence of a conflicting lock. | 416 | * Test for presence of a conflicting lock. |
| 417 | */ | 417 | */ |
| 418 | u32 | 418 | __be32 |
| 419 | nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock, | 419 | nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock, |
| 420 | struct nlm_lock *conflock) | 420 | struct nlm_lock *conflock) |
| 421 | { | 421 | { |
| @@ -448,7 +448,7 @@ nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock, | |||
| 448 | * afterwards. In this case the block will still be there, and hence | 448 | * afterwards. In this case the block will still be there, and hence |
| 449 | * must be removed. | 449 | * must be removed. |
| 450 | */ | 450 | */ |
| 451 | u32 | 451 | __be32 |
| 452 | nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock) | 452 | nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock) |
| 453 | { | 453 | { |
| 454 | int error; | 454 | int error; |
| @@ -476,7 +476,7 @@ nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock) | |||
| 476 | * be in progress. | 476 | * be in progress. |
| 477 | * The calling procedure must check whether the file can be closed. | 477 | * The calling procedure must check whether the file can be closed. |
| 478 | */ | 478 | */ |
| 479 | u32 | 479 | __be32 |
| 480 | nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock) | 480 | nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock) |
| 481 | { | 481 | { |
| 482 | struct nlm_block *block; | 482 | struct nlm_block *block; |
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index 6a931f4ab75c..32e99a6e8dca 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c | |||
| @@ -22,8 +22,8 @@ | |||
| 22 | #define NLMDBG_FACILITY NLMDBG_CLIENT | 22 | #define NLMDBG_FACILITY NLMDBG_CLIENT |
| 23 | 23 | ||
| 24 | #ifdef CONFIG_LOCKD_V4 | 24 | #ifdef CONFIG_LOCKD_V4 |
| 25 | static u32 | 25 | static __be32 |
| 26 | cast_to_nlm(u32 status, u32 vers) | 26 | cast_to_nlm(__be32 status, u32 vers) |
| 27 | { | 27 | { |
| 28 | /* Note: status is assumed to be in network byte order !!! */ | 28 | /* Note: status is assumed to be in network byte order !!! */ |
| 29 | if (vers != 4){ | 29 | if (vers != 4){ |
| @@ -52,14 +52,14 @@ cast_to_nlm(u32 status, u32 vers) | |||
| 52 | /* | 52 | /* |
| 53 | * Obtain client and file from arguments | 53 | * Obtain client and file from arguments |
| 54 | */ | 54 | */ |
| 55 | static u32 | 55 | static __be32 |
| 56 | nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, | 56 | nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 57 | struct nlm_host **hostp, struct nlm_file **filp) | 57 | struct nlm_host **hostp, struct nlm_file **filp) |
| 58 | { | 58 | { |
| 59 | struct nlm_host *host = NULL; | 59 | struct nlm_host *host = NULL; |
| 60 | struct nlm_file *file = NULL; | 60 | struct nlm_file *file = NULL; |
| 61 | struct nlm_lock *lock = &argp->lock; | 61 | struct nlm_lock *lock = &argp->lock; |
| 62 | u32 error = 0; | 62 | __be32 error = 0; |
| 63 | 63 | ||
| 64 | /* nfsd callbacks must have been installed for this procedure */ | 64 | /* nfsd callbacks must have been installed for this procedure */ |
| 65 | if (!nlmsvc_ops) | 65 | if (!nlmsvc_ops) |
| @@ -96,7 +96,7 @@ no_locks: | |||
| 96 | /* | 96 | /* |
| 97 | * NULL: Test for presence of service | 97 | * NULL: Test for presence of service |
| 98 | */ | 98 | */ |
| 99 | static int | 99 | static __be32 |
| 100 | nlmsvc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | 100 | nlmsvc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) |
| 101 | { | 101 | { |
| 102 | dprintk("lockd: NULL called\n"); | 102 | dprintk("lockd: NULL called\n"); |
| @@ -106,7 +106,7 @@ nlmsvc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | |||
| 106 | /* | 106 | /* |
| 107 | * TEST: Check for conflicting lock | 107 | * TEST: Check for conflicting lock |
| 108 | */ | 108 | */ |
| 109 | static int | 109 | static __be32 |
| 110 | nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, | 110 | nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 111 | struct nlm_res *resp) | 111 | struct nlm_res *resp) |
| 112 | { | 112 | { |
| @@ -136,7 +136,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 136 | return rpc_success; | 136 | return rpc_success; |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | static int | 139 | static __be32 |
| 140 | nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | 140 | nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 141 | struct nlm_res *resp) | 141 | struct nlm_res *resp) |
| 142 | { | 142 | { |
| @@ -179,7 +179,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 179 | return rpc_success; | 179 | return rpc_success; |
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | static int | 182 | static __be32 |
| 183 | nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, | 183 | nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 184 | struct nlm_res *resp) | 184 | struct nlm_res *resp) |
| 185 | { | 185 | { |
| @@ -212,7 +212,7 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 212 | /* | 212 | /* |
| 213 | * UNLOCK: release a lock | 213 | * UNLOCK: release a lock |
| 214 | */ | 214 | */ |
| 215 | static int | 215 | static __be32 |
| 216 | nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, | 216 | nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 217 | struct nlm_res *resp) | 217 | struct nlm_res *resp) |
| 218 | { | 218 | { |
| @@ -246,7 +246,7 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 246 | * GRANTED: A server calls us to tell that a process' lock request | 246 | * GRANTED: A server calls us to tell that a process' lock request |
| 247 | * was granted | 247 | * was granted |
| 248 | */ | 248 | */ |
| 249 | static int | 249 | static __be32 |
| 250 | nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, | 250 | nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 251 | struct nlm_res *resp) | 251 | struct nlm_res *resp) |
| 252 | { | 252 | { |
| @@ -282,12 +282,12 @@ static const struct rpc_call_ops nlmsvc_callback_ops = { | |||
| 282 | * because we send the callback before the reply proper. I hope this | 282 | * because we send the callback before the reply proper. I hope this |
| 283 | * doesn't break any clients. | 283 | * doesn't break any clients. |
| 284 | */ | 284 | */ |
| 285 | static int nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp, | 285 | static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp, |
| 286 | int (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res *)) | 286 | __be32 (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res *)) |
| 287 | { | 287 | { |
| 288 | struct nlm_host *host; | 288 | struct nlm_host *host; |
| 289 | struct nlm_rqst *call; | 289 | struct nlm_rqst *call; |
| 290 | int stat; | 290 | __be32 stat; |
| 291 | 291 | ||
| 292 | host = nlmsvc_lookup_host(rqstp, | 292 | host = nlmsvc_lookup_host(rqstp, |
| 293 | argp->lock.caller, | 293 | argp->lock.caller, |
| @@ -311,28 +311,28 @@ static int nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *ar | |||
| 311 | return rpc_success; | 311 | return rpc_success; |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | static int nlmsvc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | 314 | static __be32 nlmsvc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 315 | void *resp) | 315 | void *resp) |
| 316 | { | 316 | { |
| 317 | dprintk("lockd: TEST_MSG called\n"); | 317 | dprintk("lockd: TEST_MSG called\n"); |
| 318 | return nlmsvc_callback(rqstp, NLMPROC_TEST_RES, argp, nlmsvc_proc_test); | 318 | return nlmsvc_callback(rqstp, NLMPROC_TEST_RES, argp, nlmsvc_proc_test); |
| 319 | } | 319 | } |
| 320 | 320 | ||
| 321 | static int nlmsvc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | 321 | static __be32 nlmsvc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 322 | void *resp) | 322 | void *resp) |
| 323 | { | 323 | { |
| 324 | dprintk("lockd: LOCK_MSG called\n"); | 324 | dprintk("lockd: LOCK_MSG called\n"); |
| 325 | return nlmsvc_callback(rqstp, NLMPROC_LOCK_RES, argp, nlmsvc_proc_lock); | 325 | return nlmsvc_callback(rqstp, NLMPROC_LOCK_RES, argp, nlmsvc_proc_lock); |
| 326 | } | 326 | } |
| 327 | 327 | ||
| 328 | static int nlmsvc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | 328 | static __be32 nlmsvc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 329 | void *resp) | 329 | void *resp) |
| 330 | { | 330 | { |
| 331 | dprintk("lockd: CANCEL_MSG called\n"); | 331 | dprintk("lockd: CANCEL_MSG called\n"); |
| 332 | return nlmsvc_callback(rqstp, NLMPROC_CANCEL_RES, argp, nlmsvc_proc_cancel); | 332 | return nlmsvc_callback(rqstp, NLMPROC_CANCEL_RES, argp, nlmsvc_proc_cancel); |
| 333 | } | 333 | } |
| 334 | 334 | ||
| 335 | static int | 335 | static __be32 |
| 336 | nlmsvc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | 336 | nlmsvc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 337 | void *resp) | 337 | void *resp) |
| 338 | { | 338 | { |
| @@ -340,7 +340,7 @@ nlmsvc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 340 | return nlmsvc_callback(rqstp, NLMPROC_UNLOCK_RES, argp, nlmsvc_proc_unlock); | 340 | return nlmsvc_callback(rqstp, NLMPROC_UNLOCK_RES, argp, nlmsvc_proc_unlock); |
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | static int | 343 | static __be32 |
| 344 | nlmsvc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | 344 | nlmsvc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 345 | void *resp) | 345 | void *resp) |
| 346 | { | 346 | { |
| @@ -351,7 +351,7 @@ nlmsvc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 351 | /* | 351 | /* |
| 352 | * SHARE: create a DOS share or alter existing share. | 352 | * SHARE: create a DOS share or alter existing share. |
| 353 | */ | 353 | */ |
| 354 | static int | 354 | static __be32 |
| 355 | nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, | 355 | nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 356 | struct nlm_res *resp) | 356 | struct nlm_res *resp) |
| 357 | { | 357 | { |
| @@ -384,7 +384,7 @@ nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 384 | /* | 384 | /* |
| 385 | * UNSHARE: Release a DOS share. | 385 | * UNSHARE: Release a DOS share. |
| 386 | */ | 386 | */ |
| 387 | static int | 387 | static __be32 |
| 388 | nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, | 388 | nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 389 | struct nlm_res *resp) | 389 | struct nlm_res *resp) |
| 390 | { | 390 | { |
| @@ -417,7 +417,7 @@ nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 417 | /* | 417 | /* |
| 418 | * NM_LOCK: Create an unmonitored lock | 418 | * NM_LOCK: Create an unmonitored lock |
| 419 | */ | 419 | */ |
| 420 | static int | 420 | static __be32 |
| 421 | nlmsvc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | 421 | nlmsvc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 422 | struct nlm_res *resp) | 422 | struct nlm_res *resp) |
| 423 | { | 423 | { |
| @@ -430,7 +430,7 @@ nlmsvc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 430 | /* | 430 | /* |
| 431 | * FREE_ALL: Release all locks and shares held by client | 431 | * FREE_ALL: Release all locks and shares held by client |
| 432 | */ | 432 | */ |
| 433 | static int | 433 | static __be32 |
| 434 | nlmsvc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, | 434 | nlmsvc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, |
| 435 | void *resp) | 435 | void *resp) |
| 436 | { | 436 | { |
| @@ -448,7 +448,7 @@ nlmsvc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 448 | /* | 448 | /* |
| 449 | * SM_NOTIFY: private callback from statd (not part of official NLM proto) | 449 | * SM_NOTIFY: private callback from statd (not part of official NLM proto) |
| 450 | */ | 450 | */ |
| 451 | static int | 451 | static __be32 |
| 452 | nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, | 452 | nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, |
| 453 | void *resp) | 453 | void *resp) |
| 454 | { | 454 | { |
| @@ -477,7 +477,7 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, | |||
| 477 | /* | 477 | /* |
| 478 | * client sent a GRANTED_RES, let's remove the associated block | 478 | * client sent a GRANTED_RES, let's remove the associated block |
| 479 | */ | 479 | */ |
| 480 | static int | 480 | static __be32 |
| 481 | nlmsvc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp, | 481 | nlmsvc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp, |
| 482 | void *resp) | 482 | void *resp) |
| 483 | { | 483 | { |
diff --git a/fs/lockd/svcshare.c b/fs/lockd/svcshare.c index b9926ce8782e..6220dc2a3f2c 100644 --- a/fs/lockd/svcshare.c +++ b/fs/lockd/svcshare.c | |||
| @@ -23,7 +23,7 @@ nlm_cmp_owner(struct nlm_share *share, struct xdr_netobj *oh) | |||
| 23 | && !memcmp(share->s_owner.data, oh->data, oh->len); | 23 | && !memcmp(share->s_owner.data, oh->data, oh->len); |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | u32 | 26 | __be32 |
| 27 | nlmsvc_share_file(struct nlm_host *host, struct nlm_file *file, | 27 | nlmsvc_share_file(struct nlm_host *host, struct nlm_file *file, |
| 28 | struct nlm_args *argp) | 28 | struct nlm_args *argp) |
| 29 | { | 29 | { |
| @@ -64,7 +64,7 @@ update: | |||
| 64 | /* | 64 | /* |
| 65 | * Delete a share. | 65 | * Delete a share. |
| 66 | */ | 66 | */ |
| 67 | u32 | 67 | __be32 |
| 68 | nlmsvc_unshare_file(struct nlm_host *host, struct nlm_file *file, | 68 | nlmsvc_unshare_file(struct nlm_host *host, struct nlm_file *file, |
| 69 | struct nlm_args *argp) | 69 | struct nlm_args *argp) |
| 70 | { | 70 | { |
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c index 7dac96e6c82c..e83024e16042 100644 --- a/fs/lockd/svcsubs.c +++ b/fs/lockd/svcsubs.c | |||
| @@ -78,14 +78,14 @@ static inline unsigned int file_hash(struct nfs_fh *f) | |||
| 78 | * This is not quite right, but for now, we assume the client performs | 78 | * This is not quite right, but for now, we assume the client performs |
| 79 | * the proper R/W checking. | 79 | * the proper R/W checking. |
| 80 | */ | 80 | */ |
| 81 | u32 | 81 | __be32 |
| 82 | nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result, | 82 | nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result, |
| 83 | struct nfs_fh *f) | 83 | struct nfs_fh *f) |
| 84 | { | 84 | { |
| 85 | struct hlist_node *pos; | 85 | struct hlist_node *pos; |
| 86 | struct nlm_file *file; | 86 | struct nlm_file *file; |
| 87 | unsigned int hash; | 87 | unsigned int hash; |
| 88 | u32 nfserr; | 88 | __be32 nfserr; |
| 89 | 89 | ||
| 90 | nlm_debug_print_fh("nlm_file_lookup", f); | 90 | nlm_debug_print_fh("nlm_file_lookup", f); |
| 91 | 91 | ||
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index 61c46facf257..b7c949256e5a 100644 --- a/fs/lockd/xdr.c +++ b/fs/lockd/xdr.c | |||
| @@ -43,7 +43,7 @@ loff_t_to_s32(loff_t offset) | |||
| 43 | /* | 43 | /* |
| 44 | * XDR functions for basic NLM types | 44 | * XDR functions for basic NLM types |
| 45 | */ | 45 | */ |
| 46 | static u32 *nlm_decode_cookie(u32 *p, struct nlm_cookie *c) | 46 | static __be32 *nlm_decode_cookie(__be32 *p, struct nlm_cookie *c) |
| 47 | { | 47 | { |
| 48 | unsigned int len; | 48 | unsigned int len; |
| 49 | 49 | ||
| @@ -69,8 +69,8 @@ static u32 *nlm_decode_cookie(u32 *p, struct nlm_cookie *c) | |||
| 69 | return p; | 69 | return p; |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | static inline u32 * | 72 | static inline __be32 * |
| 73 | nlm_encode_cookie(u32 *p, struct nlm_cookie *c) | 73 | nlm_encode_cookie(__be32 *p, struct nlm_cookie *c) |
| 74 | { | 74 | { |
| 75 | *p++ = htonl(c->len); | 75 | *p++ = htonl(c->len); |
| 76 | memcpy(p, c->data, c->len); | 76 | memcpy(p, c->data, c->len); |
| @@ -78,8 +78,8 @@ nlm_encode_cookie(u32 *p, struct nlm_cookie *c) | |||
| 78 | return p; | 78 | return p; |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | static u32 * | 81 | static __be32 * |
| 82 | nlm_decode_fh(u32 *p, struct nfs_fh *f) | 82 | nlm_decode_fh(__be32 *p, struct nfs_fh *f) |
| 83 | { | 83 | { |
| 84 | unsigned int len; | 84 | unsigned int len; |
| 85 | 85 | ||
| @@ -95,8 +95,8 @@ nlm_decode_fh(u32 *p, struct nfs_fh *f) | |||
| 95 | return p + XDR_QUADLEN(NFS2_FHSIZE); | 95 | return p + XDR_QUADLEN(NFS2_FHSIZE); |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | static inline u32 * | 98 | static inline __be32 * |
| 99 | nlm_encode_fh(u32 *p, struct nfs_fh *f) | 99 | nlm_encode_fh(__be32 *p, struct nfs_fh *f) |
| 100 | { | 100 | { |
| 101 | *p++ = htonl(NFS2_FHSIZE); | 101 | *p++ = htonl(NFS2_FHSIZE); |
| 102 | memcpy(p, f->data, NFS2_FHSIZE); | 102 | memcpy(p, f->data, NFS2_FHSIZE); |
| @@ -106,20 +106,20 @@ nlm_encode_fh(u32 *p, struct nfs_fh *f) | |||
| 106 | /* | 106 | /* |
| 107 | * Encode and decode owner handle | 107 | * Encode and decode owner handle |
| 108 | */ | 108 | */ |
| 109 | static inline u32 * | 109 | static inline __be32 * |
| 110 | nlm_decode_oh(u32 *p, struct xdr_netobj *oh) | 110 | nlm_decode_oh(__be32 *p, struct xdr_netobj *oh) |
| 111 | { | 111 | { |
| 112 | return xdr_decode_netobj(p, oh); | 112 | return xdr_decode_netobj(p, oh); |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | static inline u32 * | 115 | static inline __be32 * |
| 116 | nlm_encode_oh(u32 *p, struct xdr_netobj *oh) | 116 | nlm_encode_oh(__be32 *p, struct xdr_netobj *oh) |
| 117 | { | 117 | { |
| 118 | return xdr_encode_netobj(p, oh); | 118 | return xdr_encode_netobj(p, oh); |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | static u32 * | 121 | static __be32 * |
| 122 | nlm_decode_lock(u32 *p, struct nlm_lock *lock) | 122 | nlm_decode_lock(__be32 *p, struct nlm_lock *lock) |
| 123 | { | 123 | { |
| 124 | struct file_lock *fl = &lock->fl; | 124 | struct file_lock *fl = &lock->fl; |
| 125 | s32 start, len, end; | 125 | s32 start, len, end; |
| @@ -153,8 +153,8 @@ nlm_decode_lock(u32 *p, struct nlm_lock *lock) | |||
| 153 | /* | 153 | /* |
| 154 | * Encode a lock as part of an NLM call | 154 | * Encode a lock as part of an NLM call |
| 155 | */ | 155 | */ |
| 156 | static u32 * | 156 | static __be32 * |
| 157 | nlm_encode_lock(u32 *p, struct nlm_lock *lock) | 157 | nlm_encode_lock(__be32 *p, struct nlm_lock *lock) |
| 158 | { | 158 | { |
| 159 | struct file_lock *fl = &lock->fl; | 159 | struct file_lock *fl = &lock->fl; |
| 160 | __s32 start, len; | 160 | __s32 start, len; |
| @@ -184,8 +184,8 @@ nlm_encode_lock(u32 *p, struct nlm_lock *lock) | |||
| 184 | /* | 184 | /* |
| 185 | * Encode result of a TEST/TEST_MSG call | 185 | * Encode result of a TEST/TEST_MSG call |
| 186 | */ | 186 | */ |
| 187 | static u32 * | 187 | static __be32 * |
| 188 | nlm_encode_testres(u32 *p, struct nlm_res *resp) | 188 | nlm_encode_testres(__be32 *p, struct nlm_res *resp) |
| 189 | { | 189 | { |
| 190 | s32 start, len; | 190 | s32 start, len; |
| 191 | 191 | ||
| @@ -221,7 +221,7 @@ nlm_encode_testres(u32 *p, struct nlm_res *resp) | |||
| 221 | * First, the server side XDR functions | 221 | * First, the server side XDR functions |
| 222 | */ | 222 | */ |
| 223 | int | 223 | int |
| 224 | nlmsvc_decode_testargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | 224 | nlmsvc_decode_testargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) |
| 225 | { | 225 | { |
| 226 | u32 exclusive; | 226 | u32 exclusive; |
| 227 | 227 | ||
| @@ -238,7 +238,7 @@ nlmsvc_decode_testargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | |||
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | int | 240 | int |
| 241 | nlmsvc_encode_testres(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | 241 | nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) |
| 242 | { | 242 | { |
| 243 | if (!(p = nlm_encode_testres(p, resp))) | 243 | if (!(p = nlm_encode_testres(p, resp))) |
| 244 | return 0; | 244 | return 0; |
| @@ -246,7 +246,7 @@ nlmsvc_encode_testres(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | |||
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | int | 248 | int |
| 249 | nlmsvc_decode_lockargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | 249 | nlmsvc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) |
| 250 | { | 250 | { |
| 251 | u32 exclusive; | 251 | u32 exclusive; |
| 252 | 252 | ||
| @@ -266,7 +266,7 @@ nlmsvc_decode_lockargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | |||
| 266 | } | 266 | } |
| 267 | 267 | ||
| 268 | int | 268 | int |
| 269 | nlmsvc_decode_cancargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | 269 | nlmsvc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) |
| 270 | { | 270 | { |
| 271 | u32 exclusive; | 271 | u32 exclusive; |
| 272 | 272 | ||
| @@ -282,7 +282,7 @@ nlmsvc_decode_cancargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | |||
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | int | 284 | int |
| 285 | nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | 285 | nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) |
| 286 | { | 286 | { |
| 287 | if (!(p = nlm_decode_cookie(p, &argp->cookie)) | 287 | if (!(p = nlm_decode_cookie(p, &argp->cookie)) |
| 288 | || !(p = nlm_decode_lock(p, &argp->lock))) | 288 | || !(p = nlm_decode_lock(p, &argp->lock))) |
| @@ -292,7 +292,7 @@ nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | |||
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | int | 294 | int |
| 295 | nlmsvc_decode_shareargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | 295 | nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) |
| 296 | { | 296 | { |
| 297 | struct nlm_lock *lock = &argp->lock; | 297 | struct nlm_lock *lock = &argp->lock; |
| 298 | 298 | ||
| @@ -313,7 +313,7 @@ nlmsvc_decode_shareargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | |||
| 313 | } | 313 | } |
| 314 | 314 | ||
| 315 | int | 315 | int |
| 316 | nlmsvc_encode_shareres(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | 316 | nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) |
| 317 | { | 317 | { |
| 318 | if (!(p = nlm_encode_cookie(p, &resp->cookie))) | 318 | if (!(p = nlm_encode_cookie(p, &resp->cookie))) |
| 319 | return 0; | 319 | return 0; |
| @@ -323,7 +323,7 @@ nlmsvc_encode_shareres(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | |||
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | int | 325 | int |
| 326 | nlmsvc_encode_res(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | 326 | nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) |
| 327 | { | 327 | { |
| 328 | if (!(p = nlm_encode_cookie(p, &resp->cookie))) | 328 | if (!(p = nlm_encode_cookie(p, &resp->cookie))) |
| 329 | return 0; | 329 | return 0; |
| @@ -332,7 +332,7 @@ nlmsvc_encode_res(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | |||
| 332 | } | 332 | } |
| 333 | 333 | ||
| 334 | int | 334 | int |
| 335 | nlmsvc_decode_notify(struct svc_rqst *rqstp, u32 *p, struct nlm_args *argp) | 335 | nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p, struct nlm_args *argp) |
| 336 | { | 336 | { |
| 337 | struct nlm_lock *lock = &argp->lock; | 337 | struct nlm_lock *lock = &argp->lock; |
| 338 | 338 | ||
| @@ -344,7 +344,7 @@ nlmsvc_decode_notify(struct svc_rqst *rqstp, u32 *p, struct nlm_args *argp) | |||
| 344 | } | 344 | } |
| 345 | 345 | ||
| 346 | int | 346 | int |
| 347 | nlmsvc_decode_reboot(struct svc_rqst *rqstp, u32 *p, struct nlm_reboot *argp) | 347 | nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p, struct nlm_reboot *argp) |
| 348 | { | 348 | { |
| 349 | if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN))) | 349 | if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN))) |
| 350 | return 0; | 350 | return 0; |
| @@ -357,7 +357,7 @@ nlmsvc_decode_reboot(struct svc_rqst *rqstp, u32 *p, struct nlm_reboot *argp) | |||
| 357 | } | 357 | } |
| 358 | 358 | ||
| 359 | int | 359 | int |
| 360 | nlmsvc_decode_res(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | 360 | nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) |
| 361 | { | 361 | { |
| 362 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) | 362 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) |
| 363 | return 0; | 363 | return 0; |
| @@ -366,13 +366,13 @@ nlmsvc_decode_res(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | |||
| 366 | } | 366 | } |
| 367 | 367 | ||
| 368 | int | 368 | int |
| 369 | nlmsvc_decode_void(struct svc_rqst *rqstp, u32 *p, void *dummy) | 369 | nlmsvc_decode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
| 370 | { | 370 | { |
| 371 | return xdr_argsize_check(rqstp, p); | 371 | return xdr_argsize_check(rqstp, p); |
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | int | 374 | int |
| 375 | nlmsvc_encode_void(struct svc_rqst *rqstp, u32 *p, void *dummy) | 375 | nlmsvc_encode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
| 376 | { | 376 | { |
| 377 | return xdr_ressize_check(rqstp, p); | 377 | return xdr_ressize_check(rqstp, p); |
| 378 | } | 378 | } |
| @@ -389,7 +389,7 @@ nlmclt_decode_void(struct rpc_rqst *req, u32 *p, void *ptr) | |||
| 389 | #endif | 389 | #endif |
| 390 | 390 | ||
| 391 | static int | 391 | static int |
| 392 | nlmclt_encode_testargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | 392 | nlmclt_encode_testargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) |
| 393 | { | 393 | { |
| 394 | struct nlm_lock *lock = &argp->lock; | 394 | struct nlm_lock *lock = &argp->lock; |
| 395 | 395 | ||
| @@ -403,7 +403,7 @@ nlmclt_encode_testargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | |||
| 403 | } | 403 | } |
| 404 | 404 | ||
| 405 | static int | 405 | static int |
| 406 | nlmclt_decode_testres(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | 406 | nlmclt_decode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) |
| 407 | { | 407 | { |
| 408 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) | 408 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) |
| 409 | return -EIO; | 409 | return -EIO; |
| @@ -438,7 +438,7 @@ nlmclt_decode_testres(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | |||
| 438 | 438 | ||
| 439 | 439 | ||
| 440 | static int | 440 | static int |
| 441 | nlmclt_encode_lockargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | 441 | nlmclt_encode_lockargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) |
| 442 | { | 442 | { |
| 443 | struct nlm_lock *lock = &argp->lock; | 443 | struct nlm_lock *lock = &argp->lock; |
| 444 | 444 | ||
| @@ -455,7 +455,7 @@ nlmclt_encode_lockargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | |||
| 455 | } | 455 | } |
| 456 | 456 | ||
| 457 | static int | 457 | static int |
| 458 | nlmclt_encode_cancargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | 458 | nlmclt_encode_cancargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) |
| 459 | { | 459 | { |
| 460 | struct nlm_lock *lock = &argp->lock; | 460 | struct nlm_lock *lock = &argp->lock; |
| 461 | 461 | ||
| @@ -470,7 +470,7 @@ nlmclt_encode_cancargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | |||
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | static int | 472 | static int |
| 473 | nlmclt_encode_unlockargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | 473 | nlmclt_encode_unlockargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) |
| 474 | { | 474 | { |
| 475 | struct nlm_lock *lock = &argp->lock; | 475 | struct nlm_lock *lock = &argp->lock; |
| 476 | 476 | ||
| @@ -483,7 +483,7 @@ nlmclt_encode_unlockargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | |||
| 483 | } | 483 | } |
| 484 | 484 | ||
| 485 | static int | 485 | static int |
| 486 | nlmclt_encode_res(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | 486 | nlmclt_encode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) |
| 487 | { | 487 | { |
| 488 | if (!(p = nlm_encode_cookie(p, &resp->cookie))) | 488 | if (!(p = nlm_encode_cookie(p, &resp->cookie))) |
| 489 | return -EIO; | 489 | return -EIO; |
| @@ -493,7 +493,7 @@ nlmclt_encode_res(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | |||
| 493 | } | 493 | } |
| 494 | 494 | ||
| 495 | static int | 495 | static int |
| 496 | nlmclt_encode_testres(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | 496 | nlmclt_encode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) |
| 497 | { | 497 | { |
| 498 | if (!(p = nlm_encode_testres(p, resp))) | 498 | if (!(p = nlm_encode_testres(p, resp))) |
| 499 | return -EIO; | 499 | return -EIO; |
| @@ -502,7 +502,7 @@ nlmclt_encode_testres(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | |||
| 502 | } | 502 | } |
| 503 | 503 | ||
| 504 | static int | 504 | static int |
| 505 | nlmclt_decode_res(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | 505 | nlmclt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) |
| 506 | { | 506 | { |
| 507 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) | 507 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) |
| 508 | return -EIO; | 508 | return -EIO; |
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c index 36eb175ec335..f4c0b2b9f75a 100644 --- a/fs/lockd/xdr4.c +++ b/fs/lockd/xdr4.c | |||
| @@ -44,8 +44,8 @@ loff_t_to_s64(loff_t offset) | |||
| 44 | /* | 44 | /* |
| 45 | * XDR functions for basic NLM types | 45 | * XDR functions for basic NLM types |
| 46 | */ | 46 | */ |
| 47 | static u32 * | 47 | static __be32 * |
| 48 | nlm4_decode_cookie(u32 *p, struct nlm_cookie *c) | 48 | nlm4_decode_cookie(__be32 *p, struct nlm_cookie *c) |
| 49 | { | 49 | { |
| 50 | unsigned int len; | 50 | unsigned int len; |
| 51 | 51 | ||
| @@ -71,8 +71,8 @@ nlm4_decode_cookie(u32 *p, struct nlm_cookie *c) | |||
| 71 | return p; | 71 | return p; |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | static u32 * | 74 | static __be32 * |
| 75 | nlm4_encode_cookie(u32 *p, struct nlm_cookie *c) | 75 | nlm4_encode_cookie(__be32 *p, struct nlm_cookie *c) |
| 76 | { | 76 | { |
| 77 | *p++ = htonl(c->len); | 77 | *p++ = htonl(c->len); |
| 78 | memcpy(p, c->data, c->len); | 78 | memcpy(p, c->data, c->len); |
| @@ -80,8 +80,8 @@ nlm4_encode_cookie(u32 *p, struct nlm_cookie *c) | |||
| 80 | return p; | 80 | return p; |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | static u32 * | 83 | static __be32 * |
| 84 | nlm4_decode_fh(u32 *p, struct nfs_fh *f) | 84 | nlm4_decode_fh(__be32 *p, struct nfs_fh *f) |
| 85 | { | 85 | { |
| 86 | memset(f->data, 0, sizeof(f->data)); | 86 | memset(f->data, 0, sizeof(f->data)); |
| 87 | f->size = ntohl(*p++); | 87 | f->size = ntohl(*p++); |
| @@ -95,8 +95,8 @@ nlm4_decode_fh(u32 *p, struct nfs_fh *f) | |||
| 95 | return p + XDR_QUADLEN(f->size); | 95 | return p + XDR_QUADLEN(f->size); |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | static u32 * | 98 | static __be32 * |
| 99 | nlm4_encode_fh(u32 *p, struct nfs_fh *f) | 99 | nlm4_encode_fh(__be32 *p, struct nfs_fh *f) |
| 100 | { | 100 | { |
| 101 | *p++ = htonl(f->size); | 101 | *p++ = htonl(f->size); |
| 102 | if (f->size) p[XDR_QUADLEN(f->size)-1] = 0; /* don't leak anything */ | 102 | if (f->size) p[XDR_QUADLEN(f->size)-1] = 0; /* don't leak anything */ |
| @@ -107,20 +107,20 @@ nlm4_encode_fh(u32 *p, struct nfs_fh *f) | |||
| 107 | /* | 107 | /* |
| 108 | * Encode and decode owner handle | 108 | * Encode and decode owner handle |
| 109 | */ | 109 | */ |
| 110 | static u32 * | 110 | static __be32 * |
| 111 | nlm4_decode_oh(u32 *p, struct xdr_netobj *oh) | 111 | nlm4_decode_oh(__be32 *p, struct xdr_netobj *oh) |
| 112 | { | 112 | { |
| 113 | return xdr_decode_netobj(p, oh); | 113 | return xdr_decode_netobj(p, oh); |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | static u32 * | 116 | static __be32 * |
| 117 | nlm4_encode_oh(u32 *p, struct xdr_netobj *oh) | 117 | nlm4_encode_oh(__be32 *p, struct xdr_netobj *oh) |
| 118 | { | 118 | { |
| 119 | return xdr_encode_netobj(p, oh); | 119 | return xdr_encode_netobj(p, oh); |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | static u32 * | 122 | static __be32 * |
| 123 | nlm4_decode_lock(u32 *p, struct nlm_lock *lock) | 123 | nlm4_decode_lock(__be32 *p, struct nlm_lock *lock) |
| 124 | { | 124 | { |
| 125 | struct file_lock *fl = &lock->fl; | 125 | struct file_lock *fl = &lock->fl; |
| 126 | __s64 len, start, end; | 126 | __s64 len, start, end; |
| @@ -153,8 +153,8 @@ nlm4_decode_lock(u32 *p, struct nlm_lock *lock) | |||
| 153 | /* | 153 | /* |
| 154 | * Encode a lock as part of an NLM call | 154 | * Encode a lock as part of an NLM call |
| 155 | */ | 155 | */ |
| 156 | static u32 * | 156 | static __be32 * |
| 157 | nlm4_encode_lock(u32 *p, struct nlm_lock *lock) | 157 | nlm4_encode_lock(__be32 *p, struct nlm_lock *lock) |
| 158 | { | 158 | { |
| 159 | struct file_lock *fl = &lock->fl; | 159 | struct file_lock *fl = &lock->fl; |
| 160 | __s64 start, len; | 160 | __s64 start, len; |
| @@ -185,8 +185,8 @@ nlm4_encode_lock(u32 *p, struct nlm_lock *lock) | |||
| 185 | /* | 185 | /* |
| 186 | * Encode result of a TEST/TEST_MSG call | 186 | * Encode result of a TEST/TEST_MSG call |
| 187 | */ | 187 | */ |
| 188 | static u32 * | 188 | static __be32 * |
| 189 | nlm4_encode_testres(u32 *p, struct nlm_res *resp) | 189 | nlm4_encode_testres(__be32 *p, struct nlm_res *resp) |
| 190 | { | 190 | { |
| 191 | s64 start, len; | 191 | s64 start, len; |
| 192 | 192 | ||
| @@ -227,7 +227,7 @@ nlm4_encode_testres(u32 *p, struct nlm_res *resp) | |||
| 227 | * First, the server side XDR functions | 227 | * First, the server side XDR functions |
| 228 | */ | 228 | */ |
| 229 | int | 229 | int |
| 230 | nlm4svc_decode_testargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | 230 | nlm4svc_decode_testargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) |
| 231 | { | 231 | { |
| 232 | u32 exclusive; | 232 | u32 exclusive; |
| 233 | 233 | ||
| @@ -244,7 +244,7 @@ nlm4svc_decode_testargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | |||
| 244 | } | 244 | } |
| 245 | 245 | ||
| 246 | int | 246 | int |
| 247 | nlm4svc_encode_testres(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | 247 | nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) |
| 248 | { | 248 | { |
| 249 | if (!(p = nlm4_encode_testres(p, resp))) | 249 | if (!(p = nlm4_encode_testres(p, resp))) |
| 250 | return 0; | 250 | return 0; |
| @@ -252,7 +252,7 @@ nlm4svc_encode_testres(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | |||
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | int | 254 | int |
| 255 | nlm4svc_decode_lockargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | 255 | nlm4svc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) |
| 256 | { | 256 | { |
| 257 | u32 exclusive; | 257 | u32 exclusive; |
| 258 | 258 | ||
| @@ -272,7 +272,7 @@ nlm4svc_decode_lockargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | |||
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | int | 274 | int |
| 275 | nlm4svc_decode_cancargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | 275 | nlm4svc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) |
| 276 | { | 276 | { |
| 277 | u32 exclusive; | 277 | u32 exclusive; |
| 278 | 278 | ||
| @@ -288,7 +288,7 @@ nlm4svc_decode_cancargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | |||
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | int | 290 | int |
| 291 | nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | 291 | nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) |
| 292 | { | 292 | { |
| 293 | if (!(p = nlm4_decode_cookie(p, &argp->cookie)) | 293 | if (!(p = nlm4_decode_cookie(p, &argp->cookie)) |
| 294 | || !(p = nlm4_decode_lock(p, &argp->lock))) | 294 | || !(p = nlm4_decode_lock(p, &argp->lock))) |
| @@ -298,7 +298,7 @@ nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | |||
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | int | 300 | int |
| 301 | nlm4svc_decode_shareargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | 301 | nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) |
| 302 | { | 302 | { |
| 303 | struct nlm_lock *lock = &argp->lock; | 303 | struct nlm_lock *lock = &argp->lock; |
| 304 | 304 | ||
| @@ -319,7 +319,7 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, u32 *p, nlm_args *argp) | |||
| 319 | } | 319 | } |
| 320 | 320 | ||
| 321 | int | 321 | int |
| 322 | nlm4svc_encode_shareres(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | 322 | nlm4svc_encode_shareres(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) |
| 323 | { | 323 | { |
| 324 | if (!(p = nlm4_encode_cookie(p, &resp->cookie))) | 324 | if (!(p = nlm4_encode_cookie(p, &resp->cookie))) |
| 325 | return 0; | 325 | return 0; |
| @@ -329,7 +329,7 @@ nlm4svc_encode_shareres(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | |||
| 329 | } | 329 | } |
| 330 | 330 | ||
| 331 | int | 331 | int |
| 332 | nlm4svc_encode_res(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | 332 | nlm4svc_encode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) |
| 333 | { | 333 | { |
| 334 | if (!(p = nlm4_encode_cookie(p, &resp->cookie))) | 334 | if (!(p = nlm4_encode_cookie(p, &resp->cookie))) |
| 335 | return 0; | 335 | return 0; |
| @@ -338,7 +338,7 @@ nlm4svc_encode_res(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | |||
| 338 | } | 338 | } |
| 339 | 339 | ||
| 340 | int | 340 | int |
| 341 | nlm4svc_decode_notify(struct svc_rqst *rqstp, u32 *p, struct nlm_args *argp) | 341 | nlm4svc_decode_notify(struct svc_rqst *rqstp, __be32 *p, struct nlm_args *argp) |
| 342 | { | 342 | { |
| 343 | struct nlm_lock *lock = &argp->lock; | 343 | struct nlm_lock *lock = &argp->lock; |
| 344 | 344 | ||
| @@ -350,7 +350,7 @@ nlm4svc_decode_notify(struct svc_rqst *rqstp, u32 *p, struct nlm_args *argp) | |||
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | int | 352 | int |
| 353 | nlm4svc_decode_reboot(struct svc_rqst *rqstp, u32 *p, struct nlm_reboot *argp) | 353 | nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p, struct nlm_reboot *argp) |
| 354 | { | 354 | { |
| 355 | if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN))) | 355 | if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN))) |
| 356 | return 0; | 356 | return 0; |
| @@ -363,7 +363,7 @@ nlm4svc_decode_reboot(struct svc_rqst *rqstp, u32 *p, struct nlm_reboot *argp) | |||
| 363 | } | 363 | } |
| 364 | 364 | ||
| 365 | int | 365 | int |
| 366 | nlm4svc_decode_res(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | 366 | nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) |
| 367 | { | 367 | { |
| 368 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) | 368 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) |
| 369 | return 0; | 369 | return 0; |
| @@ -372,13 +372,13 @@ nlm4svc_decode_res(struct svc_rqst *rqstp, u32 *p, struct nlm_res *resp) | |||
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | int | 374 | int |
| 375 | nlm4svc_decode_void(struct svc_rqst *rqstp, u32 *p, void *dummy) | 375 | nlm4svc_decode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
| 376 | { | 376 | { |
| 377 | return xdr_argsize_check(rqstp, p); | 377 | return xdr_argsize_check(rqstp, p); |
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | int | 380 | int |
| 381 | nlm4svc_encode_void(struct svc_rqst *rqstp, u32 *p, void *dummy) | 381 | nlm4svc_encode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
| 382 | { | 382 | { |
| 383 | return xdr_ressize_check(rqstp, p); | 383 | return xdr_ressize_check(rqstp, p); |
| 384 | } | 384 | } |
| @@ -388,14 +388,14 @@ nlm4svc_encode_void(struct svc_rqst *rqstp, u32 *p, void *dummy) | |||
| 388 | */ | 388 | */ |
| 389 | #ifdef NLMCLNT_SUPPORT_SHARES | 389 | #ifdef NLMCLNT_SUPPORT_SHARES |
| 390 | static int | 390 | static int |
| 391 | nlm4clt_decode_void(struct rpc_rqst *req, u32 *p, void *ptr) | 391 | nlm4clt_decode_void(struct rpc_rqst *req, __be32 *p, void *ptr) |
| 392 | { | 392 | { |
| 393 | return 0; | 393 | return 0; |
| 394 | } | 394 | } |
| 395 | #endif | 395 | #endif |
| 396 | 396 | ||
| 397 | static int | 397 | static int |
| 398 | nlm4clt_encode_testargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | 398 | nlm4clt_encode_testargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) |
| 399 | { | 399 | { |
| 400 | struct nlm_lock *lock = &argp->lock; | 400 | struct nlm_lock *lock = &argp->lock; |
| 401 | 401 | ||
| @@ -409,7 +409,7 @@ nlm4clt_encode_testargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | |||
| 409 | } | 409 | } |
| 410 | 410 | ||
| 411 | static int | 411 | static int |
| 412 | nlm4clt_decode_testres(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | 412 | nlm4clt_decode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) |
| 413 | { | 413 | { |
| 414 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) | 414 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) |
| 415 | return -EIO; | 415 | return -EIO; |
| @@ -444,7 +444,7 @@ nlm4clt_decode_testres(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | |||
| 444 | 444 | ||
| 445 | 445 | ||
| 446 | static int | 446 | static int |
| 447 | nlm4clt_encode_lockargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | 447 | nlm4clt_encode_lockargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) |
| 448 | { | 448 | { |
| 449 | struct nlm_lock *lock = &argp->lock; | 449 | struct nlm_lock *lock = &argp->lock; |
| 450 | 450 | ||
| @@ -461,7 +461,7 @@ nlm4clt_encode_lockargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | |||
| 461 | } | 461 | } |
| 462 | 462 | ||
| 463 | static int | 463 | static int |
| 464 | nlm4clt_encode_cancargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | 464 | nlm4clt_encode_cancargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) |
| 465 | { | 465 | { |
| 466 | struct nlm_lock *lock = &argp->lock; | 466 | struct nlm_lock *lock = &argp->lock; |
| 467 | 467 | ||
| @@ -476,7 +476,7 @@ nlm4clt_encode_cancargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | |||
| 476 | } | 476 | } |
| 477 | 477 | ||
| 478 | static int | 478 | static int |
| 479 | nlm4clt_encode_unlockargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | 479 | nlm4clt_encode_unlockargs(struct rpc_rqst *req, __be32 *p, nlm_args *argp) |
| 480 | { | 480 | { |
| 481 | struct nlm_lock *lock = &argp->lock; | 481 | struct nlm_lock *lock = &argp->lock; |
| 482 | 482 | ||
| @@ -489,7 +489,7 @@ nlm4clt_encode_unlockargs(struct rpc_rqst *req, u32 *p, nlm_args *argp) | |||
| 489 | } | 489 | } |
| 490 | 490 | ||
| 491 | static int | 491 | static int |
| 492 | nlm4clt_encode_res(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | 492 | nlm4clt_encode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) |
| 493 | { | 493 | { |
| 494 | if (!(p = nlm4_encode_cookie(p, &resp->cookie))) | 494 | if (!(p = nlm4_encode_cookie(p, &resp->cookie))) |
| 495 | return -EIO; | 495 | return -EIO; |
| @@ -499,7 +499,7 @@ nlm4clt_encode_res(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | |||
| 499 | } | 499 | } |
| 500 | 500 | ||
| 501 | static int | 501 | static int |
| 502 | nlm4clt_encode_testres(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | 502 | nlm4clt_encode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) |
| 503 | { | 503 | { |
| 504 | if (!(p = nlm4_encode_testres(p, resp))) | 504 | if (!(p = nlm4_encode_testres(p, resp))) |
| 505 | return -EIO; | 505 | return -EIO; |
| @@ -508,7 +508,7 @@ nlm4clt_encode_testres(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | |||
| 508 | } | 508 | } |
| 509 | 509 | ||
| 510 | static int | 510 | static int |
| 511 | nlm4clt_decode_res(struct rpc_rqst *req, u32 *p, struct nlm_res *resp) | 511 | nlm4clt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) |
| 512 | { | 512 | { |
| 513 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) | 513 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) |
| 514 | return -EIO; | 514 | return -EIO; |
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h index 5676163d26e8..db3d7919c601 100644 --- a/fs/nfs/callback.h +++ b/fs/nfs/callback.h | |||
| @@ -31,10 +31,10 @@ struct cb_compound_hdr_arg { | |||
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | struct cb_compound_hdr_res { | 33 | struct cb_compound_hdr_res { |
| 34 | uint32_t *status; | 34 | __be32 *status; |
| 35 | int taglen; | 35 | int taglen; |
| 36 | const char *tag; | 36 | const char *tag; |
| 37 | uint32_t *nops; | 37 | __be32 *nops; |
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | struct cb_getattrargs { | 40 | struct cb_getattrargs { |
| @@ -44,7 +44,7 @@ struct cb_getattrargs { | |||
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | struct cb_getattrres { | 46 | struct cb_getattrres { |
| 47 | uint32_t status; | 47 | __be32 status; |
| 48 | uint32_t bitmap[2]; | 48 | uint32_t bitmap[2]; |
| 49 | uint64_t size; | 49 | uint64_t size; |
| 50 | uint64_t change_attr; | 50 | uint64_t change_attr; |
| @@ -59,8 +59,8 @@ struct cb_recallargs { | |||
| 59 | uint32_t truncate; | 59 | uint32_t truncate; |
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | extern unsigned nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *res); | 62 | extern __be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *res); |
| 63 | extern unsigned nfs4_callback_recall(struct cb_recallargs *args, void *dummy); | 63 | extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy); |
| 64 | 64 | ||
| 65 | #ifdef CONFIG_NFS_V4 | 65 | #ifdef CONFIG_NFS_V4 |
| 66 | extern int nfs_callback_up(void); | 66 | extern int nfs_callback_up(void); |
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 97cf8f71451f..72e55d83756d 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #define NFSDBG_FACILITY NFSDBG_CALLBACK | 15 | #define NFSDBG_FACILITY NFSDBG_CALLBACK |
| 16 | 16 | ||
| 17 | unsigned nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *res) | 17 | __be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *res) |
| 18 | { | 18 | { |
| 19 | struct nfs_client *clp; | 19 | struct nfs_client *clp; |
| 20 | struct nfs_delegation *delegation; | 20 | struct nfs_delegation *delegation; |
| @@ -55,11 +55,11 @@ out: | |||
| 55 | return res->status; | 55 | return res->status; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | unsigned nfs4_callback_recall(struct cb_recallargs *args, void *dummy) | 58 | __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy) |
| 59 | { | 59 | { |
| 60 | struct nfs_client *clp; | 60 | struct nfs_client *clp; |
| 61 | struct inode *inode; | 61 | struct inode *inode; |
| 62 | unsigned res; | 62 | __be32 res; |
| 63 | 63 | ||
| 64 | res = htonl(NFS4ERR_BADHANDLE); | 64 | res = htonl(NFS4ERR_BADHANDLE); |
| 65 | clp = nfs_find_client(args->addr, 4); | 65 | clp = nfs_find_client(args->addr, 4); |
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index 29f932192054..f8ea1f51f590 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c | |||
| @@ -22,9 +22,9 @@ | |||
| 22 | 22 | ||
| 23 | #define NFSDBG_FACILITY NFSDBG_CALLBACK | 23 | #define NFSDBG_FACILITY NFSDBG_CALLBACK |
| 24 | 24 | ||
| 25 | typedef unsigned (*callback_process_op_t)(void *, void *); | 25 | typedef __be32 (*callback_process_op_t)(void *, void *); |
| 26 | typedef unsigned (*callback_decode_arg_t)(struct svc_rqst *, struct xdr_stream *, void *); | 26 | typedef __be32 (*callback_decode_arg_t)(struct svc_rqst *, struct xdr_stream *, void *); |
| 27 | typedef unsigned (*callback_encode_res_t)(struct svc_rqst *, struct xdr_stream *, void *); | 27 | typedef __be32 (*callback_encode_res_t)(struct svc_rqst *, struct xdr_stream *, void *); |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | struct callback_op { | 30 | struct callback_op { |
| @@ -36,24 +36,24 @@ struct callback_op { | |||
| 36 | 36 | ||
| 37 | static struct callback_op callback_ops[]; | 37 | static struct callback_op callback_ops[]; |
| 38 | 38 | ||
| 39 | static int nfs4_callback_null(struct svc_rqst *rqstp, void *argp, void *resp) | 39 | static __be32 nfs4_callback_null(struct svc_rqst *rqstp, void *argp, void *resp) |
| 40 | { | 40 | { |
| 41 | return htonl(NFS4_OK); | 41 | return htonl(NFS4_OK); |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | static int nfs4_decode_void(struct svc_rqst *rqstp, uint32_t *p, void *dummy) | 44 | static int nfs4_decode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
| 45 | { | 45 | { |
| 46 | return xdr_argsize_check(rqstp, p); | 46 | return xdr_argsize_check(rqstp, p); |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | static int nfs4_encode_void(struct svc_rqst *rqstp, uint32_t *p, void *dummy) | 49 | static int nfs4_encode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
| 50 | { | 50 | { |
| 51 | return xdr_ressize_check(rqstp, p); | 51 | return xdr_ressize_check(rqstp, p); |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | static uint32_t *read_buf(struct xdr_stream *xdr, int nbytes) | 54 | static __be32 *read_buf(struct xdr_stream *xdr, int nbytes) |
| 55 | { | 55 | { |
| 56 | uint32_t *p; | 56 | __be32 *p; |
| 57 | 57 | ||
| 58 | p = xdr_inline_decode(xdr, nbytes); | 58 | p = xdr_inline_decode(xdr, nbytes); |
| 59 | if (unlikely(p == NULL)) | 59 | if (unlikely(p == NULL)) |
| @@ -61,9 +61,9 @@ static uint32_t *read_buf(struct xdr_stream *xdr, int nbytes) | |||
| 61 | return p; | 61 | return p; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | static unsigned decode_string(struct xdr_stream *xdr, unsigned int *len, const char **str) | 64 | static __be32 decode_string(struct xdr_stream *xdr, unsigned int *len, const char **str) |
| 65 | { | 65 | { |
| 66 | uint32_t *p; | 66 | __be32 *p; |
| 67 | 67 | ||
| 68 | p = read_buf(xdr, 4); | 68 | p = read_buf(xdr, 4); |
| 69 | if (unlikely(p == NULL)) | 69 | if (unlikely(p == NULL)) |
| @@ -81,9 +81,9 @@ static unsigned decode_string(struct xdr_stream *xdr, unsigned int *len, const c | |||
| 81 | return 0; | 81 | return 0; |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | static unsigned decode_fh(struct xdr_stream *xdr, struct nfs_fh *fh) | 84 | static __be32 decode_fh(struct xdr_stream *xdr, struct nfs_fh *fh) |
| 85 | { | 85 | { |
| 86 | uint32_t *p; | 86 | __be32 *p; |
| 87 | 87 | ||
| 88 | p = read_buf(xdr, 4); | 88 | p = read_buf(xdr, 4); |
| 89 | if (unlikely(p == NULL)) | 89 | if (unlikely(p == NULL)) |
| @@ -99,9 +99,9 @@ static unsigned decode_fh(struct xdr_stream *xdr, struct nfs_fh *fh) | |||
| 99 | return 0; | 99 | return 0; |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | static unsigned decode_bitmap(struct xdr_stream *xdr, uint32_t *bitmap) | 102 | static __be32 decode_bitmap(struct xdr_stream *xdr, uint32_t *bitmap) |
| 103 | { | 103 | { |
| 104 | uint32_t *p; | 104 | __be32 *p; |
| 105 | unsigned int attrlen; | 105 | unsigned int attrlen; |
| 106 | 106 | ||
| 107 | p = read_buf(xdr, 4); | 107 | p = read_buf(xdr, 4); |
| @@ -118,9 +118,9 @@ static unsigned decode_bitmap(struct xdr_stream *xdr, uint32_t *bitmap) | |||
| 118 | return 0; | 118 | return 0; |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | static unsigned decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid) | 121 | static __be32 decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid) |
| 122 | { | 122 | { |
| 123 | uint32_t *p; | 123 | __be32 *p; |
| 124 | 124 | ||
| 125 | p = read_buf(xdr, 16); | 125 | p = read_buf(xdr, 16); |
| 126 | if (unlikely(p == NULL)) | 126 | if (unlikely(p == NULL)) |
| @@ -129,11 +129,11 @@ static unsigned decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid) | |||
| 129 | return 0; | 129 | return 0; |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | static unsigned decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound_hdr_arg *hdr) | 132 | static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound_hdr_arg *hdr) |
| 133 | { | 133 | { |
| 134 | uint32_t *p; | 134 | __be32 *p; |
| 135 | unsigned int minor_version; | 135 | unsigned int minor_version; |
| 136 | unsigned status; | 136 | __be32 status; |
| 137 | 137 | ||
| 138 | status = decode_string(xdr, &hdr->taglen, &hdr->tag); | 138 | status = decode_string(xdr, &hdr->taglen, &hdr->tag); |
| 139 | if (unlikely(status != 0)) | 139 | if (unlikely(status != 0)) |
| @@ -159,9 +159,9 @@ static unsigned decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compou | |||
| 159 | return 0; | 159 | return 0; |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | static unsigned decode_op_hdr(struct xdr_stream *xdr, unsigned int *op) | 162 | static __be32 decode_op_hdr(struct xdr_stream *xdr, unsigned int *op) |
| 163 | { | 163 | { |
| 164 | uint32_t *p; | 164 | __be32 *p; |
| 165 | p = read_buf(xdr, 4); | 165 | p = read_buf(xdr, 4); |
| 166 | if (unlikely(p == NULL)) | 166 | if (unlikely(p == NULL)) |
| 167 | return htonl(NFS4ERR_RESOURCE); | 167 | return htonl(NFS4ERR_RESOURCE); |
| @@ -169,9 +169,9 @@ static unsigned decode_op_hdr(struct xdr_stream *xdr, unsigned int *op) | |||
| 169 | return 0; | 169 | return 0; |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | static unsigned decode_getattr_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, struct cb_getattrargs *args) | 172 | static __be32 decode_getattr_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, struct cb_getattrargs *args) |
| 173 | { | 173 | { |
| 174 | unsigned status; | 174 | __be32 status; |
| 175 | 175 | ||
| 176 | status = decode_fh(xdr, &args->fh); | 176 | status = decode_fh(xdr, &args->fh); |
| 177 | if (unlikely(status != 0)) | 177 | if (unlikely(status != 0)) |
| @@ -183,10 +183,10 @@ out: | |||
| 183 | return status; | 183 | return status; |
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | static unsigned decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, struct cb_recallargs *args) | 186 | static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, struct cb_recallargs *args) |
| 187 | { | 187 | { |
| 188 | uint32_t *p; | 188 | __be32 *p; |
| 189 | unsigned status; | 189 | __be32 status; |
| 190 | 190 | ||
| 191 | args->addr = &rqstp->rq_addr; | 191 | args->addr = &rqstp->rq_addr; |
| 192 | status = decode_stateid(xdr, &args->stateid); | 192 | status = decode_stateid(xdr, &args->stateid); |
| @@ -204,9 +204,9 @@ out: | |||
| 204 | return status; | 204 | return status; |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | static unsigned encode_string(struct xdr_stream *xdr, unsigned int len, const char *str) | 207 | static __be32 encode_string(struct xdr_stream *xdr, unsigned int len, const char *str) |
| 208 | { | 208 | { |
| 209 | uint32_t *p; | 209 | __be32 *p; |
| 210 | 210 | ||
| 211 | p = xdr_reserve_space(xdr, 4 + len); | 211 | p = xdr_reserve_space(xdr, 4 + len); |
| 212 | if (unlikely(p == NULL)) | 212 | if (unlikely(p == NULL)) |
| @@ -217,10 +217,10 @@ static unsigned encode_string(struct xdr_stream *xdr, unsigned int len, const ch | |||
| 217 | 217 | ||
| 218 | #define CB_SUPPORTED_ATTR0 (FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE) | 218 | #define CB_SUPPORTED_ATTR0 (FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE) |
| 219 | #define CB_SUPPORTED_ATTR1 (FATTR4_WORD1_TIME_METADATA|FATTR4_WORD1_TIME_MODIFY) | 219 | #define CB_SUPPORTED_ATTR1 (FATTR4_WORD1_TIME_METADATA|FATTR4_WORD1_TIME_MODIFY) |
| 220 | static unsigned encode_attr_bitmap(struct xdr_stream *xdr, const uint32_t *bitmap, uint32_t **savep) | 220 | static __be32 encode_attr_bitmap(struct xdr_stream *xdr, const uint32_t *bitmap, __be32 **savep) |
| 221 | { | 221 | { |
| 222 | uint32_t bm[2]; | 222 | __be32 bm[2]; |
| 223 | uint32_t *p; | 223 | __be32 *p; |
| 224 | 224 | ||
| 225 | bm[0] = htonl(bitmap[0] & CB_SUPPORTED_ATTR0); | 225 | bm[0] = htonl(bitmap[0] & CB_SUPPORTED_ATTR0); |
| 226 | bm[1] = htonl(bitmap[1] & CB_SUPPORTED_ATTR1); | 226 | bm[1] = htonl(bitmap[1] & CB_SUPPORTED_ATTR1); |
| @@ -247,9 +247,9 @@ static unsigned encode_attr_bitmap(struct xdr_stream *xdr, const uint32_t *bitma | |||
| 247 | return 0; | 247 | return 0; |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | static unsigned encode_attr_change(struct xdr_stream *xdr, const uint32_t *bitmap, uint64_t change) | 250 | static __be32 encode_attr_change(struct xdr_stream *xdr, const uint32_t *bitmap, uint64_t change) |
| 251 | { | 251 | { |
| 252 | uint32_t *p; | 252 | __be32 *p; |
| 253 | 253 | ||
| 254 | if (!(bitmap[0] & FATTR4_WORD0_CHANGE)) | 254 | if (!(bitmap[0] & FATTR4_WORD0_CHANGE)) |
| 255 | return 0; | 255 | return 0; |
| @@ -260,9 +260,9 @@ static unsigned encode_attr_change(struct xdr_stream *xdr, const uint32_t *bitma | |||
| 260 | return 0; | 260 | return 0; |
| 261 | } | 261 | } |
| 262 | 262 | ||
| 263 | static unsigned encode_attr_size(struct xdr_stream *xdr, const uint32_t *bitmap, uint64_t size) | 263 | static __be32 encode_attr_size(struct xdr_stream *xdr, const uint32_t *bitmap, uint64_t size) |
| 264 | { | 264 | { |
| 265 | uint32_t *p; | 265 | __be32 *p; |
| 266 | 266 | ||
| 267 | if (!(bitmap[0] & FATTR4_WORD0_SIZE)) | 267 | if (!(bitmap[0] & FATTR4_WORD0_SIZE)) |
| 268 | return 0; | 268 | return 0; |
| @@ -273,9 +273,9 @@ static unsigned encode_attr_size(struct xdr_stream *xdr, const uint32_t *bitmap, | |||
| 273 | return 0; | 273 | return 0; |
| 274 | } | 274 | } |
| 275 | 275 | ||
| 276 | static unsigned encode_attr_time(struct xdr_stream *xdr, const struct timespec *time) | 276 | static __be32 encode_attr_time(struct xdr_stream *xdr, const struct timespec *time) |
| 277 | { | 277 | { |
| 278 | uint32_t *p; | 278 | __be32 *p; |
| 279 | 279 | ||
| 280 | p = xdr_reserve_space(xdr, 12); | 280 | p = xdr_reserve_space(xdr, 12); |
| 281 | if (unlikely(p == 0)) | 281 | if (unlikely(p == 0)) |
| @@ -285,23 +285,23 @@ static unsigned encode_attr_time(struct xdr_stream *xdr, const struct timespec * | |||
| 285 | return 0; | 285 | return 0; |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | static unsigned encode_attr_ctime(struct xdr_stream *xdr, const uint32_t *bitmap, const struct timespec *time) | 288 | static __be32 encode_attr_ctime(struct xdr_stream *xdr, const uint32_t *bitmap, const struct timespec *time) |
| 289 | { | 289 | { |
| 290 | if (!(bitmap[1] & FATTR4_WORD1_TIME_METADATA)) | 290 | if (!(bitmap[1] & FATTR4_WORD1_TIME_METADATA)) |
| 291 | return 0; | 291 | return 0; |
| 292 | return encode_attr_time(xdr,time); | 292 | return encode_attr_time(xdr,time); |
| 293 | } | 293 | } |
| 294 | 294 | ||
| 295 | static unsigned encode_attr_mtime(struct xdr_stream *xdr, const uint32_t *bitmap, const struct timespec *time) | 295 | static __be32 encode_attr_mtime(struct xdr_stream *xdr, const uint32_t *bitmap, const struct timespec *time) |
| 296 | { | 296 | { |
| 297 | if (!(bitmap[1] & FATTR4_WORD1_TIME_MODIFY)) | 297 | if (!(bitmap[1] & FATTR4_WORD1_TIME_MODIFY)) |
| 298 | return 0; | 298 | return 0; |
| 299 | return encode_attr_time(xdr,time); | 299 | return encode_attr_time(xdr,time); |
| 300 | } | 300 | } |
| 301 | 301 | ||
| 302 | static unsigned encode_compound_hdr_res(struct xdr_stream *xdr, struct cb_compound_hdr_res *hdr) | 302 | static __be32 encode_compound_hdr_res(struct xdr_stream *xdr, struct cb_compound_hdr_res *hdr) |
| 303 | { | 303 | { |
| 304 | unsigned status; | 304 | __be32 status; |
| 305 | 305 | ||
| 306 | hdr->status = xdr_reserve_space(xdr, 4); | 306 | hdr->status = xdr_reserve_space(xdr, 4); |
| 307 | if (unlikely(hdr->status == NULL)) | 307 | if (unlikely(hdr->status == NULL)) |
| @@ -315,9 +315,9 @@ static unsigned encode_compound_hdr_res(struct xdr_stream *xdr, struct cb_compou | |||
| 315 | return 0; | 315 | return 0; |
| 316 | } | 316 | } |
| 317 | 317 | ||
| 318 | static unsigned encode_op_hdr(struct xdr_stream *xdr, uint32_t op, uint32_t res) | 318 | static __be32 encode_op_hdr(struct xdr_stream *xdr, uint32_t op, __be32 res) |
| 319 | { | 319 | { |
| 320 | uint32_t *p; | 320 | __be32 *p; |
| 321 | 321 | ||
| 322 | p = xdr_reserve_space(xdr, 8); | 322 | p = xdr_reserve_space(xdr, 8); |
| 323 | if (unlikely(p == NULL)) | 323 | if (unlikely(p == NULL)) |
| @@ -327,10 +327,10 @@ static unsigned encode_op_hdr(struct xdr_stream *xdr, uint32_t op, uint32_t res) | |||
| 327 | return 0; | 327 | return 0; |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | static unsigned encode_getattr_res(struct svc_rqst *rqstp, struct xdr_stream *xdr, const struct cb_getattrres *res) | 330 | static __be32 encode_getattr_res(struct svc_rqst *rqstp, struct xdr_stream *xdr, const struct cb_getattrres *res) |
| 331 | { | 331 | { |
| 332 | uint32_t *savep = NULL; | 332 | __be32 *savep = NULL; |
| 333 | unsigned status = res->status; | 333 | __be32 status = res->status; |
| 334 | 334 | ||
| 335 | if (unlikely(status != 0)) | 335 | if (unlikely(status != 0)) |
| 336 | goto out; | 336 | goto out; |
| @@ -353,15 +353,15 @@ out: | |||
| 353 | return status; | 353 | return status; |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | static unsigned process_op(struct svc_rqst *rqstp, | 356 | static __be32 process_op(struct svc_rqst *rqstp, |
| 357 | struct xdr_stream *xdr_in, void *argp, | 357 | struct xdr_stream *xdr_in, void *argp, |
| 358 | struct xdr_stream *xdr_out, void *resp) | 358 | struct xdr_stream *xdr_out, void *resp) |
| 359 | { | 359 | { |
| 360 | struct callback_op *op = &callback_ops[0]; | 360 | struct callback_op *op = &callback_ops[0]; |
| 361 | unsigned int op_nr = OP_CB_ILLEGAL; | 361 | unsigned int op_nr = OP_CB_ILLEGAL; |
| 362 | unsigned int status = 0; | 362 | __be32 status = 0; |
| 363 | long maxlen; | 363 | long maxlen; |
| 364 | unsigned res; | 364 | __be32 res; |
| 365 | 365 | ||
| 366 | dprintk("%s: start\n", __FUNCTION__); | 366 | dprintk("%s: start\n", __FUNCTION__); |
| 367 | status = decode_op_hdr(xdr_in, &op_nr); | 367 | status = decode_op_hdr(xdr_in, &op_nr); |
| @@ -399,20 +399,20 @@ static unsigned process_op(struct svc_rqst *rqstp, | |||
| 399 | /* | 399 | /* |
| 400 | * Decode, process and encode a COMPOUND | 400 | * Decode, process and encode a COMPOUND |
| 401 | */ | 401 | */ |
| 402 | static int nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *resp) | 402 | static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *resp) |
| 403 | { | 403 | { |
| 404 | struct cb_compound_hdr_arg hdr_arg; | 404 | struct cb_compound_hdr_arg hdr_arg; |
| 405 | struct cb_compound_hdr_res hdr_res; | 405 | struct cb_compound_hdr_res hdr_res; |
| 406 | struct xdr_stream xdr_in, xdr_out; | 406 | struct xdr_stream xdr_in, xdr_out; |
| 407 | uint32_t *p; | 407 | __be32 *p; |
| 408 | unsigned int status; | 408 | __be32 status; |
| 409 | unsigned int nops = 1; | 409 | unsigned int nops = 1; |
| 410 | 410 | ||
| 411 | dprintk("%s: start\n", __FUNCTION__); | 411 | dprintk("%s: start\n", __FUNCTION__); |
| 412 | 412 | ||
| 413 | xdr_init_decode(&xdr_in, &rqstp->rq_arg, rqstp->rq_arg.head[0].iov_base); | 413 | xdr_init_decode(&xdr_in, &rqstp->rq_arg, rqstp->rq_arg.head[0].iov_base); |
| 414 | 414 | ||
| 415 | p = (uint32_t*)((char *)rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len); | 415 | p = (__be32*)((char *)rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len); |
| 416 | xdr_init_encode(&xdr_out, &rqstp->rq_res, p); | 416 | xdr_init_encode(&xdr_out, &rqstp->rq_res, p); |
| 417 | 417 | ||
| 418 | decode_compound_hdr_arg(&xdr_in, &hdr_arg); | 418 | decode_compound_hdr_arg(&xdr_in, &hdr_arg); |
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 34c3996bd0f5..5fea638743e4 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c | |||
| @@ -232,11 +232,15 @@ void nfs_put_client(struct nfs_client *clp) | |||
| 232 | * Find a client by address | 232 | * Find a client by address |
| 233 | * - caller must hold nfs_client_lock | 233 | * - caller must hold nfs_client_lock |
| 234 | */ | 234 | */ |
| 235 | static struct nfs_client *__nfs_find_client(const struct sockaddr_in *addr, int nfsversion) | 235 | static struct nfs_client *__nfs_find_client(const struct sockaddr_in *addr, int nfsversion, int match_port) |
| 236 | { | 236 | { |
| 237 | struct nfs_client *clp; | 237 | struct nfs_client *clp; |
| 238 | 238 | ||
| 239 | list_for_each_entry(clp, &nfs_client_list, cl_share_link) { | 239 | list_for_each_entry(clp, &nfs_client_list, cl_share_link) { |
| 240 | /* Don't match clients that failed to initialise properly */ | ||
| 241 | if (clp->cl_cons_state < 0) | ||
| 242 | continue; | ||
| 243 | |||
| 240 | /* Different NFS versions cannot share the same nfs_client */ | 244 | /* Different NFS versions cannot share the same nfs_client */ |
| 241 | if (clp->cl_nfsversion != nfsversion) | 245 | if (clp->cl_nfsversion != nfsversion) |
| 242 | continue; | 246 | continue; |
| @@ -245,7 +249,7 @@ static struct nfs_client *__nfs_find_client(const struct sockaddr_in *addr, int | |||
| 245 | sizeof(clp->cl_addr.sin_addr)) != 0) | 249 | sizeof(clp->cl_addr.sin_addr)) != 0) |
| 246 | continue; | 250 | continue; |
| 247 | 251 | ||
| 248 | if (clp->cl_addr.sin_port == addr->sin_port) | 252 | if (!match_port || clp->cl_addr.sin_port == addr->sin_port) |
| 249 | goto found; | 253 | goto found; |
| 250 | } | 254 | } |
| 251 | 255 | ||
| @@ -265,11 +269,12 @@ struct nfs_client *nfs_find_client(const struct sockaddr_in *addr, int nfsversio | |||
| 265 | struct nfs_client *clp; | 269 | struct nfs_client *clp; |
| 266 | 270 | ||
| 267 | spin_lock(&nfs_client_lock); | 271 | spin_lock(&nfs_client_lock); |
| 268 | clp = __nfs_find_client(addr, nfsversion); | 272 | clp = __nfs_find_client(addr, nfsversion, 0); |
| 269 | spin_unlock(&nfs_client_lock); | 273 | spin_unlock(&nfs_client_lock); |
| 270 | 274 | if (clp != NULL && clp->cl_cons_state != NFS_CS_READY) { | |
| 271 | BUG_ON(clp && clp->cl_cons_state == 0); | 275 | nfs_put_client(clp); |
| 272 | 276 | clp = NULL; | |
| 277 | } | ||
| 273 | return clp; | 278 | return clp; |
| 274 | } | 279 | } |
| 275 | 280 | ||
| @@ -292,7 +297,7 @@ static struct nfs_client *nfs_get_client(const char *hostname, | |||
| 292 | do { | 297 | do { |
| 293 | spin_lock(&nfs_client_lock); | 298 | spin_lock(&nfs_client_lock); |
| 294 | 299 | ||
| 295 | clp = __nfs_find_client(addr, nfsversion); | 300 | clp = __nfs_find_client(addr, nfsversion, 1); |
| 296 | if (clp) | 301 | if (clp) |
| 297 | goto found_client; | 302 | goto found_client; |
| 298 | if (new) | 303 | if (new) |
| @@ -849,6 +854,7 @@ error: | |||
| 849 | */ | 854 | */ |
| 850 | static int nfs4_init_client(struct nfs_client *clp, | 855 | static int nfs4_init_client(struct nfs_client *clp, |
| 851 | int proto, int timeo, int retrans, | 856 | int proto, int timeo, int retrans, |
| 857 | const char *ip_addr, | ||
| 852 | rpc_authflavor_t authflavour) | 858 | rpc_authflavor_t authflavour) |
| 853 | { | 859 | { |
| 854 | int error; | 860 | int error; |
| @@ -865,6 +871,7 @@ static int nfs4_init_client(struct nfs_client *clp, | |||
| 865 | error = nfs_create_rpc_client(clp, proto, timeo, retrans, authflavour); | 871 | error = nfs_create_rpc_client(clp, proto, timeo, retrans, authflavour); |
| 866 | if (error < 0) | 872 | if (error < 0) |
| 867 | goto error; | 873 | goto error; |
| 874 | memcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr)); | ||
| 868 | 875 | ||
| 869 | error = nfs_idmap_new(clp); | 876 | error = nfs_idmap_new(clp); |
| 870 | if (error < 0) { | 877 | if (error < 0) { |
| @@ -888,6 +895,7 @@ error: | |||
| 888 | */ | 895 | */ |
| 889 | static int nfs4_set_client(struct nfs_server *server, | 896 | static int nfs4_set_client(struct nfs_server *server, |
| 890 | const char *hostname, const struct sockaddr_in *addr, | 897 | const char *hostname, const struct sockaddr_in *addr, |
| 898 | const char *ip_addr, | ||
| 891 | rpc_authflavor_t authflavour, | 899 | rpc_authflavor_t authflavour, |
| 892 | int proto, int timeo, int retrans) | 900 | int proto, int timeo, int retrans) |
| 893 | { | 901 | { |
| @@ -902,7 +910,7 @@ static int nfs4_set_client(struct nfs_server *server, | |||
| 902 | error = PTR_ERR(clp); | 910 | error = PTR_ERR(clp); |
| 903 | goto error; | 911 | goto error; |
| 904 | } | 912 | } |
| 905 | error = nfs4_init_client(clp, proto, timeo, retrans, authflavour); | 913 | error = nfs4_init_client(clp, proto, timeo, retrans, ip_addr, authflavour); |
| 906 | if (error < 0) | 914 | if (error < 0) |
| 907 | goto error_put; | 915 | goto error_put; |
| 908 | 916 | ||
| @@ -971,7 +979,7 @@ struct nfs_server *nfs4_create_server(const struct nfs4_mount_data *data, | |||
| 971 | return ERR_PTR(-ENOMEM); | 979 | return ERR_PTR(-ENOMEM); |
| 972 | 980 | ||
| 973 | /* Get a client record */ | 981 | /* Get a client record */ |
| 974 | error = nfs4_set_client(server, hostname, addr, authflavour, | 982 | error = nfs4_set_client(server, hostname, addr, ip_addr, authflavour, |
| 975 | data->proto, data->timeo, data->retrans); | 983 | data->proto, data->timeo, data->retrans); |
| 976 | if (error < 0) | 984 | if (error < 0) |
| 977 | goto error; | 985 | goto error; |
| @@ -1041,6 +1049,7 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data, | |||
| 1041 | /* Get a client representation. | 1049 | /* Get a client representation. |
| 1042 | * Note: NFSv4 always uses TCP, */ | 1050 | * Note: NFSv4 always uses TCP, */ |
| 1043 | error = nfs4_set_client(server, data->hostname, data->addr, | 1051 | error = nfs4_set_client(server, data->hostname, data->addr, |
| 1052 | parent_client->cl_ipaddr, | ||
| 1044 | data->authflavor, | 1053 | data->authflavor, |
| 1045 | parent_server->client->cl_xprt->prot, | 1054 | parent_server->client->cl_xprt->prot, |
| 1046 | parent_client->retrans_timeo, | 1055 | parent_client->retrans_timeo, |
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 481f8892a919..b34cd16f472f 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
| @@ -142,12 +142,12 @@ nfs_opendir(struct inode *inode, struct file *filp) | |||
| 142 | return res; | 142 | return res; |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | typedef u32 * (*decode_dirent_t)(u32 *, struct nfs_entry *, int); | 145 | typedef __be32 * (*decode_dirent_t)(__be32 *, struct nfs_entry *, int); |
| 146 | typedef struct { | 146 | typedef struct { |
| 147 | struct file *file; | 147 | struct file *file; |
| 148 | struct page *page; | 148 | struct page *page; |
| 149 | unsigned long page_index; | 149 | unsigned long page_index; |
| 150 | u32 *ptr; | 150 | __be32 *ptr; |
| 151 | u64 *dir_cookie; | 151 | u64 *dir_cookie; |
| 152 | loff_t current_index; | 152 | loff_t current_index; |
| 153 | struct nfs_entry *entry; | 153 | struct nfs_entry *entry; |
| @@ -203,8 +203,10 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page) | |||
| 203 | * Note: assumes we have exclusive access to this mapping either | 203 | * Note: assumes we have exclusive access to this mapping either |
| 204 | * through inode->i_mutex or some other mechanism. | 204 | * through inode->i_mutex or some other mechanism. |
| 205 | */ | 205 | */ |
| 206 | if (page->index == 0) | 206 | if (page->index == 0 && invalidate_inode_pages2_range(inode->i_mapping, PAGE_CACHE_SIZE, -1) < 0) { |
| 207 | invalidate_inode_pages2_range(inode->i_mapping, PAGE_CACHE_SIZE, -1); | 207 | /* Should never happen */ |
| 208 | nfs_zap_mapping(inode, inode->i_mapping); | ||
| 209 | } | ||
| 208 | unlock_page(page); | 210 | unlock_page(page); |
| 209 | return 0; | 211 | return 0; |
| 210 | error: | 212 | error: |
| @@ -218,7 +220,7 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page) | |||
| 218 | static inline | 220 | static inline |
| 219 | int dir_decode(nfs_readdir_descriptor_t *desc) | 221 | int dir_decode(nfs_readdir_descriptor_t *desc) |
| 220 | { | 222 | { |
| 221 | u32 *p = desc->ptr; | 223 | __be32 *p = desc->ptr; |
| 222 | p = desc->decode(p, desc->entry, desc->plus); | 224 | p = desc->decode(p, desc->entry, desc->plus); |
| 223 | if (IS_ERR(p)) | 225 | if (IS_ERR(p)) |
| 224 | return PTR_ERR(p); | 226 | return PTR_ERR(p); |
| @@ -933,8 +935,17 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru | |||
| 933 | 935 | ||
| 934 | no_entry: | 936 | no_entry: |
| 935 | res = d_materialise_unique(dentry, inode); | 937 | res = d_materialise_unique(dentry, inode); |
| 936 | if (res != NULL) | 938 | if (res != NULL) { |
| 939 | struct dentry *parent; | ||
| 940 | if (IS_ERR(res)) | ||
| 941 | goto out_unlock; | ||
| 942 | /* Was a directory renamed! */ | ||
| 943 | parent = dget_parent(res); | ||
| 944 | if (!IS_ROOT(parent)) | ||
| 945 | nfs_mark_for_revalidate(parent->d_inode); | ||
| 946 | dput(parent); | ||
| 937 | dentry = res; | 947 | dentry = res; |
| 948 | } | ||
| 938 | nfs_renew_times(dentry); | 949 | nfs_renew_times(dentry); |
| 939 | nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); | 950 | nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); |
| 940 | out_unlock: | 951 | out_unlock: |
| @@ -1130,6 +1141,8 @@ static struct dentry *nfs_readdir_lookup(nfs_readdir_descriptor_t *desc) | |||
| 1130 | alias = d_materialise_unique(dentry, inode); | 1141 | alias = d_materialise_unique(dentry, inode); |
| 1131 | if (alias != NULL) { | 1142 | if (alias != NULL) { |
| 1132 | dput(dentry); | 1143 | dput(dentry); |
| 1144 | if (IS_ERR(alias)) | ||
| 1145 | return NULL; | ||
| 1133 | dentry = alias; | 1146 | dentry = alias; |
| 1134 | } | 1147 | } |
| 1135 | 1148 | ||
| @@ -1517,8 +1530,8 @@ static int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *sym | |||
| 1517 | pagevec_init(&lru_pvec, 0); | 1530 | pagevec_init(&lru_pvec, 0); |
| 1518 | if (!add_to_page_cache(page, dentry->d_inode->i_mapping, 0, | 1531 | if (!add_to_page_cache(page, dentry->d_inode->i_mapping, 0, |
| 1519 | GFP_KERNEL)) { | 1532 | GFP_KERNEL)) { |
| 1520 | if (!pagevec_add(&lru_pvec, page)) | 1533 | pagevec_add(&lru_pvec, page); |
| 1521 | __pagevec_lru_add(&lru_pvec); | 1534 | pagevec_lru_add(&lru_pvec); |
| 1522 | SetPageUptodate(page); | 1535 | SetPageUptodate(page); |
| 1523 | unlock_page(page); | 1536 | unlock_page(page); |
| 1524 | } else | 1537 | } else |
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 9f7f8b9ea1e2..bdfabf854a51 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
| @@ -497,6 +497,7 @@ static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode | |||
| 497 | if (dreq->commit_data != NULL) | 497 | if (dreq->commit_data != NULL) |
| 498 | nfs_commit_free(dreq->commit_data); | 498 | nfs_commit_free(dreq->commit_data); |
| 499 | nfs_direct_free_writedata(dreq); | 499 | nfs_direct_free_writedata(dreq); |
| 500 | nfs_zap_mapping(inode, inode->i_mapping); | ||
| 500 | nfs_direct_complete(dreq); | 501 | nfs_direct_complete(dreq); |
| 501 | } | 502 | } |
| 502 | } | 503 | } |
| @@ -517,6 +518,7 @@ static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode | |||
| 517 | { | 518 | { |
| 518 | nfs_end_data_update(inode); | 519 | nfs_end_data_update(inode); |
| 519 | nfs_direct_free_writedata(dreq); | 520 | nfs_direct_free_writedata(dreq); |
| 521 | nfs_zap_mapping(inode, inode->i_mapping); | ||
| 520 | nfs_direct_complete(dreq); | 522 | nfs_direct_complete(dreq); |
| 521 | } | 523 | } |
| 522 | #endif | 524 | #endif |
| @@ -532,10 +534,12 @@ static void nfs_direct_write_result(struct rpc_task *task, void *calldata) | |||
| 532 | 534 | ||
| 533 | spin_lock(&dreq->lock); | 535 | spin_lock(&dreq->lock); |
| 534 | 536 | ||
| 535 | if (likely(status >= 0)) | 537 | if (unlikely(status < 0)) { |
| 536 | dreq->count += data->res.count; | 538 | dreq->error = status; |
| 537 | else | 539 | goto out_unlock; |
| 538 | dreq->error = task->tk_status; | 540 | } |
| 541 | |||
| 542 | dreq->count += data->res.count; | ||
| 539 | 543 | ||
| 540 | if (data->res.verf->committed != NFS_FILE_SYNC) { | 544 | if (data->res.verf->committed != NFS_FILE_SYNC) { |
| 541 | switch (dreq->flags) { | 545 | switch (dreq->flags) { |
| @@ -550,7 +554,7 @@ static void nfs_direct_write_result(struct rpc_task *task, void *calldata) | |||
| 550 | } | 554 | } |
| 551 | } | 555 | } |
| 552 | } | 556 | } |
| 553 | 557 | out_unlock: | |
| 554 | spin_unlock(&dreq->lock); | 558 | spin_unlock(&dreq->lock); |
| 555 | } | 559 | } |
| 556 | 560 | ||
| @@ -828,17 +832,6 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov, | |||
| 828 | 832 | ||
| 829 | retval = nfs_direct_write(iocb, (unsigned long) buf, count, pos); | 833 | retval = nfs_direct_write(iocb, (unsigned long) buf, count, pos); |
| 830 | 834 | ||
| 831 | /* | ||
| 832 | * XXX: nfs_end_data_update() already ensures this file's | ||
| 833 | * cached data is subsequently invalidated. Do we really | ||
| 834 | * need to call invalidate_inode_pages2() again here? | ||
| 835 | * | ||
| 836 | * For aio writes, this invalidation will almost certainly | ||
| 837 | * occur before the writes complete. Kind of racey. | ||
| 838 | */ | ||
| 839 | if (mapping->nrpages) | ||
| 840 | invalidate_inode_pages2(mapping); | ||
| 841 | |||
| 842 | if (retval > 0) | 835 | if (retval > 0) |
| 843 | iocb->ki_pos = pos + retval; | 836 | iocb->ki_pos = pos + retval; |
| 844 | 837 | ||
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index bc9376ca86cd..08cc4c5919ab 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
| @@ -131,6 +131,15 @@ void nfs_zap_caches(struct inode *inode) | |||
| 131 | spin_unlock(&inode->i_lock); | 131 | spin_unlock(&inode->i_lock); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | void nfs_zap_mapping(struct inode *inode, struct address_space *mapping) | ||
| 135 | { | ||
| 136 | if (mapping->nrpages != 0) { | ||
| 137 | spin_lock(&inode->i_lock); | ||
| 138 | NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA; | ||
| 139 | spin_unlock(&inode->i_lock); | ||
| 140 | } | ||
| 141 | } | ||
| 142 | |||
| 134 | static void nfs_zap_acl_cache(struct inode *inode) | 143 | static void nfs_zap_acl_cache(struct inode *inode) |
| 135 | { | 144 | { |
| 136 | void (*clear_acl_cache)(struct inode *); | 145 | void (*clear_acl_cache)(struct inode *); |
| @@ -574,7 +583,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) | |||
| 574 | 583 | ||
| 575 | nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE); | 584 | nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE); |
| 576 | lock_kernel(); | 585 | lock_kernel(); |
| 577 | if (!inode || is_bad_inode(inode)) | 586 | if (is_bad_inode(inode)) |
| 578 | goto out_nowait; | 587 | goto out_nowait; |
| 579 | if (NFS_STALE(inode)) | 588 | if (NFS_STALE(inode)) |
| 580 | goto out_nowait; | 589 | goto out_nowait; |
| @@ -671,13 +680,20 @@ int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping) | |||
| 671 | if ((nfsi->cache_validity & NFS_INO_REVAL_PAGECACHE) | 680 | if ((nfsi->cache_validity & NFS_INO_REVAL_PAGECACHE) |
| 672 | || nfs_attribute_timeout(inode)) | 681 | || nfs_attribute_timeout(inode)) |
| 673 | ret = __nfs_revalidate_inode(NFS_SERVER(inode), inode); | 682 | ret = __nfs_revalidate_inode(NFS_SERVER(inode), inode); |
| 683 | if (ret < 0) | ||
| 684 | goto out; | ||
| 674 | 685 | ||
| 675 | if (nfsi->cache_validity & NFS_INO_INVALID_DATA) { | 686 | if (nfsi->cache_validity & NFS_INO_INVALID_DATA) { |
| 676 | nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE); | 687 | if (mapping->nrpages != 0) { |
| 677 | if (S_ISREG(inode->i_mode)) | 688 | if (S_ISREG(inode->i_mode)) { |
| 678 | nfs_sync_mapping(mapping); | 689 | ret = nfs_sync_mapping(mapping); |
| 679 | invalidate_inode_pages2(mapping); | 690 | if (ret < 0) |
| 680 | 691 | goto out; | |
| 692 | } | ||
| 693 | ret = invalidate_inode_pages2(mapping); | ||
| 694 | if (ret < 0) | ||
| 695 | goto out; | ||
| 696 | } | ||
| 681 | spin_lock(&inode->i_lock); | 697 | spin_lock(&inode->i_lock); |
| 682 | nfsi->cache_validity &= ~NFS_INO_INVALID_DATA; | 698 | nfsi->cache_validity &= ~NFS_INO_INVALID_DATA; |
| 683 | if (S_ISDIR(inode->i_mode)) { | 699 | if (S_ISDIR(inode->i_mode)) { |
| @@ -687,10 +703,12 @@ int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping) | |||
| 687 | } | 703 | } |
| 688 | spin_unlock(&inode->i_lock); | 704 | spin_unlock(&inode->i_lock); |
| 689 | 705 | ||
| 706 | nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE); | ||
| 690 | dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n", | 707 | dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n", |
| 691 | inode->i_sb->s_id, | 708 | inode->i_sb->s_id, |
| 692 | (long long)NFS_FILEID(inode)); | 709 | (long long)NFS_FILEID(inode)); |
| 693 | } | 710 | } |
| 711 | out: | ||
| 694 | return ret; | 712 | return ret; |
| 695 | } | 713 | } |
| 696 | 714 | ||
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index bea0b016bd70..d205466233f6 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h | |||
| @@ -93,15 +93,15 @@ extern void nfs_destroy_directcache(void); | |||
| 93 | /* nfs2xdr.c */ | 93 | /* nfs2xdr.c */ |
| 94 | extern int nfs_stat_to_errno(int); | 94 | extern int nfs_stat_to_errno(int); |
| 95 | extern struct rpc_procinfo nfs_procedures[]; | 95 | extern struct rpc_procinfo nfs_procedures[]; |
| 96 | extern u32 * nfs_decode_dirent(u32 *, struct nfs_entry *, int); | 96 | extern __be32 * nfs_decode_dirent(__be32 *, struct nfs_entry *, int); |
| 97 | 97 | ||
| 98 | /* nfs3xdr.c */ | 98 | /* nfs3xdr.c */ |
| 99 | extern struct rpc_procinfo nfs3_procedures[]; | 99 | extern struct rpc_procinfo nfs3_procedures[]; |
| 100 | extern u32 *nfs3_decode_dirent(u32 *, struct nfs_entry *, int); | 100 | extern __be32 *nfs3_decode_dirent(__be32 *, struct nfs_entry *, int); |
| 101 | 101 | ||
| 102 | /* nfs4xdr.c */ | 102 | /* nfs4xdr.c */ |
| 103 | #ifdef CONFIG_NFS_V4 | 103 | #ifdef CONFIG_NFS_V4 |
| 104 | extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus); | 104 | extern __be32 *nfs4_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus); |
| 105 | #endif | 105 | #endif |
| 106 | 106 | ||
| 107 | /* nfs4proc.c */ | 107 | /* nfs4proc.c */ |
diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c index d507b021207f..f75fe72b4160 100644 --- a/fs/nfs/mount_clnt.c +++ b/fs/nfs/mount_clnt.c | |||
| @@ -95,7 +95,7 @@ mnt_create(char *hostname, struct sockaddr_in *srvaddr, int version, | |||
| 95 | * XDR encode/decode functions for MOUNT | 95 | * XDR encode/decode functions for MOUNT |
| 96 | */ | 96 | */ |
| 97 | static int | 97 | static int |
| 98 | xdr_encode_dirpath(struct rpc_rqst *req, u32 *p, const char *path) | 98 | xdr_encode_dirpath(struct rpc_rqst *req, __be32 *p, const char *path) |
| 99 | { | 99 | { |
| 100 | p = xdr_encode_string(p, path); | 100 | p = xdr_encode_string(p, path); |
| 101 | 101 | ||
| @@ -104,7 +104,7 @@ xdr_encode_dirpath(struct rpc_rqst *req, u32 *p, const char *path) | |||
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | static int | 106 | static int |
| 107 | xdr_decode_fhstatus(struct rpc_rqst *req, u32 *p, struct mnt_fhstatus *res) | 107 | xdr_decode_fhstatus(struct rpc_rqst *req, __be32 *p, struct mnt_fhstatus *res) |
| 108 | { | 108 | { |
| 109 | struct nfs_fh *fh = res->fh; | 109 | struct nfs_fh *fh = res->fh; |
| 110 | 110 | ||
| @@ -116,7 +116,7 @@ xdr_decode_fhstatus(struct rpc_rqst *req, u32 *p, struct mnt_fhstatus *res) | |||
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | static int | 118 | static int |
| 119 | xdr_decode_fhstatus3(struct rpc_rqst *req, u32 *p, struct mnt_fhstatus *res) | 119 | xdr_decode_fhstatus3(struct rpc_rqst *req, __be32 *p, struct mnt_fhstatus *res) |
| 120 | { | 120 | { |
| 121 | struct nfs_fh *fh = res->fh; | 121 | struct nfs_fh *fh = res->fh; |
| 122 | 122 | ||
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c index b49501fc0a79..3be4e72a0227 100644 --- a/fs/nfs/nfs2xdr.c +++ b/fs/nfs/nfs2xdr.c | |||
| @@ -66,15 +66,15 @@ | |||
| 66 | /* | 66 | /* |
| 67 | * Common NFS XDR functions as inlines | 67 | * Common NFS XDR functions as inlines |
| 68 | */ | 68 | */ |
| 69 | static inline u32 * | 69 | static inline __be32 * |
| 70 | xdr_encode_fhandle(u32 *p, struct nfs_fh *fhandle) | 70 | xdr_encode_fhandle(__be32 *p, struct nfs_fh *fhandle) |
| 71 | { | 71 | { |
| 72 | memcpy(p, fhandle->data, NFS2_FHSIZE); | 72 | memcpy(p, fhandle->data, NFS2_FHSIZE); |
| 73 | return p + XDR_QUADLEN(NFS2_FHSIZE); | 73 | return p + XDR_QUADLEN(NFS2_FHSIZE); |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | static inline u32 * | 76 | static inline __be32 * |
| 77 | xdr_decode_fhandle(u32 *p, struct nfs_fh *fhandle) | 77 | xdr_decode_fhandle(__be32 *p, struct nfs_fh *fhandle) |
| 78 | { | 78 | { |
| 79 | /* NFSv2 handles have a fixed length */ | 79 | /* NFSv2 handles have a fixed length */ |
| 80 | fhandle->size = NFS2_FHSIZE; | 80 | fhandle->size = NFS2_FHSIZE; |
| @@ -82,8 +82,8 @@ xdr_decode_fhandle(u32 *p, struct nfs_fh *fhandle) | |||
| 82 | return p + XDR_QUADLEN(NFS2_FHSIZE); | 82 | return p + XDR_QUADLEN(NFS2_FHSIZE); |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | static inline u32* | 85 | static inline __be32* |
| 86 | xdr_encode_time(u32 *p, struct timespec *timep) | 86 | xdr_encode_time(__be32 *p, struct timespec *timep) |
| 87 | { | 87 | { |
| 88 | *p++ = htonl(timep->tv_sec); | 88 | *p++ = htonl(timep->tv_sec); |
| 89 | /* Convert nanoseconds into microseconds */ | 89 | /* Convert nanoseconds into microseconds */ |
| @@ -91,8 +91,8 @@ xdr_encode_time(u32 *p, struct timespec *timep) | |||
| 91 | return p; | 91 | return p; |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | static inline u32* | 94 | static inline __be32* |
| 95 | xdr_encode_current_server_time(u32 *p, struct timespec *timep) | 95 | xdr_encode_current_server_time(__be32 *p, struct timespec *timep) |
| 96 | { | 96 | { |
| 97 | /* | 97 | /* |
| 98 | * Passing the invalid value useconds=1000000 is a | 98 | * Passing the invalid value useconds=1000000 is a |
| @@ -108,8 +108,8 @@ xdr_encode_current_server_time(u32 *p, struct timespec *timep) | |||
| 108 | return p; | 108 | return p; |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | static inline u32* | 111 | static inline __be32* |
| 112 | xdr_decode_time(u32 *p, struct timespec *timep) | 112 | xdr_decode_time(__be32 *p, struct timespec *timep) |
| 113 | { | 113 | { |
| 114 | timep->tv_sec = ntohl(*p++); | 114 | timep->tv_sec = ntohl(*p++); |
| 115 | /* Convert microseconds into nanoseconds */ | 115 | /* Convert microseconds into nanoseconds */ |
| @@ -117,8 +117,8 @@ xdr_decode_time(u32 *p, struct timespec *timep) | |||
| 117 | return p; | 117 | return p; |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | static u32 * | 120 | static __be32 * |
| 121 | xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr) | 121 | xdr_decode_fattr(__be32 *p, struct nfs_fattr *fattr) |
| 122 | { | 122 | { |
| 123 | u32 rdev; | 123 | u32 rdev; |
| 124 | fattr->type = (enum nfs_ftype) ntohl(*p++); | 124 | fattr->type = (enum nfs_ftype) ntohl(*p++); |
| @@ -146,10 +146,10 @@ xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr) | |||
| 146 | return p; | 146 | return p; |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | static inline u32 * | 149 | static inline __be32 * |
| 150 | xdr_encode_sattr(u32 *p, struct iattr *attr) | 150 | xdr_encode_sattr(__be32 *p, struct iattr *attr) |
| 151 | { | 151 | { |
| 152 | const u32 not_set = __constant_htonl(0xFFFFFFFF); | 152 | const __be32 not_set = __constant_htonl(0xFFFFFFFF); |
| 153 | 153 | ||
| 154 | *p++ = (attr->ia_valid & ATTR_MODE) ? htonl(attr->ia_mode) : not_set; | 154 | *p++ = (attr->ia_valid & ATTR_MODE) ? htonl(attr->ia_mode) : not_set; |
| 155 | *p++ = (attr->ia_valid & ATTR_UID) ? htonl(attr->ia_uid) : not_set; | 155 | *p++ = (attr->ia_valid & ATTR_UID) ? htonl(attr->ia_uid) : not_set; |
| @@ -184,7 +184,7 @@ xdr_encode_sattr(u32 *p, struct iattr *attr) | |||
| 184 | * GETATTR, READLINK, STATFS | 184 | * GETATTR, READLINK, STATFS |
| 185 | */ | 185 | */ |
| 186 | static int | 186 | static int |
| 187 | nfs_xdr_fhandle(struct rpc_rqst *req, u32 *p, struct nfs_fh *fh) | 187 | nfs_xdr_fhandle(struct rpc_rqst *req, __be32 *p, struct nfs_fh *fh) |
| 188 | { | 188 | { |
| 189 | p = xdr_encode_fhandle(p, fh); | 189 | p = xdr_encode_fhandle(p, fh); |
| 190 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 190 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); |
| @@ -195,7 +195,7 @@ nfs_xdr_fhandle(struct rpc_rqst *req, u32 *p, struct nfs_fh *fh) | |||
| 195 | * Encode SETATTR arguments | 195 | * Encode SETATTR arguments |
| 196 | */ | 196 | */ |
| 197 | static int | 197 | static int |
| 198 | nfs_xdr_sattrargs(struct rpc_rqst *req, u32 *p, struct nfs_sattrargs *args) | 198 | nfs_xdr_sattrargs(struct rpc_rqst *req, __be32 *p, struct nfs_sattrargs *args) |
| 199 | { | 199 | { |
| 200 | p = xdr_encode_fhandle(p, args->fh); | 200 | p = xdr_encode_fhandle(p, args->fh); |
| 201 | p = xdr_encode_sattr(p, args->sattr); | 201 | p = xdr_encode_sattr(p, args->sattr); |
| @@ -208,7 +208,7 @@ nfs_xdr_sattrargs(struct rpc_rqst *req, u32 *p, struct nfs_sattrargs *args) | |||
| 208 | * LOOKUP, REMOVE, RMDIR | 208 | * LOOKUP, REMOVE, RMDIR |
| 209 | */ | 209 | */ |
| 210 | static int | 210 | static int |
| 211 | nfs_xdr_diropargs(struct rpc_rqst *req, u32 *p, struct nfs_diropargs *args) | 211 | nfs_xdr_diropargs(struct rpc_rqst *req, __be32 *p, struct nfs_diropargs *args) |
| 212 | { | 212 | { |
| 213 | p = xdr_encode_fhandle(p, args->fh); | 213 | p = xdr_encode_fhandle(p, args->fh); |
| 214 | p = xdr_encode_array(p, args->name, args->len); | 214 | p = xdr_encode_array(p, args->name, args->len); |
| @@ -222,7 +222,7 @@ nfs_xdr_diropargs(struct rpc_rqst *req, u32 *p, struct nfs_diropargs *args) | |||
| 222 | * exactly to the page we want to fetch. | 222 | * exactly to the page we want to fetch. |
| 223 | */ | 223 | */ |
| 224 | static int | 224 | static int |
| 225 | nfs_xdr_readargs(struct rpc_rqst *req, u32 *p, struct nfs_readargs *args) | 225 | nfs_xdr_readargs(struct rpc_rqst *req, __be32 *p, struct nfs_readargs *args) |
| 226 | { | 226 | { |
| 227 | struct rpc_auth *auth = req->rq_task->tk_auth; | 227 | struct rpc_auth *auth = req->rq_task->tk_auth; |
| 228 | unsigned int replen; | 228 | unsigned int replen; |
| @@ -246,7 +246,7 @@ nfs_xdr_readargs(struct rpc_rqst *req, u32 *p, struct nfs_readargs *args) | |||
| 246 | * Decode READ reply | 246 | * Decode READ reply |
| 247 | */ | 247 | */ |
| 248 | static int | 248 | static int |
| 249 | nfs_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res) | 249 | nfs_xdr_readres(struct rpc_rqst *req, __be32 *p, struct nfs_readres *res) |
| 250 | { | 250 | { |
| 251 | struct kvec *iov = req->rq_rcv_buf.head; | 251 | struct kvec *iov = req->rq_rcv_buf.head; |
| 252 | int status, count, recvd, hdrlen; | 252 | int status, count, recvd, hdrlen; |
| @@ -286,7 +286,7 @@ nfs_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res) | |||
| 286 | * Write arguments. Splice the buffer to be written into the iovec. | 286 | * Write arguments. Splice the buffer to be written into the iovec. |
| 287 | */ | 287 | */ |
| 288 | static int | 288 | static int |
| 289 | nfs_xdr_writeargs(struct rpc_rqst *req, u32 *p, struct nfs_writeargs *args) | 289 | nfs_xdr_writeargs(struct rpc_rqst *req, __be32 *p, struct nfs_writeargs *args) |
| 290 | { | 290 | { |
| 291 | struct xdr_buf *sndbuf = &req->rq_snd_buf; | 291 | struct xdr_buf *sndbuf = &req->rq_snd_buf; |
| 292 | u32 offset = (u32)args->offset; | 292 | u32 offset = (u32)args->offset; |
| @@ -309,7 +309,7 @@ nfs_xdr_writeargs(struct rpc_rqst *req, u32 *p, struct nfs_writeargs *args) | |||
| 309 | * CREATE, MKDIR | 309 | * CREATE, MKDIR |
| 310 | */ | 310 | */ |
| 311 | static int | 311 | static int |
| 312 | nfs_xdr_createargs(struct rpc_rqst *req, u32 *p, struct nfs_createargs *args) | 312 | nfs_xdr_createargs(struct rpc_rqst *req, __be32 *p, struct nfs_createargs *args) |
| 313 | { | 313 | { |
| 314 | p = xdr_encode_fhandle(p, args->fh); | 314 | p = xdr_encode_fhandle(p, args->fh); |
| 315 | p = xdr_encode_array(p, args->name, args->len); | 315 | p = xdr_encode_array(p, args->name, args->len); |
| @@ -322,7 +322,7 @@ nfs_xdr_createargs(struct rpc_rqst *req, u32 *p, struct nfs_createargs *args) | |||
| 322 | * Encode RENAME arguments | 322 | * Encode RENAME arguments |
| 323 | */ | 323 | */ |
| 324 | static int | 324 | static int |
| 325 | nfs_xdr_renameargs(struct rpc_rqst *req, u32 *p, struct nfs_renameargs *args) | 325 | nfs_xdr_renameargs(struct rpc_rqst *req, __be32 *p, struct nfs_renameargs *args) |
| 326 | { | 326 | { |
| 327 | p = xdr_encode_fhandle(p, args->fromfh); | 327 | p = xdr_encode_fhandle(p, args->fromfh); |
| 328 | p = xdr_encode_array(p, args->fromname, args->fromlen); | 328 | p = xdr_encode_array(p, args->fromname, args->fromlen); |
| @@ -336,7 +336,7 @@ nfs_xdr_renameargs(struct rpc_rqst *req, u32 *p, struct nfs_renameargs *args) | |||
| 336 | * Encode LINK arguments | 336 | * Encode LINK arguments |
| 337 | */ | 337 | */ |
| 338 | static int | 338 | static int |
| 339 | nfs_xdr_linkargs(struct rpc_rqst *req, u32 *p, struct nfs_linkargs *args) | 339 | nfs_xdr_linkargs(struct rpc_rqst *req, __be32 *p, struct nfs_linkargs *args) |
| 340 | { | 340 | { |
| 341 | p = xdr_encode_fhandle(p, args->fromfh); | 341 | p = xdr_encode_fhandle(p, args->fromfh); |
| 342 | p = xdr_encode_fhandle(p, args->tofh); | 342 | p = xdr_encode_fhandle(p, args->tofh); |
| @@ -349,7 +349,7 @@ nfs_xdr_linkargs(struct rpc_rqst *req, u32 *p, struct nfs_linkargs *args) | |||
| 349 | * Encode SYMLINK arguments | 349 | * Encode SYMLINK arguments |
| 350 | */ | 350 | */ |
| 351 | static int | 351 | static int |
| 352 | nfs_xdr_symlinkargs(struct rpc_rqst *req, u32 *p, struct nfs_symlinkargs *args) | 352 | nfs_xdr_symlinkargs(struct rpc_rqst *req, __be32 *p, struct nfs_symlinkargs *args) |
| 353 | { | 353 | { |
| 354 | struct xdr_buf *sndbuf = &req->rq_snd_buf; | 354 | struct xdr_buf *sndbuf = &req->rq_snd_buf; |
| 355 | size_t pad; | 355 | size_t pad; |
| @@ -378,7 +378,7 @@ nfs_xdr_symlinkargs(struct rpc_rqst *req, u32 *p, struct nfs_symlinkargs *args) | |||
| 378 | * Encode arguments to readdir call | 378 | * Encode arguments to readdir call |
| 379 | */ | 379 | */ |
| 380 | static int | 380 | static int |
| 381 | nfs_xdr_readdirargs(struct rpc_rqst *req, u32 *p, struct nfs_readdirargs *args) | 381 | nfs_xdr_readdirargs(struct rpc_rqst *req, __be32 *p, struct nfs_readdirargs *args) |
| 382 | { | 382 | { |
| 383 | struct rpc_task *task = req->rq_task; | 383 | struct rpc_task *task = req->rq_task; |
| 384 | struct rpc_auth *auth = task->tk_auth; | 384 | struct rpc_auth *auth = task->tk_auth; |
| @@ -404,7 +404,7 @@ nfs_xdr_readdirargs(struct rpc_rqst *req, u32 *p, struct nfs_readdirargs *args) | |||
| 404 | * from nfs_readdir for each entry. | 404 | * from nfs_readdir for each entry. |
| 405 | */ | 405 | */ |
| 406 | static int | 406 | static int |
| 407 | nfs_xdr_readdirres(struct rpc_rqst *req, u32 *p, void *dummy) | 407 | nfs_xdr_readdirres(struct rpc_rqst *req, __be32 *p, void *dummy) |
| 408 | { | 408 | { |
| 409 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; | 409 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; |
| 410 | struct kvec *iov = rcvbuf->head; | 410 | struct kvec *iov = rcvbuf->head; |
| @@ -412,7 +412,7 @@ nfs_xdr_readdirres(struct rpc_rqst *req, u32 *p, void *dummy) | |||
| 412 | int hdrlen, recvd; | 412 | int hdrlen, recvd; |
| 413 | int status, nr; | 413 | int status, nr; |
| 414 | unsigned int len, pglen; | 414 | unsigned int len, pglen; |
| 415 | u32 *end, *entry, *kaddr; | 415 | __be32 *end, *entry, *kaddr; |
| 416 | 416 | ||
| 417 | if ((status = ntohl(*p++))) | 417 | if ((status = ntohl(*p++))) |
| 418 | return -nfs_stat_to_errno(status); | 418 | return -nfs_stat_to_errno(status); |
| @@ -432,8 +432,8 @@ nfs_xdr_readdirres(struct rpc_rqst *req, u32 *p, void *dummy) | |||
| 432 | if (pglen > recvd) | 432 | if (pglen > recvd) |
| 433 | pglen = recvd; | 433 | pglen = recvd; |
| 434 | page = rcvbuf->pages; | 434 | page = rcvbuf->pages; |
| 435 | kaddr = p = (u32 *)kmap_atomic(*page, KM_USER0); | 435 | kaddr = p = kmap_atomic(*page, KM_USER0); |
| 436 | end = (u32 *)((char *)p + pglen); | 436 | end = (__be32 *)((char *)p + pglen); |
| 437 | entry = p; | 437 | entry = p; |
| 438 | for (nr = 0; *p++; nr++) { | 438 | for (nr = 0; *p++; nr++) { |
| 439 | if (p + 2 > end) | 439 | if (p + 2 > end) |
| @@ -468,8 +468,8 @@ err_unmap: | |||
| 468 | goto out; | 468 | goto out; |
| 469 | } | 469 | } |
| 470 | 470 | ||
| 471 | u32 * | 471 | __be32 * |
| 472 | nfs_decode_dirent(u32 *p, struct nfs_entry *entry, int plus) | 472 | nfs_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus) |
| 473 | { | 473 | { |
| 474 | if (!*p++) { | 474 | if (!*p++) { |
| 475 | if (!*p) | 475 | if (!*p) |
| @@ -496,7 +496,7 @@ nfs_decode_dirent(u32 *p, struct nfs_entry *entry, int plus) | |||
| 496 | * Decode simple status reply | 496 | * Decode simple status reply |
| 497 | */ | 497 | */ |
| 498 | static int | 498 | static int |
| 499 | nfs_xdr_stat(struct rpc_rqst *req, u32 *p, void *dummy) | 499 | nfs_xdr_stat(struct rpc_rqst *req, __be32 *p, void *dummy) |
| 500 | { | 500 | { |
| 501 | int status; | 501 | int status; |
| 502 | 502 | ||
| @@ -510,7 +510,7 @@ nfs_xdr_stat(struct rpc_rqst *req, u32 *p, void *dummy) | |||
| 510 | * GETATTR, SETATTR, WRITE | 510 | * GETATTR, SETATTR, WRITE |
| 511 | */ | 511 | */ |
| 512 | static int | 512 | static int |
| 513 | nfs_xdr_attrstat(struct rpc_rqst *req, u32 *p, struct nfs_fattr *fattr) | 513 | nfs_xdr_attrstat(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr) |
| 514 | { | 514 | { |
| 515 | int status; | 515 | int status; |
| 516 | 516 | ||
| @@ -525,7 +525,7 @@ nfs_xdr_attrstat(struct rpc_rqst *req, u32 *p, struct nfs_fattr *fattr) | |||
| 525 | * LOOKUP, CREATE, MKDIR | 525 | * LOOKUP, CREATE, MKDIR |
| 526 | */ | 526 | */ |
| 527 | static int | 527 | static int |
| 528 | nfs_xdr_diropres(struct rpc_rqst *req, u32 *p, struct nfs_diropok *res) | 528 | nfs_xdr_diropres(struct rpc_rqst *req, __be32 *p, struct nfs_diropok *res) |
| 529 | { | 529 | { |
| 530 | int status; | 530 | int status; |
| 531 | 531 | ||
| @@ -540,7 +540,7 @@ nfs_xdr_diropres(struct rpc_rqst *req, u32 *p, struct nfs_diropok *res) | |||
| 540 | * Encode READLINK args | 540 | * Encode READLINK args |
| 541 | */ | 541 | */ |
| 542 | static int | 542 | static int |
| 543 | nfs_xdr_readlinkargs(struct rpc_rqst *req, u32 *p, struct nfs_readlinkargs *args) | 543 | nfs_xdr_readlinkargs(struct rpc_rqst *req, __be32 *p, struct nfs_readlinkargs *args) |
| 544 | { | 544 | { |
| 545 | struct rpc_auth *auth = req->rq_task->tk_auth; | 545 | struct rpc_auth *auth = req->rq_task->tk_auth; |
| 546 | unsigned int replen; | 546 | unsigned int replen; |
| @@ -558,7 +558,7 @@ nfs_xdr_readlinkargs(struct rpc_rqst *req, u32 *p, struct nfs_readlinkargs *args | |||
| 558 | * Decode READLINK reply | 558 | * Decode READLINK reply |
| 559 | */ | 559 | */ |
| 560 | static int | 560 | static int |
| 561 | nfs_xdr_readlinkres(struct rpc_rqst *req, u32 *p, void *dummy) | 561 | nfs_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, void *dummy) |
| 562 | { | 562 | { |
| 563 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; | 563 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; |
| 564 | struct kvec *iov = rcvbuf->head; | 564 | struct kvec *iov = rcvbuf->head; |
| @@ -601,7 +601,7 @@ nfs_xdr_readlinkres(struct rpc_rqst *req, u32 *p, void *dummy) | |||
| 601 | * Decode WRITE reply | 601 | * Decode WRITE reply |
| 602 | */ | 602 | */ |
| 603 | static int | 603 | static int |
| 604 | nfs_xdr_writeres(struct rpc_rqst *req, u32 *p, struct nfs_writeres *res) | 604 | nfs_xdr_writeres(struct rpc_rqst *req, __be32 *p, struct nfs_writeres *res) |
| 605 | { | 605 | { |
| 606 | res->verf->committed = NFS_FILE_SYNC; | 606 | res->verf->committed = NFS_FILE_SYNC; |
| 607 | return nfs_xdr_attrstat(req, p, res->fattr); | 607 | return nfs_xdr_attrstat(req, p, res->fattr); |
| @@ -611,7 +611,7 @@ nfs_xdr_writeres(struct rpc_rqst *req, u32 *p, struct nfs_writeres *res) | |||
| 611 | * Decode STATFS reply | 611 | * Decode STATFS reply |
| 612 | */ | 612 | */ |
| 613 | static int | 613 | static int |
| 614 | nfs_xdr_statfsres(struct rpc_rqst *req, u32 *p, struct nfs2_fsstat *res) | 614 | nfs_xdr_statfsres(struct rpc_rqst *req, __be32 *p, struct nfs2_fsstat *res) |
| 615 | { | 615 | { |
| 616 | int status; | 616 | int status; |
| 617 | 617 | ||
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 3b234d4601e7..e5f128ffc32d 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c | |||
| @@ -668,7 +668,7 @@ nfs3_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, | |||
| 668 | { | 668 | { |
| 669 | struct inode *dir = dentry->d_inode; | 669 | struct inode *dir = dentry->d_inode; |
| 670 | struct nfs_fattr dir_attr; | 670 | struct nfs_fattr dir_attr; |
| 671 | u32 *verf = NFS_COOKIEVERF(dir); | 671 | __be32 *verf = NFS_COOKIEVERF(dir); |
| 672 | struct nfs3_readdirargs arg = { | 672 | struct nfs3_readdirargs arg = { |
| 673 | .fh = NFS_FH(dir), | 673 | .fh = NFS_FH(dir), |
| 674 | .cookie = cookie, | 674 | .cookie = cookie, |
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index 16556fa4effb..0ace092d126f 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c | |||
| @@ -105,14 +105,14 @@ static struct { | |||
| 105 | /* | 105 | /* |
| 106 | * Common NFS XDR functions as inlines | 106 | * Common NFS XDR functions as inlines |
| 107 | */ | 107 | */ |
| 108 | static inline u32 * | 108 | static inline __be32 * |
| 109 | xdr_encode_fhandle(u32 *p, struct nfs_fh *fh) | 109 | xdr_encode_fhandle(__be32 *p, struct nfs_fh *fh) |
| 110 | { | 110 | { |
| 111 | return xdr_encode_array(p, fh->data, fh->size); | 111 | return xdr_encode_array(p, fh->data, fh->size); |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | static inline u32 * | 114 | static inline __be32 * |
| 115 | xdr_decode_fhandle(u32 *p, struct nfs_fh *fh) | 115 | xdr_decode_fhandle(__be32 *p, struct nfs_fh *fh) |
| 116 | { | 116 | { |
| 117 | if ((fh->size = ntohl(*p++)) <= NFS3_FHSIZE) { | 117 | if ((fh->size = ntohl(*p++)) <= NFS3_FHSIZE) { |
| 118 | memcpy(fh->data, p, fh->size); | 118 | memcpy(fh->data, p, fh->size); |
| @@ -124,24 +124,24 @@ xdr_decode_fhandle(u32 *p, struct nfs_fh *fh) | |||
| 124 | /* | 124 | /* |
| 125 | * Encode/decode time. | 125 | * Encode/decode time. |
| 126 | */ | 126 | */ |
| 127 | static inline u32 * | 127 | static inline __be32 * |
| 128 | xdr_encode_time3(u32 *p, struct timespec *timep) | 128 | xdr_encode_time3(__be32 *p, struct timespec *timep) |
| 129 | { | 129 | { |
| 130 | *p++ = htonl(timep->tv_sec); | 130 | *p++ = htonl(timep->tv_sec); |
| 131 | *p++ = htonl(timep->tv_nsec); | 131 | *p++ = htonl(timep->tv_nsec); |
| 132 | return p; | 132 | return p; |
| 133 | } | 133 | } |
| 134 | 134 | ||
| 135 | static inline u32 * | 135 | static inline __be32 * |
| 136 | xdr_decode_time3(u32 *p, struct timespec *timep) | 136 | xdr_decode_time3(__be32 *p, struct timespec *timep) |
| 137 | { | 137 | { |
| 138 | timep->tv_sec = ntohl(*p++); | 138 | timep->tv_sec = ntohl(*p++); |
| 139 | timep->tv_nsec = ntohl(*p++); | 139 | timep->tv_nsec = ntohl(*p++); |
| 140 | return p; | 140 | return p; |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | static u32 * | 143 | static __be32 * |
| 144 | xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr) | 144 | xdr_decode_fattr(__be32 *p, struct nfs_fattr *fattr) |
| 145 | { | 145 | { |
| 146 | unsigned int type, major, minor; | 146 | unsigned int type, major, minor; |
| 147 | int fmode; | 147 | int fmode; |
| @@ -177,8 +177,8 @@ xdr_decode_fattr(u32 *p, struct nfs_fattr *fattr) | |||
| 177 | return p; | 177 | return p; |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | static inline u32 * | 180 | static inline __be32 * |
| 181 | xdr_encode_sattr(u32 *p, struct iattr *attr) | 181 | xdr_encode_sattr(__be32 *p, struct iattr *attr) |
| 182 | { | 182 | { |
| 183 | if (attr->ia_valid & ATTR_MODE) { | 183 | if (attr->ia_valid & ATTR_MODE) { |
| 184 | *p++ = xdr_one; | 184 | *p++ = xdr_one; |
| @@ -223,8 +223,8 @@ xdr_encode_sattr(u32 *p, struct iattr *attr) | |||
| 223 | return p; | 223 | return p; |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | static inline u32 * | 226 | static inline __be32 * |
| 227 | xdr_decode_wcc_attr(u32 *p, struct nfs_fattr *fattr) | 227 | xdr_decode_wcc_attr(__be32 *p, struct nfs_fattr *fattr) |
| 228 | { | 228 | { |
| 229 | p = xdr_decode_hyper(p, &fattr->pre_size); | 229 | p = xdr_decode_hyper(p, &fattr->pre_size); |
| 230 | p = xdr_decode_time3(p, &fattr->pre_mtime); | 230 | p = xdr_decode_time3(p, &fattr->pre_mtime); |
| @@ -233,16 +233,16 @@ xdr_decode_wcc_attr(u32 *p, struct nfs_fattr *fattr) | |||
| 233 | return p; | 233 | return p; |
| 234 | } | 234 | } |
| 235 | 235 | ||
| 236 | static inline u32 * | 236 | static inline __be32 * |
| 237 | xdr_decode_post_op_attr(u32 *p, struct nfs_fattr *fattr) | 237 | xdr_decode_post_op_attr(__be32 *p, struct nfs_fattr *fattr) |
| 238 | { | 238 | { |
| 239 | if (*p++) | 239 | if (*p++) |
| 240 | p = xdr_decode_fattr(p, fattr); | 240 | p = xdr_decode_fattr(p, fattr); |
| 241 | return p; | 241 | return p; |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | static inline u32 * | 244 | static inline __be32 * |
| 245 | xdr_decode_pre_op_attr(u32 *p, struct nfs_fattr *fattr) | 245 | xdr_decode_pre_op_attr(__be32 *p, struct nfs_fattr *fattr) |
| 246 | { | 246 | { |
| 247 | if (*p++) | 247 | if (*p++) |
| 248 | return xdr_decode_wcc_attr(p, fattr); | 248 | return xdr_decode_wcc_attr(p, fattr); |
| @@ -250,8 +250,8 @@ xdr_decode_pre_op_attr(u32 *p, struct nfs_fattr *fattr) | |||
| 250 | } | 250 | } |
| 251 | 251 | ||
| 252 | 252 | ||
| 253 | static inline u32 * | 253 | static inline __be32 * |
| 254 | xdr_decode_wcc_data(u32 *p, struct nfs_fattr *fattr) | 254 | xdr_decode_wcc_data(__be32 *p, struct nfs_fattr *fattr) |
| 255 | { | 255 | { |
| 256 | p = xdr_decode_pre_op_attr(p, fattr); | 256 | p = xdr_decode_pre_op_attr(p, fattr); |
| 257 | return xdr_decode_post_op_attr(p, fattr); | 257 | return xdr_decode_post_op_attr(p, fattr); |
| @@ -265,7 +265,7 @@ xdr_decode_wcc_data(u32 *p, struct nfs_fattr *fattr) | |||
| 265 | * Encode file handle argument | 265 | * Encode file handle argument |
| 266 | */ | 266 | */ |
| 267 | static int | 267 | static int |
| 268 | nfs3_xdr_fhandle(struct rpc_rqst *req, u32 *p, struct nfs_fh *fh) | 268 | nfs3_xdr_fhandle(struct rpc_rqst *req, __be32 *p, struct nfs_fh *fh) |
| 269 | { | 269 | { |
| 270 | p = xdr_encode_fhandle(p, fh); | 270 | p = xdr_encode_fhandle(p, fh); |
| 271 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); | 271 | req->rq_slen = xdr_adjust_iovec(req->rq_svec, p); |
| @@ -276,7 +276,7 @@ nfs3_xdr_fhandle(struct rpc_rqst *req, u32 *p, struct nfs_fh *fh) | |||
| 276 | * Encode SETATTR arguments | 276 | * Encode SETATTR arguments |
| 277 | */ | 277 | */ |
| 278 | static int | 278 | static int |
| 279 | nfs3_xdr_sattrargs(struct rpc_rqst *req, u32 *p, struct nfs3_sattrargs *args) | 279 | nfs3_xdr_sattrargs(struct rpc_rqst *req, __be32 *p, struct nfs3_sattrargs *args) |
| 280 | { | 280 | { |
| 281 | p = xdr_encode_fhandle(p, args->fh); | 281 | p = xdr_encode_fhandle(p, args->fh); |
| 282 | p = xdr_encode_sattr(p, args->sattr); | 282 | p = xdr_encode_sattr(p, args->sattr); |
| @@ -291,7 +291,7 @@ nfs3_xdr_sattrargs(struct rpc_rqst *req, u32 *p, struct nfs3_sattrargs *args) | |||
| 291 | * Encode directory ops argument | 291 | * Encode directory ops argument |
| 292 | */ | 292 | */ |
| 293 | static int | 293 | static int |
| 294 | nfs3_xdr_diropargs(struct rpc_rqst *req, u32 *p, struct nfs3_diropargs *args) | 294 | nfs3_xdr_diropargs(struct rpc_rqst *req, __be32 *p, struct nfs3_diropargs *args) |
| 295 | { | 295 | { |
| 296 | p = xdr_encode_fhandle(p, args->fh); | 296 | p = xdr_encode_fhandle(p, args->fh); |
| 297 | p = xdr_encode_array(p, args->name, args->len); | 297 | p = xdr_encode_array(p, args->name, args->len); |
| @@ -303,7 +303,7 @@ nfs3_xdr_diropargs(struct rpc_rqst *req, u32 *p, struct nfs3_diropargs *args) | |||
| 303 | * Encode access() argument | 303 | * Encode access() argument |
| 304 | */ | 304 | */ |
| 305 | static int | 305 | static int |
| 306 | nfs3_xdr_accessargs(struct rpc_rqst *req, u32 *p, struct nfs3_accessargs *args) | 306 | nfs3_xdr_accessargs(struct rpc_rqst *req, __be32 *p, struct nfs3_accessargs *args) |
| 307 | { | 307 | { |
| 308 | p = xdr_encode_fhandle(p, args->fh); | 308 | p = xdr_encode_fhandle(p, args->fh); |
| 309 | *p++ = htonl(args->access); | 309 | *p++ = htonl(args->access); |
| @@ -317,7 +317,7 @@ nfs3_xdr_accessargs(struct rpc_rqst *req, u32 *p, struct nfs3_accessargs *args) | |||
| 317 | * exactly to the page we want to fetch. | 317 | * exactly to the page we want to fetch. |
| 318 | */ | 318 | */ |
| 319 | static int | 319 | static int |
| 320 | nfs3_xdr_readargs(struct rpc_rqst *req, u32 *p, struct nfs_readargs *args) | 320 | nfs3_xdr_readargs(struct rpc_rqst *req, __be32 *p, struct nfs_readargs *args) |
| 321 | { | 321 | { |
| 322 | struct rpc_auth *auth = req->rq_task->tk_auth; | 322 | struct rpc_auth *auth = req->rq_task->tk_auth; |
| 323 | unsigned int replen; | 323 | unsigned int replen; |
| @@ -339,7 +339,7 @@ nfs3_xdr_readargs(struct rpc_rqst *req, u32 *p, struct nfs_readargs *args) | |||
| 339 | * Write arguments. Splice the buffer to be written into the iovec. | 339 | * Write arguments. Splice the buffer to be written into the iovec. |
| 340 | */ | 340 | */ |
| 341 | static int | 341 | static int |
| 342 | nfs3_xdr_writeargs(struct rpc_rqst *req, u32 *p, struct nfs_writeargs *args) | 342 | nfs3_xdr_writeargs(struct rpc_rqst *req, __be32 *p, struct nfs_writeargs *args) |
| 343 | { | 343 | { |
| 344 | struct xdr_buf *sndbuf = &req->rq_snd_buf; | 344 | struct xdr_buf *sndbuf = &req->rq_snd_buf; |
| 345 | u32 count = args->count; | 345 | u32 count = args->count; |
| @@ -360,7 +360,7 @@ nfs3_xdr_writeargs(struct rpc_rqst *req, u32 *p, struct nfs_writeargs *args) | |||
| 360 | * Encode CREATE arguments | 360 | * Encode CREATE arguments |
| 361 | */ | 361 | */ |
| 362 | static int | 362 | static int |
| 363 | nfs3_xdr_createargs(struct rpc_rqst *req, u32 *p, struct nfs3_createargs *args) | 363 | nfs3_xdr_createargs(struct rpc_rqst *req, __be32 *p, struct nfs3_createargs *args) |
| 364 | { | 364 | { |
| 365 | p = xdr_encode_fhandle(p, args->fh); | 365 | p = xdr_encode_fhandle(p, args->fh); |
| 366 | p = xdr_encode_array(p, args->name, args->len); | 366 | p = xdr_encode_array(p, args->name, args->len); |
| @@ -380,7 +380,7 @@ nfs3_xdr_createargs(struct rpc_rqst *req, u32 *p, struct nfs3_createargs *args) | |||
| 380 | * Encode MKDIR arguments | 380 | * Encode MKDIR arguments |
| 381 | */ | 381 | */ |
| 382 | static int | 382 | static int |
| 383 | nfs3_xdr_mkdirargs(struct rpc_rqst *req, u32 *p, struct nfs3_mkdirargs *args) | 383 | nfs3_xdr_mkdirargs(struct rpc_rqst *req, __be32 *p, struct nfs3_mkdirargs *args) |
| 384 | { | 384 | { |
| 385 | p = xdr_encode_fhandle(p, args->fh); | 385 | p = xdr_encode_fhandle(p, args->fh); |
| 386 | p = xdr_encode_array(p, args->name, args->len); | 386 | p = xdr_encode_array(p, args->name, args->len); |
| @@ -393,7 +393,7 @@ nfs3_xdr_mkdirargs(struct rpc_rqst *req, u32 *p, struct nfs3_mkdirargs *args) | |||
| 393 | * Encode SYMLINK arguments | 393 | * Encode SYMLINK arguments |
| 394 | */ | 394 | */ |
| 395 | static int | 395 | static int |
| 396 | nfs3_xdr_symlinkargs(struct rpc_rqst *req, u32 *p, struct nfs3_symlinkargs *args) | 396 | nfs3_xdr_symlinkargs(struct rpc_rqst *req, __be32 *p, struct nfs3_symlinkargs *args) |
| 397 | { | 397 | { |
| 398 | p = xdr_encode_fhandle(p, args->fromfh); | 398 | p = xdr_encode_fhandle(p, args->fromfh); |
| 399 | p = xdr_encode_array(p, args->fromname, args->fromlen); | 399 | p = xdr_encode_array(p, args->fromname, args->fromlen); |
| @@ -410,7 +410,7 @@ nfs3_xdr_symlinkargs(struct rpc_rqst *req, u32 *p, struct nfs3_symlinkargs *args | |||
| 410 | * Encode MKNOD arguments | 410 | * Encode MKNOD arguments |
| 411 | */ | 411 | */ |
| 412 | static int | 412 | static int |
| 413 | nfs3_xdr_mknodargs(struct rpc_rqst *req, u32 *p, struct nfs3_mknodargs *args) | 413 | nfs3_xdr_mknodargs(struct rpc_rqst *req, __be32 *p, struct nfs3_mknodargs *args) |
| 414 | { | 414 | { |
| 415 | p = xdr_encode_fhandle(p, args->fh); | 415 | p = xdr_encode_fhandle(p, args->fh); |
| 416 | p = xdr_encode_array(p, args->name, args->len); | 416 | p = xdr_encode_array(p, args->name, args->len); |
| @@ -429,7 +429,7 @@ nfs3_xdr_mknodargs(struct rpc_rqst *req, u32 *p, struct nfs3_mknodargs *args) | |||
| 429 | * Encode RENAME arguments | 429 | * Encode RENAME arguments |
| 430 | */ | 430 | */ |
| 431 | static int | 431 | static int |
| 432 | nfs3_xdr_renameargs(struct rpc_rqst *req, u32 *p, struct nfs3_renameargs *args) | 432 | nfs3_xdr_renameargs(struct rpc_rqst *req, __be32 *p, struct nfs3_renameargs *args) |
| 433 | { | 433 | { |
| 434 | p = xdr_encode_fhandle(p, args->fromfh); | 434 | p = xdr_encode_fhandle(p, args->fromfh); |
| 435 | p = xdr_encode_array(p, args->fromname, args->fromlen); | 435 | p = xdr_encode_array(p, args->fromname, args->fromlen); |
| @@ -443,7 +443,7 @@ nfs3_xdr_renameargs(struct rpc_rqst *req, u32 *p, struct nfs3_renameargs *args) | |||
| 443 | * Encode LINK arguments | 443 | * Encode LINK arguments |
| 444 | */ | 444 | */ |
| 445 | static int | 445 | static int |
| 446 | nfs3_xdr_linkargs(struct rpc_rqst *req, u32 *p, struct nfs3_linkargs *args) | 446 | nfs3_xdr_linkargs(struct rpc_rqst *req, __be32 *p, struct nfs3_linkargs *args) |
| 447 | { | 447 | { |
| 448 | p = xdr_encode_fhandle(p, args->fromfh); | 448 | p = xdr_encode_fhandle(p, args->fromfh); |
| 449 | p = xdr_encode_fhandle(p, args->tofh); | 449 | p = xdr_encode_fhandle(p, args->tofh); |
| @@ -456,7 +456,7 @@ nfs3_xdr_linkargs(struct rpc_rqst *req, u32 *p, struct nfs3_linkargs *args) | |||
| 456 | * Encode arguments to readdir call | 456 | * Encode arguments to readdir call |
| 457 | */ | 457 | */ |
| 458 | static int | 458 | static int |
| 459 | nfs3_xdr_readdirargs(struct rpc_rqst *req, u32 *p, struct nfs3_readdirargs *args) | 459 | nfs3_xdr_readdirargs(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirargs *args) |
| 460 | { | 460 | { |
| 461 | struct rpc_auth *auth = req->rq_task->tk_auth; | 461 | struct rpc_auth *auth = req->rq_task->tk_auth; |
| 462 | unsigned int replen; | 462 | unsigned int replen; |
| @@ -485,7 +485,7 @@ nfs3_xdr_readdirargs(struct rpc_rqst *req, u32 *p, struct nfs3_readdirargs *args | |||
| 485 | * We just check for syntactical correctness. | 485 | * We just check for syntactical correctness. |
| 486 | */ | 486 | */ |
| 487 | static int | 487 | static int |
| 488 | nfs3_xdr_readdirres(struct rpc_rqst *req, u32 *p, struct nfs3_readdirres *res) | 488 | nfs3_xdr_readdirres(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirres *res) |
| 489 | { | 489 | { |
| 490 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; | 490 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; |
| 491 | struct kvec *iov = rcvbuf->head; | 491 | struct kvec *iov = rcvbuf->head; |
| @@ -493,7 +493,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, u32 *p, struct nfs3_readdirres *res) | |||
| 493 | int hdrlen, recvd; | 493 | int hdrlen, recvd; |
| 494 | int status, nr; | 494 | int status, nr; |
| 495 | unsigned int len, pglen; | 495 | unsigned int len, pglen; |
| 496 | u32 *entry, *end, *kaddr; | 496 | __be32 *entry, *end, *kaddr; |
| 497 | 497 | ||
| 498 | status = ntohl(*p++); | 498 | status = ntohl(*p++); |
| 499 | /* Decode post_op_attrs */ | 499 | /* Decode post_op_attrs */ |
| @@ -523,8 +523,8 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, u32 *p, struct nfs3_readdirres *res) | |||
| 523 | if (pglen > recvd) | 523 | if (pglen > recvd) |
| 524 | pglen = recvd; | 524 | pglen = recvd; |
| 525 | page = rcvbuf->pages; | 525 | page = rcvbuf->pages; |
| 526 | kaddr = p = (u32 *)kmap_atomic(*page, KM_USER0); | 526 | kaddr = p = kmap_atomic(*page, KM_USER0); |
| 527 | end = (u32 *)((char *)p + pglen); | 527 | end = (__be32 *)((char *)p + pglen); |
| 528 | entry = p; | 528 | entry = p; |
| 529 | for (nr = 0; *p++; nr++) { | 529 | for (nr = 0; *p++; nr++) { |
| 530 | if (p + 3 > end) | 530 | if (p + 3 > end) |
| @@ -583,8 +583,8 @@ err_unmap: | |||
| 583 | goto out; | 583 | goto out; |
| 584 | } | 584 | } |
| 585 | 585 | ||
| 586 | u32 * | 586 | __be32 * |
| 587 | nfs3_decode_dirent(u32 *p, struct nfs_entry *entry, int plus) | 587 | nfs3_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus) |
| 588 | { | 588 | { |
| 589 | struct nfs_entry old = *entry; | 589 | struct nfs_entry old = *entry; |
| 590 | 590 | ||
| @@ -626,7 +626,7 @@ nfs3_decode_dirent(u32 *p, struct nfs_entry *entry, int plus) | |||
| 626 | * Encode COMMIT arguments | 626 | * Encode COMMIT arguments |
| 627 | */ | 627 | */ |
| 628 | static int | 628 | static int |
| 629 | nfs3_xdr_commitargs(struct rpc_rqst *req, u32 *p, struct nfs_writeargs *args) | 629 | nfs3_xdr_commitargs(struct rpc_rqst *req, __be32 *p, struct nfs_writeargs *args) |
| 630 | { | 630 | { |
| 631 | p = xdr_encode_fhandle(p, args->fh); | 631 | p = xdr_encode_fhandle(p, args->fh); |
| 632 | p = xdr_encode_hyper(p, args->offset); | 632 | p = xdr_encode_hyper(p, args->offset); |
| @@ -640,7 +640,7 @@ nfs3_xdr_commitargs(struct rpc_rqst *req, u32 *p, struct nfs_writeargs *args) | |||
| 640 | * Encode GETACL arguments | 640 | * Encode GETACL arguments |
| 641 | */ | 641 | */ |
| 642 | static int | 642 | static int |
| 643 | nfs3_xdr_getaclargs(struct rpc_rqst *req, u32 *p, | 643 | nfs3_xdr_getaclargs(struct rpc_rqst *req, __be32 *p, |
| 644 | struct nfs3_getaclargs *args) | 644 | struct nfs3_getaclargs *args) |
| 645 | { | 645 | { |
| 646 | struct rpc_auth *auth = req->rq_task->tk_auth; | 646 | struct rpc_auth *auth = req->rq_task->tk_auth; |
| @@ -664,7 +664,7 @@ nfs3_xdr_getaclargs(struct rpc_rqst *req, u32 *p, | |||
| 664 | * Encode SETACL arguments | 664 | * Encode SETACL arguments |
| 665 | */ | 665 | */ |
| 666 | static int | 666 | static int |
| 667 | nfs3_xdr_setaclargs(struct rpc_rqst *req, u32 *p, | 667 | nfs3_xdr_setaclargs(struct rpc_rqst *req, __be32 *p, |
| 668 | struct nfs3_setaclargs *args) | 668 | struct nfs3_setaclargs *args) |
| 669 | { | 669 | { |
| 670 | struct xdr_buf *buf = &req->rq_snd_buf; | 670 | struct xdr_buf *buf = &req->rq_snd_buf; |
| @@ -711,7 +711,7 @@ nfs3_xdr_setaclargs(struct rpc_rqst *req, u32 *p, | |||
| 711 | * Decode attrstat reply. | 711 | * Decode attrstat reply. |
| 712 | */ | 712 | */ |
| 713 | static int | 713 | static int |
| 714 | nfs3_xdr_attrstat(struct rpc_rqst *req, u32 *p, struct nfs_fattr *fattr) | 714 | nfs3_xdr_attrstat(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr) |
| 715 | { | 715 | { |
| 716 | int status; | 716 | int status; |
| 717 | 717 | ||
| @@ -726,7 +726,7 @@ nfs3_xdr_attrstat(struct rpc_rqst *req, u32 *p, struct nfs_fattr *fattr) | |||
| 726 | * SATTR, REMOVE, RMDIR | 726 | * SATTR, REMOVE, RMDIR |
| 727 | */ | 727 | */ |
| 728 | static int | 728 | static int |
| 729 | nfs3_xdr_wccstat(struct rpc_rqst *req, u32 *p, struct nfs_fattr *fattr) | 729 | nfs3_xdr_wccstat(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr) |
| 730 | { | 730 | { |
| 731 | int status; | 731 | int status; |
| 732 | 732 | ||
| @@ -740,7 +740,7 @@ nfs3_xdr_wccstat(struct rpc_rqst *req, u32 *p, struct nfs_fattr *fattr) | |||
| 740 | * Decode LOOKUP reply | 740 | * Decode LOOKUP reply |
| 741 | */ | 741 | */ |
| 742 | static int | 742 | static int |
| 743 | nfs3_xdr_lookupres(struct rpc_rqst *req, u32 *p, struct nfs3_diropres *res) | 743 | nfs3_xdr_lookupres(struct rpc_rqst *req, __be32 *p, struct nfs3_diropres *res) |
| 744 | { | 744 | { |
| 745 | int status; | 745 | int status; |
| 746 | 746 | ||
| @@ -759,7 +759,7 @@ nfs3_xdr_lookupres(struct rpc_rqst *req, u32 *p, struct nfs3_diropres *res) | |||
| 759 | * Decode ACCESS reply | 759 | * Decode ACCESS reply |
| 760 | */ | 760 | */ |
| 761 | static int | 761 | static int |
| 762 | nfs3_xdr_accessres(struct rpc_rqst *req, u32 *p, struct nfs3_accessres *res) | 762 | nfs3_xdr_accessres(struct rpc_rqst *req, __be32 *p, struct nfs3_accessres *res) |
| 763 | { | 763 | { |
| 764 | int status = ntohl(*p++); | 764 | int status = ntohl(*p++); |
| 765 | 765 | ||
| @@ -771,7 +771,7 @@ nfs3_xdr_accessres(struct rpc_rqst *req, u32 *p, struct nfs3_accessres *res) | |||
| 771 | } | 771 | } |
| 772 | 772 | ||
| 773 | static int | 773 | static int |
| 774 | nfs3_xdr_readlinkargs(struct rpc_rqst *req, u32 *p, struct nfs3_readlinkargs *args) | 774 | nfs3_xdr_readlinkargs(struct rpc_rqst *req, __be32 *p, struct nfs3_readlinkargs *args) |
| 775 | { | 775 | { |
| 776 | struct rpc_auth *auth = req->rq_task->tk_auth; | 776 | struct rpc_auth *auth = req->rq_task->tk_auth; |
| 777 | unsigned int replen; | 777 | unsigned int replen; |
| @@ -789,7 +789,7 @@ nfs3_xdr_readlinkargs(struct rpc_rqst *req, u32 *p, struct nfs3_readlinkargs *ar | |||
| 789 | * Decode READLINK reply | 789 | * Decode READLINK reply |
| 790 | */ | 790 | */ |
| 791 | static int | 791 | static int |
| 792 | nfs3_xdr_readlinkres(struct rpc_rqst *req, u32 *p, struct nfs_fattr *fattr) | 792 | nfs3_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr) |
| 793 | { | 793 | { |
| 794 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; | 794 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; |
| 795 | struct kvec *iov = rcvbuf->head; | 795 | struct kvec *iov = rcvbuf->head; |
| @@ -837,7 +837,7 @@ nfs3_xdr_readlinkres(struct rpc_rqst *req, u32 *p, struct nfs_fattr *fattr) | |||
| 837 | * Decode READ reply | 837 | * Decode READ reply |
| 838 | */ | 838 | */ |
| 839 | static int | 839 | static int |
| 840 | nfs3_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res) | 840 | nfs3_xdr_readres(struct rpc_rqst *req, __be32 *p, struct nfs_readres *res) |
| 841 | { | 841 | { |
| 842 | struct kvec *iov = req->rq_rcv_buf.head; | 842 | struct kvec *iov = req->rq_rcv_buf.head; |
| 843 | int status, count, ocount, recvd, hdrlen; | 843 | int status, count, ocount, recvd, hdrlen; |
| @@ -888,7 +888,7 @@ nfs3_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res) | |||
| 888 | * Decode WRITE response | 888 | * Decode WRITE response |
| 889 | */ | 889 | */ |
| 890 | static int | 890 | static int |
| 891 | nfs3_xdr_writeres(struct rpc_rqst *req, u32 *p, struct nfs_writeres *res) | 891 | nfs3_xdr_writeres(struct rpc_rqst *req, __be32 *p, struct nfs_writeres *res) |
| 892 | { | 892 | { |
| 893 | int status; | 893 | int status; |
| 894 | 894 | ||
| @@ -910,7 +910,7 @@ nfs3_xdr_writeres(struct rpc_rqst *req, u32 *p, struct nfs_writeres *res) | |||
| 910 | * Decode a CREATE response | 910 | * Decode a CREATE response |
| 911 | */ | 911 | */ |
| 912 | static int | 912 | static int |
| 913 | nfs3_xdr_createres(struct rpc_rqst *req, u32 *p, struct nfs3_diropres *res) | 913 | nfs3_xdr_createres(struct rpc_rqst *req, __be32 *p, struct nfs3_diropres *res) |
| 914 | { | 914 | { |
| 915 | int status; | 915 | int status; |
| 916 | 916 | ||
| @@ -937,7 +937,7 @@ nfs3_xdr_createres(struct rpc_rqst *req, u32 *p, struct nfs3_diropres *res) | |||
| 937 | * Decode RENAME reply | 937 | * Decode RENAME reply |
| 938 | */ | 938 | */ |
| 939 | static int | 939 | static int |
| 940 | nfs3_xdr_renameres(struct rpc_rqst *req, u32 *p, struct nfs3_renameres *res) | 940 | nfs3_xdr_renameres(struct rpc_rqst *req, __be32 *p, struct nfs3_renameres *res) |
| 941 | { | 941 | { |
| 942 | int status; | 942 | int status; |
| 943 | 943 | ||
| @@ -952,7 +952,7 @@ nfs3_xdr_renameres(struct rpc_rqst *req, u32 *p, struct nfs3_renameres *res) | |||
| 952 | * Decode LINK reply | 952 | * Decode LINK reply |
| 953 | */ | 953 | */ |
| 954 | static int | 954 | static int |
| 955 | nfs3_xdr_linkres(struct rpc_rqst *req, u32 *p, struct nfs3_linkres *res) | 955 | nfs3_xdr_linkres(struct rpc_rqst *req, __be32 *p, struct nfs3_linkres *res) |
| 956 | { | 956 | { |
| 957 | int status; | 957 | int status; |
| 958 | 958 | ||
| @@ -967,7 +967,7 @@ nfs3_xdr_linkres(struct rpc_rqst *req, u32 *p, struct nfs3_linkres *res) | |||
| 967 | * Decode FSSTAT reply | 967 | * Decode FSSTAT reply |
| 968 | */ | 968 | */ |
| 969 | static int | 969 | static int |
| 970 | nfs3_xdr_fsstatres(struct rpc_rqst *req, u32 *p, struct nfs_fsstat *res) | 970 | nfs3_xdr_fsstatres(struct rpc_rqst *req, __be32 *p, struct nfs_fsstat *res) |
| 971 | { | 971 | { |
| 972 | int status; | 972 | int status; |
| 973 | 973 | ||
| @@ -992,7 +992,7 @@ nfs3_xdr_fsstatres(struct rpc_rqst *req, u32 *p, struct nfs_fsstat *res) | |||
| 992 | * Decode FSINFO reply | 992 | * Decode FSINFO reply |
| 993 | */ | 993 | */ |
| 994 | static int | 994 | static int |
| 995 | nfs3_xdr_fsinfores(struct rpc_rqst *req, u32 *p, struct nfs_fsinfo *res) | 995 | nfs3_xdr_fsinfores(struct rpc_rqst *req, __be32 *p, struct nfs_fsinfo *res) |
| 996 | { | 996 | { |
| 997 | int status; | 997 | int status; |
| 998 | 998 | ||
| @@ -1020,7 +1020,7 @@ nfs3_xdr_fsinfores(struct rpc_rqst *req, u32 *p, struct nfs_fsinfo *res) | |||
| 1020 | * Decode PATHCONF reply | 1020 | * Decode PATHCONF reply |
| 1021 | */ | 1021 | */ |
| 1022 | static int | 1022 | static int |
| 1023 | nfs3_xdr_pathconfres(struct rpc_rqst *req, u32 *p, struct nfs_pathconf *res) | 1023 | nfs3_xdr_pathconfres(struct rpc_rqst *req, __be32 *p, struct nfs_pathconf *res) |
| 1024 | { | 1024 | { |
| 1025 | int status; | 1025 | int status; |
| 1026 | 1026 | ||
| @@ -1040,7 +1040,7 @@ nfs3_xdr_pathconfres(struct rpc_rqst *req, u32 *p, struct nfs_pathconf *res) | |||
| 1040 | * Decode COMMIT reply | 1040 | * Decode COMMIT reply |
| 1041 | */ | 1041 | */ |
| 1042 | static int | 1042 | static int |
| 1043 | nfs3_xdr_commitres(struct rpc_rqst *req, u32 *p, struct nfs_writeres *res) | 1043 | nfs3_xdr_commitres(struct rpc_rqst *req, __be32 *p, struct nfs_writeres *res) |
| 1044 | { | 1044 | { |
| 1045 | int status; | 1045 | int status; |
| 1046 | 1046 | ||
| @@ -1059,7 +1059,7 @@ nfs3_xdr_commitres(struct rpc_rqst *req, u32 *p, struct nfs_writeres *res) | |||
| 1059 | * Decode GETACL reply | 1059 | * Decode GETACL reply |
| 1060 | */ | 1060 | */ |
| 1061 | static int | 1061 | static int |
| 1062 | nfs3_xdr_getaclres(struct rpc_rqst *req, u32 *p, | 1062 | nfs3_xdr_getaclres(struct rpc_rqst *req, __be32 *p, |
| 1063 | struct nfs3_getaclres *res) | 1063 | struct nfs3_getaclres *res) |
| 1064 | { | 1064 | { |
| 1065 | struct xdr_buf *buf = &req->rq_rcv_buf; | 1065 | struct xdr_buf *buf = &req->rq_rcv_buf; |
| @@ -1091,7 +1091,7 @@ nfs3_xdr_getaclres(struct rpc_rqst *req, u32 *p, | |||
| 1091 | * Decode setacl reply. | 1091 | * Decode setacl reply. |
| 1092 | */ | 1092 | */ |
| 1093 | static int | 1093 | static int |
| 1094 | nfs3_xdr_setaclres(struct rpc_rqst *req, u32 *p, struct nfs_fattr *fattr) | 1094 | nfs3_xdr_setaclres(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr) |
| 1095 | { | 1095 | { |
| 1096 | int status = ntohl(*p++); | 1096 | int status = ntohl(*p++); |
| 1097 | 1097 | ||
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 61095fe4b5ca..6f346677332d 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h | |||
| @@ -212,7 +212,7 @@ extern void nfs_free_seqid(struct nfs_seqid *seqid); | |||
| 212 | extern const nfs4_stateid zero_stateid; | 212 | extern const nfs4_stateid zero_stateid; |
| 213 | 213 | ||
| 214 | /* nfs4xdr.c */ | 214 | /* nfs4xdr.c */ |
| 215 | extern uint32_t *nfs4_decode_dirent(uint32_t *p, struct nfs_entry *entry, int plus); | 215 | extern __be32 *nfs4_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus); |
| 216 | extern struct rpc_procinfo nfs4_procedures[]; | 216 | extern struct rpc_procinfo nfs4_procedures[]; |
| 217 | 217 | ||
| 218 | struct nfs4_mount_data; | 218 | struct nfs4_mount_data; |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 47c7e6e3910d..8118036cc449 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -138,10 +138,10 @@ const u32 nfs4_fs_locations_bitmap[2] = { | |||
| 138 | | FATTR4_WORD1_MOUNTED_ON_FILEID | 138 | | FATTR4_WORD1_MOUNTED_ON_FILEID |
| 139 | }; | 139 | }; |
| 140 | 140 | ||
| 141 | static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry, | 141 | static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dentry, |
| 142 | struct nfs4_readdir_arg *readdir) | 142 | struct nfs4_readdir_arg *readdir) |
| 143 | { | 143 | { |
| 144 | u32 *start, *p; | 144 | __be32 *start, *p; |
| 145 | 145 | ||
| 146 | BUG_ON(readdir->count < 80); | 146 | BUG_ON(readdir->count < 80); |
| 147 | if (cookie > 2) { | 147 | if (cookie > 2) { |
| @@ -162,7 +162,7 @@ static void nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry, | |||
| 162 | * when talking to the server, we always send cookie 0 | 162 | * when talking to the server, we always send cookie 0 |
| 163 | * instead of 1 or 2. | 163 | * instead of 1 or 2. |
| 164 | */ | 164 | */ |
| 165 | start = p = (u32 *)kmap_atomic(*readdir->pages, KM_USER0); | 165 | start = p = kmap_atomic(*readdir->pages, KM_USER0); |
| 166 | 166 | ||
| 167 | if (cookie == 0) { | 167 | if (cookie == 0) { |
| 168 | *p++ = xdr_one; /* next */ | 168 | *p++ = xdr_one; /* next */ |
| @@ -1314,11 +1314,9 @@ nfs4_open_revalidate(struct inode *dir, struct dentry *dentry, int openflags, st | |||
| 1314 | case -EROFS: | 1314 | case -EROFS: |
| 1315 | lookup_instantiate_filp(nd, (struct dentry *)state, NULL); | 1315 | lookup_instantiate_filp(nd, (struct dentry *)state, NULL); |
| 1316 | return 1; | 1316 | return 1; |
| 1317 | case -ENOENT: | 1317 | default: |
| 1318 | if (dentry->d_inode == NULL) | 1318 | goto out_drop; |
| 1319 | return 1; | ||
| 1320 | } | 1319 | } |
| 1321 | goto out_drop; | ||
| 1322 | } | 1320 | } |
| 1323 | if (state->inode == dentry->d_inode) { | 1321 | if (state->inode == dentry->d_inode) { |
| 1324 | nfs4_intent_set_file(nd, dentry, state); | 1322 | nfs4_intent_set_file(nd, dentry, state); |
| @@ -2917,11 +2915,11 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, unsigned short po | |||
| 2917 | .rpc_resp = clp, | 2915 | .rpc_resp = clp, |
| 2918 | .rpc_cred = cred, | 2916 | .rpc_cred = cred, |
| 2919 | }; | 2917 | }; |
| 2920 | u32 *p; | 2918 | __be32 *p; |
| 2921 | int loop = 0; | 2919 | int loop = 0; |
| 2922 | int status; | 2920 | int status; |
| 2923 | 2921 | ||
| 2924 | p = (u32*)sc_verifier.data; | 2922 | p = (__be32*)sc_verifier.data; |
| 2925 | *p++ = htonl((u32)clp->cl_boot_time.tv_sec); | 2923 | *p++ = htonl((u32)clp->cl_boot_time.tv_sec); |
| 2926 | *p = htonl((u32)clp->cl_boot_time.tv_nsec); | 2924 | *p = htonl((u32)clp->cl_boot_time.tv_nsec); |
| 2927 | 2925 | ||
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 3dd413f52da1..0cf3fa312a33 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
| @@ -471,7 +471,7 @@ struct compound_hdr { | |||
| 471 | 471 | ||
| 472 | static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *str) | 472 | static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *str) |
| 473 | { | 473 | { |
| 474 | uint32_t *p; | 474 | __be32 *p; |
| 475 | 475 | ||
| 476 | p = xdr_reserve_space(xdr, 4 + len); | 476 | p = xdr_reserve_space(xdr, 4 + len); |
| 477 | BUG_ON(p == NULL); | 477 | BUG_ON(p == NULL); |
| @@ -480,7 +480,7 @@ static void encode_string(struct xdr_stream *xdr, unsigned int len, const char * | |||
| 480 | 480 | ||
| 481 | static int encode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) | 481 | static int encode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) |
| 482 | { | 482 | { |
| 483 | uint32_t *p; | 483 | __be32 *p; |
| 484 | 484 | ||
| 485 | dprintk("encode_compound: tag=%.*s\n", (int)hdr->taglen, hdr->tag); | 485 | dprintk("encode_compound: tag=%.*s\n", (int)hdr->taglen, hdr->tag); |
| 486 | BUG_ON(hdr->taglen > NFS4_MAXTAGLEN); | 486 | BUG_ON(hdr->taglen > NFS4_MAXTAGLEN); |
| @@ -494,7 +494,7 @@ static int encode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) | |||
| 494 | 494 | ||
| 495 | static void encode_nfs4_verifier(struct xdr_stream *xdr, const nfs4_verifier *verf) | 495 | static void encode_nfs4_verifier(struct xdr_stream *xdr, const nfs4_verifier *verf) |
| 496 | { | 496 | { |
| 497 | uint32_t *p; | 497 | __be32 *p; |
| 498 | 498 | ||
| 499 | p = xdr_reserve_space(xdr, NFS4_VERIFIER_SIZE); | 499 | p = xdr_reserve_space(xdr, NFS4_VERIFIER_SIZE); |
| 500 | BUG_ON(p == NULL); | 500 | BUG_ON(p == NULL); |
| @@ -507,8 +507,8 @@ static int encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const s | |||
| 507 | char owner_group[IDMAP_NAMESZ]; | 507 | char owner_group[IDMAP_NAMESZ]; |
| 508 | int owner_namelen = 0; | 508 | int owner_namelen = 0; |
| 509 | int owner_grouplen = 0; | 509 | int owner_grouplen = 0; |
| 510 | uint32_t *p; | 510 | __be32 *p; |
| 511 | uint32_t *q; | 511 | __be32 *q; |
| 512 | int len; | 512 | int len; |
| 513 | uint32_t bmval0 = 0; | 513 | uint32_t bmval0 = 0; |
| 514 | uint32_t bmval1 = 0; | 514 | uint32_t bmval1 = 0; |
| @@ -630,7 +630,7 @@ static int encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const s | |||
| 630 | 630 | ||
| 631 | static int encode_access(struct xdr_stream *xdr, u32 access) | 631 | static int encode_access(struct xdr_stream *xdr, u32 access) |
| 632 | { | 632 | { |
| 633 | uint32_t *p; | 633 | __be32 *p; |
| 634 | 634 | ||
| 635 | RESERVE_SPACE(8); | 635 | RESERVE_SPACE(8); |
| 636 | WRITE32(OP_ACCESS); | 636 | WRITE32(OP_ACCESS); |
| @@ -641,7 +641,7 @@ static int encode_access(struct xdr_stream *xdr, u32 access) | |||
| 641 | 641 | ||
| 642 | static int encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg) | 642 | static int encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg) |
| 643 | { | 643 | { |
| 644 | uint32_t *p; | 644 | __be32 *p; |
| 645 | 645 | ||
| 646 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); | 646 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); |
| 647 | WRITE32(OP_CLOSE); | 647 | WRITE32(OP_CLOSE); |
| @@ -653,7 +653,7 @@ static int encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg) | |||
| 653 | 653 | ||
| 654 | static int encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *args) | 654 | static int encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *args) |
| 655 | { | 655 | { |
| 656 | uint32_t *p; | 656 | __be32 *p; |
| 657 | 657 | ||
| 658 | RESERVE_SPACE(16); | 658 | RESERVE_SPACE(16); |
| 659 | WRITE32(OP_COMMIT); | 659 | WRITE32(OP_COMMIT); |
| @@ -665,7 +665,7 @@ static int encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *arg | |||
| 665 | 665 | ||
| 666 | static int encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *create) | 666 | static int encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *create) |
| 667 | { | 667 | { |
| 668 | uint32_t *p; | 668 | __be32 *p; |
| 669 | 669 | ||
| 670 | RESERVE_SPACE(8); | 670 | RESERVE_SPACE(8); |
| 671 | WRITE32(OP_CREATE); | 671 | WRITE32(OP_CREATE); |
| @@ -697,7 +697,7 @@ static int encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *c | |||
| 697 | 697 | ||
| 698 | static int encode_getattr_one(struct xdr_stream *xdr, uint32_t bitmap) | 698 | static int encode_getattr_one(struct xdr_stream *xdr, uint32_t bitmap) |
| 699 | { | 699 | { |
| 700 | uint32_t *p; | 700 | __be32 *p; |
| 701 | 701 | ||
| 702 | RESERVE_SPACE(12); | 702 | RESERVE_SPACE(12); |
| 703 | WRITE32(OP_GETATTR); | 703 | WRITE32(OP_GETATTR); |
| @@ -708,7 +708,7 @@ static int encode_getattr_one(struct xdr_stream *xdr, uint32_t bitmap) | |||
| 708 | 708 | ||
| 709 | static int encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm1) | 709 | static int encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm1) |
| 710 | { | 710 | { |
| 711 | uint32_t *p; | 711 | __be32 *p; |
| 712 | 712 | ||
| 713 | RESERVE_SPACE(16); | 713 | RESERVE_SPACE(16); |
| 714 | WRITE32(OP_GETATTR); | 714 | WRITE32(OP_GETATTR); |
| @@ -740,7 +740,7 @@ static int encode_fs_locations(struct xdr_stream *xdr, const u32* bitmask) | |||
| 740 | 740 | ||
| 741 | static int encode_getfh(struct xdr_stream *xdr) | 741 | static int encode_getfh(struct xdr_stream *xdr) |
| 742 | { | 742 | { |
| 743 | uint32_t *p; | 743 | __be32 *p; |
| 744 | 744 | ||
| 745 | RESERVE_SPACE(4); | 745 | RESERVE_SPACE(4); |
| 746 | WRITE32(OP_GETFH); | 746 | WRITE32(OP_GETFH); |
| @@ -750,7 +750,7 @@ static int encode_getfh(struct xdr_stream *xdr) | |||
| 750 | 750 | ||
| 751 | static int encode_link(struct xdr_stream *xdr, const struct qstr *name) | 751 | static int encode_link(struct xdr_stream *xdr, const struct qstr *name) |
| 752 | { | 752 | { |
| 753 | uint32_t *p; | 753 | __be32 *p; |
| 754 | 754 | ||
| 755 | RESERVE_SPACE(8 + name->len); | 755 | RESERVE_SPACE(8 + name->len); |
| 756 | WRITE32(OP_LINK); | 756 | WRITE32(OP_LINK); |
| @@ -780,7 +780,7 @@ static inline uint64_t nfs4_lock_length(struct file_lock *fl) | |||
| 780 | */ | 780 | */ |
| 781 | static int encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args) | 781 | static int encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args) |
| 782 | { | 782 | { |
| 783 | uint32_t *p; | 783 | __be32 *p; |
| 784 | 784 | ||
| 785 | RESERVE_SPACE(32); | 785 | RESERVE_SPACE(32); |
| 786 | WRITE32(OP_LOCK); | 786 | WRITE32(OP_LOCK); |
| @@ -809,7 +809,7 @@ static int encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args) | |||
| 809 | 809 | ||
| 810 | static int encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *args) | 810 | static int encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *args) |
| 811 | { | 811 | { |
| 812 | uint32_t *p; | 812 | __be32 *p; |
| 813 | 813 | ||
| 814 | RESERVE_SPACE(40); | 814 | RESERVE_SPACE(40); |
| 815 | WRITE32(OP_LOCKT); | 815 | WRITE32(OP_LOCKT); |
| @@ -825,7 +825,7 @@ static int encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *arg | |||
| 825 | 825 | ||
| 826 | static int encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *args) | 826 | static int encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *args) |
| 827 | { | 827 | { |
| 828 | uint32_t *p; | 828 | __be32 *p; |
| 829 | 829 | ||
| 830 | RESERVE_SPACE(44); | 830 | RESERVE_SPACE(44); |
| 831 | WRITE32(OP_LOCKU); | 831 | WRITE32(OP_LOCKU); |
| @@ -841,7 +841,7 @@ static int encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *arg | |||
| 841 | static int encode_lookup(struct xdr_stream *xdr, const struct qstr *name) | 841 | static int encode_lookup(struct xdr_stream *xdr, const struct qstr *name) |
| 842 | { | 842 | { |
| 843 | int len = name->len; | 843 | int len = name->len; |
| 844 | uint32_t *p; | 844 | __be32 *p; |
| 845 | 845 | ||
| 846 | RESERVE_SPACE(8 + len); | 846 | RESERVE_SPACE(8 + len); |
| 847 | WRITE32(OP_LOOKUP); | 847 | WRITE32(OP_LOOKUP); |
| @@ -853,7 +853,7 @@ static int encode_lookup(struct xdr_stream *xdr, const struct qstr *name) | |||
| 853 | 853 | ||
| 854 | static void encode_share_access(struct xdr_stream *xdr, int open_flags) | 854 | static void encode_share_access(struct xdr_stream *xdr, int open_flags) |
| 855 | { | 855 | { |
| 856 | uint32_t *p; | 856 | __be32 *p; |
| 857 | 857 | ||
| 858 | RESERVE_SPACE(8); | 858 | RESERVE_SPACE(8); |
| 859 | switch (open_flags & (FMODE_READ|FMODE_WRITE)) { | 859 | switch (open_flags & (FMODE_READ|FMODE_WRITE)) { |
| @@ -874,7 +874,7 @@ static void encode_share_access(struct xdr_stream *xdr, int open_flags) | |||
| 874 | 874 | ||
| 875 | static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_openargs *arg) | 875 | static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_openargs *arg) |
| 876 | { | 876 | { |
| 877 | uint32_t *p; | 877 | __be32 *p; |
| 878 | /* | 878 | /* |
| 879 | * opcode 4, seqid 4, share_access 4, share_deny 4, clientid 8, ownerlen 4, | 879 | * opcode 4, seqid 4, share_access 4, share_deny 4, clientid 8, ownerlen 4, |
| 880 | * owner 4 = 32 | 880 | * owner 4 = 32 |
| @@ -891,7 +891,7 @@ static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_opena | |||
| 891 | 891 | ||
| 892 | static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_openargs *arg) | 892 | static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_openargs *arg) |
| 893 | { | 893 | { |
| 894 | uint32_t *p; | 894 | __be32 *p; |
| 895 | 895 | ||
| 896 | RESERVE_SPACE(4); | 896 | RESERVE_SPACE(4); |
| 897 | switch(arg->open_flags & O_EXCL) { | 897 | switch(arg->open_flags & O_EXCL) { |
| @@ -907,7 +907,7 @@ static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_op | |||
| 907 | 907 | ||
| 908 | static void encode_opentype(struct xdr_stream *xdr, const struct nfs_openargs *arg) | 908 | static void encode_opentype(struct xdr_stream *xdr, const struct nfs_openargs *arg) |
| 909 | { | 909 | { |
| 910 | uint32_t *p; | 910 | __be32 *p; |
| 911 | 911 | ||
| 912 | RESERVE_SPACE(4); | 912 | RESERVE_SPACE(4); |
| 913 | switch (arg->open_flags & O_CREAT) { | 913 | switch (arg->open_flags & O_CREAT) { |
| @@ -923,7 +923,7 @@ static void encode_opentype(struct xdr_stream *xdr, const struct nfs_openargs *a | |||
| 923 | 923 | ||
| 924 | static inline void encode_delegation_type(struct xdr_stream *xdr, int delegation_type) | 924 | static inline void encode_delegation_type(struct xdr_stream *xdr, int delegation_type) |
| 925 | { | 925 | { |
| 926 | uint32_t *p; | 926 | __be32 *p; |
| 927 | 927 | ||
| 928 | RESERVE_SPACE(4); | 928 | RESERVE_SPACE(4); |
| 929 | switch (delegation_type) { | 929 | switch (delegation_type) { |
| @@ -943,7 +943,7 @@ static inline void encode_delegation_type(struct xdr_stream *xdr, int delegation | |||
| 943 | 943 | ||
| 944 | static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr *name) | 944 | static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr *name) |
| 945 | { | 945 | { |
| 946 | uint32_t *p; | 946 | __be32 *p; |
| 947 | 947 | ||
| 948 | RESERVE_SPACE(4); | 948 | RESERVE_SPACE(4); |
| 949 | WRITE32(NFS4_OPEN_CLAIM_NULL); | 949 | WRITE32(NFS4_OPEN_CLAIM_NULL); |
| @@ -952,7 +952,7 @@ static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr * | |||
| 952 | 952 | ||
| 953 | static inline void encode_claim_previous(struct xdr_stream *xdr, int type) | 953 | static inline void encode_claim_previous(struct xdr_stream *xdr, int type) |
| 954 | { | 954 | { |
| 955 | uint32_t *p; | 955 | __be32 *p; |
| 956 | 956 | ||
| 957 | RESERVE_SPACE(4); | 957 | RESERVE_SPACE(4); |
| 958 | WRITE32(NFS4_OPEN_CLAIM_PREVIOUS); | 958 | WRITE32(NFS4_OPEN_CLAIM_PREVIOUS); |
| @@ -961,7 +961,7 @@ static inline void encode_claim_previous(struct xdr_stream *xdr, int type) | |||
| 961 | 961 | ||
| 962 | static inline void encode_claim_delegate_cur(struct xdr_stream *xdr, const struct qstr *name, const nfs4_stateid *stateid) | 962 | static inline void encode_claim_delegate_cur(struct xdr_stream *xdr, const struct qstr *name, const nfs4_stateid *stateid) |
| 963 | { | 963 | { |
| 964 | uint32_t *p; | 964 | __be32 *p; |
| 965 | 965 | ||
| 966 | RESERVE_SPACE(4+sizeof(stateid->data)); | 966 | RESERVE_SPACE(4+sizeof(stateid->data)); |
| 967 | WRITE32(NFS4_OPEN_CLAIM_DELEGATE_CUR); | 967 | WRITE32(NFS4_OPEN_CLAIM_DELEGATE_CUR); |
| @@ -991,7 +991,7 @@ static int encode_open(struct xdr_stream *xdr, const struct nfs_openargs *arg) | |||
| 991 | 991 | ||
| 992 | static int encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_confirmargs *arg) | 992 | static int encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_confirmargs *arg) |
| 993 | { | 993 | { |
| 994 | uint32_t *p; | 994 | __be32 *p; |
| 995 | 995 | ||
| 996 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); | 996 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); |
| 997 | WRITE32(OP_OPEN_CONFIRM); | 997 | WRITE32(OP_OPEN_CONFIRM); |
| @@ -1003,7 +1003,7 @@ static int encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_con | |||
| 1003 | 1003 | ||
| 1004 | static int encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_closeargs *arg) | 1004 | static int encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_closeargs *arg) |
| 1005 | { | 1005 | { |
| 1006 | uint32_t *p; | 1006 | __be32 *p; |
| 1007 | 1007 | ||
| 1008 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); | 1008 | RESERVE_SPACE(8+sizeof(arg->stateid->data)); |
| 1009 | WRITE32(OP_OPEN_DOWNGRADE); | 1009 | WRITE32(OP_OPEN_DOWNGRADE); |
| @@ -1017,7 +1017,7 @@ static int | |||
| 1017 | encode_putfh(struct xdr_stream *xdr, const struct nfs_fh *fh) | 1017 | encode_putfh(struct xdr_stream *xdr, const struct nfs_fh *fh) |
| 1018 | { | 1018 | { |
| 1019 | int len = fh->size; | 1019 | int len = fh->size; |
| 1020 | uint32_t *p; | 1020 | __be32 *p; |
| 1021 | 1021 | ||
| 1022 | RESERVE_SPACE(8 + len); | 1022 | RESERVE_SPACE(8 + len); |
| 1023 | WRITE32(OP_PUTFH); | 1023 | WRITE32(OP_PUTFH); |
| @@ -1029,7 +1029,7 @@ encode_putfh(struct xdr_stream *xdr, const struct nfs_fh *fh) | |||
| 1029 | 1029 | ||
| 1030 | static int encode_putrootfh(struct xdr_stream *xdr) | 1030 | static int encode_putrootfh(struct xdr_stream *xdr) |
| 1031 | { | 1031 | { |
| 1032 | uint32_t *p; | 1032 | __be32 *p; |
| 1033 | 1033 | ||
| 1034 | RESERVE_SPACE(4); | 1034 | RESERVE_SPACE(4); |
| 1035 | WRITE32(OP_PUTROOTFH); | 1035 | WRITE32(OP_PUTROOTFH); |
| @@ -1040,7 +1040,7 @@ static int encode_putrootfh(struct xdr_stream *xdr) | |||
| 1040 | static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx) | 1040 | static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx) |
| 1041 | { | 1041 | { |
| 1042 | nfs4_stateid stateid; | 1042 | nfs4_stateid stateid; |
| 1043 | uint32_t *p; | 1043 | __be32 *p; |
| 1044 | 1044 | ||
| 1045 | RESERVE_SPACE(16); | 1045 | RESERVE_SPACE(16); |
| 1046 | if (ctx->state != NULL) { | 1046 | if (ctx->state != NULL) { |
| @@ -1052,7 +1052,7 @@ static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context | |||
| 1052 | 1052 | ||
| 1053 | static int encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args) | 1053 | static int encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args) |
| 1054 | { | 1054 | { |
| 1055 | uint32_t *p; | 1055 | __be32 *p; |
| 1056 | 1056 | ||
| 1057 | RESERVE_SPACE(4); | 1057 | RESERVE_SPACE(4); |
| 1058 | WRITE32(OP_READ); | 1058 | WRITE32(OP_READ); |
| @@ -1074,7 +1074,7 @@ static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg | |||
| 1074 | FATTR4_WORD1_MOUNTED_ON_FILEID, | 1074 | FATTR4_WORD1_MOUNTED_ON_FILEID, |
| 1075 | }; | 1075 | }; |
| 1076 | int replen; | 1076 | int replen; |
| 1077 | uint32_t *p; | 1077 | __be32 *p; |
| 1078 | 1078 | ||
| 1079 | RESERVE_SPACE(32+sizeof(nfs4_verifier)); | 1079 | RESERVE_SPACE(32+sizeof(nfs4_verifier)); |
| 1080 | WRITE32(OP_READDIR); | 1080 | WRITE32(OP_READDIR); |
| @@ -1116,7 +1116,7 @@ static int encode_readlink(struct xdr_stream *xdr, const struct nfs4_readlink *r | |||
| 1116 | { | 1116 | { |
| 1117 | struct rpc_auth *auth = req->rq_task->tk_auth; | 1117 | struct rpc_auth *auth = req->rq_task->tk_auth; |
| 1118 | unsigned int replen; | 1118 | unsigned int replen; |
| 1119 | uint32_t *p; | 1119 | __be32 *p; |
| 1120 | 1120 | ||
| 1121 | RESERVE_SPACE(4); | 1121 | RESERVE_SPACE(4); |
| 1122 | WRITE32(OP_READLINK); | 1122 | WRITE32(OP_READLINK); |
| @@ -1134,7 +1134,7 @@ static int encode_readlink(struct xdr_stream *xdr, const struct nfs4_readlink *r | |||
| 1134 | 1134 | ||
| 1135 | static int encode_remove(struct xdr_stream *xdr, const struct qstr *name) | 1135 | static int encode_remove(struct xdr_stream *xdr, const struct qstr *name) |
| 1136 | { | 1136 | { |
| 1137 | uint32_t *p; | 1137 | __be32 *p; |
| 1138 | 1138 | ||
| 1139 | RESERVE_SPACE(8 + name->len); | 1139 | RESERVE_SPACE(8 + name->len); |
| 1140 | WRITE32(OP_REMOVE); | 1140 | WRITE32(OP_REMOVE); |
| @@ -1146,7 +1146,7 @@ static int encode_remove(struct xdr_stream *xdr, const struct qstr *name) | |||
| 1146 | 1146 | ||
| 1147 | static int encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, const struct qstr *newname) | 1147 | static int encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, const struct qstr *newname) |
| 1148 | { | 1148 | { |
| 1149 | uint32_t *p; | 1149 | __be32 *p; |
| 1150 | 1150 | ||
| 1151 | RESERVE_SPACE(8 + oldname->len); | 1151 | RESERVE_SPACE(8 + oldname->len); |
| 1152 | WRITE32(OP_RENAME); | 1152 | WRITE32(OP_RENAME); |
| @@ -1162,7 +1162,7 @@ static int encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, con | |||
| 1162 | 1162 | ||
| 1163 | static int encode_renew(struct xdr_stream *xdr, const struct nfs_client *client_stateid) | 1163 | static int encode_renew(struct xdr_stream *xdr, const struct nfs_client *client_stateid) |
| 1164 | { | 1164 | { |
| 1165 | uint32_t *p; | 1165 | __be32 *p; |
| 1166 | 1166 | ||
| 1167 | RESERVE_SPACE(12); | 1167 | RESERVE_SPACE(12); |
| 1168 | WRITE32(OP_RENEW); | 1168 | WRITE32(OP_RENEW); |
| @@ -1174,7 +1174,7 @@ static int encode_renew(struct xdr_stream *xdr, const struct nfs_client *client_ | |||
| 1174 | static int | 1174 | static int |
| 1175 | encode_restorefh(struct xdr_stream *xdr) | 1175 | encode_restorefh(struct xdr_stream *xdr) |
| 1176 | { | 1176 | { |
| 1177 | uint32_t *p; | 1177 | __be32 *p; |
| 1178 | 1178 | ||
| 1179 | RESERVE_SPACE(4); | 1179 | RESERVE_SPACE(4); |
| 1180 | WRITE32(OP_RESTOREFH); | 1180 | WRITE32(OP_RESTOREFH); |
| @@ -1185,7 +1185,7 @@ encode_restorefh(struct xdr_stream *xdr) | |||
| 1185 | static int | 1185 | static int |
| 1186 | encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg) | 1186 | encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg) |
| 1187 | { | 1187 | { |
| 1188 | uint32_t *p; | 1188 | __be32 *p; |
| 1189 | 1189 | ||
| 1190 | RESERVE_SPACE(4+sizeof(zero_stateid.data)); | 1190 | RESERVE_SPACE(4+sizeof(zero_stateid.data)); |
| 1191 | WRITE32(OP_SETATTR); | 1191 | WRITE32(OP_SETATTR); |
| @@ -1204,7 +1204,7 @@ encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg) | |||
| 1204 | static int | 1204 | static int |
| 1205 | encode_savefh(struct xdr_stream *xdr) | 1205 | encode_savefh(struct xdr_stream *xdr) |
| 1206 | { | 1206 | { |
| 1207 | uint32_t *p; | 1207 | __be32 *p; |
| 1208 | 1208 | ||
| 1209 | RESERVE_SPACE(4); | 1209 | RESERVE_SPACE(4); |
| 1210 | WRITE32(OP_SAVEFH); | 1210 | WRITE32(OP_SAVEFH); |
| @@ -1215,7 +1215,7 @@ encode_savefh(struct xdr_stream *xdr) | |||
| 1215 | static int encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs *arg, const struct nfs_server *server) | 1215 | static int encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs *arg, const struct nfs_server *server) |
| 1216 | { | 1216 | { |
| 1217 | int status; | 1217 | int status; |
| 1218 | uint32_t *p; | 1218 | __be32 *p; |
| 1219 | 1219 | ||
| 1220 | RESERVE_SPACE(4+sizeof(arg->stateid.data)); | 1220 | RESERVE_SPACE(4+sizeof(arg->stateid.data)); |
| 1221 | WRITE32(OP_SETATTR); | 1221 | WRITE32(OP_SETATTR); |
| @@ -1229,7 +1229,7 @@ static int encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs * | |||
| 1229 | 1229 | ||
| 1230 | static int encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclientid *setclientid) | 1230 | static int encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclientid *setclientid) |
| 1231 | { | 1231 | { |
| 1232 | uint32_t *p; | 1232 | __be32 *p; |
| 1233 | 1233 | ||
| 1234 | RESERVE_SPACE(4 + sizeof(setclientid->sc_verifier->data)); | 1234 | RESERVE_SPACE(4 + sizeof(setclientid->sc_verifier->data)); |
| 1235 | WRITE32(OP_SETCLIENTID); | 1235 | WRITE32(OP_SETCLIENTID); |
| @@ -1248,7 +1248,7 @@ static int encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclien | |||
| 1248 | 1248 | ||
| 1249 | static int encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_client *client_state) | 1249 | static int encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_client *client_state) |
| 1250 | { | 1250 | { |
| 1251 | uint32_t *p; | 1251 | __be32 *p; |
| 1252 | 1252 | ||
| 1253 | RESERVE_SPACE(12 + sizeof(client_state->cl_confirm.data)); | 1253 | RESERVE_SPACE(12 + sizeof(client_state->cl_confirm.data)); |
| 1254 | WRITE32(OP_SETCLIENTID_CONFIRM); | 1254 | WRITE32(OP_SETCLIENTID_CONFIRM); |
| @@ -1260,7 +1260,7 @@ static int encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_c | |||
| 1260 | 1260 | ||
| 1261 | static int encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *args) | 1261 | static int encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *args) |
| 1262 | { | 1262 | { |
| 1263 | uint32_t *p; | 1263 | __be32 *p; |
| 1264 | 1264 | ||
| 1265 | RESERVE_SPACE(4); | 1265 | RESERVE_SPACE(4); |
| 1266 | WRITE32(OP_WRITE); | 1266 | WRITE32(OP_WRITE); |
| @@ -1279,7 +1279,7 @@ static int encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *args | |||
| 1279 | 1279 | ||
| 1280 | static int encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *stateid) | 1280 | static int encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *stateid) |
| 1281 | { | 1281 | { |
| 1282 | uint32_t *p; | 1282 | __be32 *p; |
| 1283 | 1283 | ||
| 1284 | RESERVE_SPACE(20); | 1284 | RESERVE_SPACE(20); |
| 1285 | 1285 | ||
| @@ -1295,7 +1295,7 @@ static int encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *statei | |||
| 1295 | /* | 1295 | /* |
| 1296 | * Encode an ACCESS request | 1296 | * Encode an ACCESS request |
| 1297 | */ | 1297 | */ |
| 1298 | static int nfs4_xdr_enc_access(struct rpc_rqst *req, uint32_t *p, const struct nfs4_accessargs *args) | 1298 | static int nfs4_xdr_enc_access(struct rpc_rqst *req, __be32 *p, const struct nfs4_accessargs *args) |
| 1299 | { | 1299 | { |
| 1300 | struct xdr_stream xdr; | 1300 | struct xdr_stream xdr; |
| 1301 | struct compound_hdr hdr = { | 1301 | struct compound_hdr hdr = { |
| @@ -1313,7 +1313,7 @@ static int nfs4_xdr_enc_access(struct rpc_rqst *req, uint32_t *p, const struct n | |||
| 1313 | /* | 1313 | /* |
| 1314 | * Encode LOOKUP request | 1314 | * Encode LOOKUP request |
| 1315 | */ | 1315 | */ |
| 1316 | static int nfs4_xdr_enc_lookup(struct rpc_rqst *req, uint32_t *p, const struct nfs4_lookup_arg *args) | 1316 | static int nfs4_xdr_enc_lookup(struct rpc_rqst *req, __be32 *p, const struct nfs4_lookup_arg *args) |
| 1317 | { | 1317 | { |
| 1318 | struct xdr_stream xdr; | 1318 | struct xdr_stream xdr; |
| 1319 | struct compound_hdr hdr = { | 1319 | struct compound_hdr hdr = { |
| @@ -1337,7 +1337,7 @@ out: | |||
| 1337 | /* | 1337 | /* |
| 1338 | * Encode LOOKUP_ROOT request | 1338 | * Encode LOOKUP_ROOT request |
| 1339 | */ | 1339 | */ |
| 1340 | static int nfs4_xdr_enc_lookup_root(struct rpc_rqst *req, uint32_t *p, const struct nfs4_lookup_root_arg *args) | 1340 | static int nfs4_xdr_enc_lookup_root(struct rpc_rqst *req, __be32 *p, const struct nfs4_lookup_root_arg *args) |
| 1341 | { | 1341 | { |
| 1342 | struct xdr_stream xdr; | 1342 | struct xdr_stream xdr; |
| 1343 | struct compound_hdr hdr = { | 1343 | struct compound_hdr hdr = { |
| @@ -1358,7 +1358,7 @@ out: | |||
| 1358 | /* | 1358 | /* |
| 1359 | * Encode REMOVE request | 1359 | * Encode REMOVE request |
| 1360 | */ | 1360 | */ |
| 1361 | static int nfs4_xdr_enc_remove(struct rpc_rqst *req, uint32_t *p, const struct nfs4_remove_arg *args) | 1361 | static int nfs4_xdr_enc_remove(struct rpc_rqst *req, __be32 *p, const struct nfs4_remove_arg *args) |
| 1362 | { | 1362 | { |
| 1363 | struct xdr_stream xdr; | 1363 | struct xdr_stream xdr; |
| 1364 | struct compound_hdr hdr = { | 1364 | struct compound_hdr hdr = { |
| @@ -1380,7 +1380,7 @@ out: | |||
| 1380 | /* | 1380 | /* |
| 1381 | * Encode RENAME request | 1381 | * Encode RENAME request |
| 1382 | */ | 1382 | */ |
| 1383 | static int nfs4_xdr_enc_rename(struct rpc_rqst *req, uint32_t *p, const struct nfs4_rename_arg *args) | 1383 | static int nfs4_xdr_enc_rename(struct rpc_rqst *req, __be32 *p, const struct nfs4_rename_arg *args) |
| 1384 | { | 1384 | { |
| 1385 | struct xdr_stream xdr; | 1385 | struct xdr_stream xdr; |
| 1386 | struct compound_hdr hdr = { | 1386 | struct compound_hdr hdr = { |
| @@ -1410,7 +1410,7 @@ out: | |||
| 1410 | /* | 1410 | /* |
| 1411 | * Encode LINK request | 1411 | * Encode LINK request |
| 1412 | */ | 1412 | */ |
| 1413 | static int nfs4_xdr_enc_link(struct rpc_rqst *req, uint32_t *p, const struct nfs4_link_arg *args) | 1413 | static int nfs4_xdr_enc_link(struct rpc_rqst *req, __be32 *p, const struct nfs4_link_arg *args) |
| 1414 | { | 1414 | { |
| 1415 | struct xdr_stream xdr; | 1415 | struct xdr_stream xdr; |
| 1416 | struct compound_hdr hdr = { | 1416 | struct compound_hdr hdr = { |
| @@ -1440,7 +1440,7 @@ out: | |||
| 1440 | /* | 1440 | /* |
| 1441 | * Encode CREATE request | 1441 | * Encode CREATE request |
| 1442 | */ | 1442 | */ |
| 1443 | static int nfs4_xdr_enc_create(struct rpc_rqst *req, uint32_t *p, const struct nfs4_create_arg *args) | 1443 | static int nfs4_xdr_enc_create(struct rpc_rqst *req, __be32 *p, const struct nfs4_create_arg *args) |
| 1444 | { | 1444 | { |
| 1445 | struct xdr_stream xdr; | 1445 | struct xdr_stream xdr; |
| 1446 | struct compound_hdr hdr = { | 1446 | struct compound_hdr hdr = { |
| @@ -1470,7 +1470,7 @@ out: | |||
| 1470 | /* | 1470 | /* |
| 1471 | * Encode SYMLINK request | 1471 | * Encode SYMLINK request |
| 1472 | */ | 1472 | */ |
| 1473 | static int nfs4_xdr_enc_symlink(struct rpc_rqst *req, uint32_t *p, const struct nfs4_create_arg *args) | 1473 | static int nfs4_xdr_enc_symlink(struct rpc_rqst *req, __be32 *p, const struct nfs4_create_arg *args) |
| 1474 | { | 1474 | { |
| 1475 | return nfs4_xdr_enc_create(req, p, args); | 1475 | return nfs4_xdr_enc_create(req, p, args); |
| 1476 | } | 1476 | } |
| @@ -1478,7 +1478,7 @@ static int nfs4_xdr_enc_symlink(struct rpc_rqst *req, uint32_t *p, const struct | |||
| 1478 | /* | 1478 | /* |
| 1479 | * Encode GETATTR request | 1479 | * Encode GETATTR request |
| 1480 | */ | 1480 | */ |
| 1481 | static int nfs4_xdr_enc_getattr(struct rpc_rqst *req, uint32_t *p, const struct nfs4_getattr_arg *args) | 1481 | static int nfs4_xdr_enc_getattr(struct rpc_rqst *req, __be32 *p, const struct nfs4_getattr_arg *args) |
| 1482 | { | 1482 | { |
| 1483 | struct xdr_stream xdr; | 1483 | struct xdr_stream xdr; |
| 1484 | struct compound_hdr hdr = { | 1484 | struct compound_hdr hdr = { |
| @@ -1496,7 +1496,7 @@ static int nfs4_xdr_enc_getattr(struct rpc_rqst *req, uint32_t *p, const struct | |||
| 1496 | /* | 1496 | /* |
| 1497 | * Encode a CLOSE request | 1497 | * Encode a CLOSE request |
| 1498 | */ | 1498 | */ |
| 1499 | static int nfs4_xdr_enc_close(struct rpc_rqst *req, uint32_t *p, struct nfs_closeargs *args) | 1499 | static int nfs4_xdr_enc_close(struct rpc_rqst *req, __be32 *p, struct nfs_closeargs *args) |
| 1500 | { | 1500 | { |
| 1501 | struct xdr_stream xdr; | 1501 | struct xdr_stream xdr; |
| 1502 | struct compound_hdr hdr = { | 1502 | struct compound_hdr hdr = { |
| @@ -1520,7 +1520,7 @@ out: | |||
| 1520 | /* | 1520 | /* |
| 1521 | * Encode an OPEN request | 1521 | * Encode an OPEN request |
| 1522 | */ | 1522 | */ |
| 1523 | static int nfs4_xdr_enc_open(struct rpc_rqst *req, uint32_t *p, struct nfs_openargs *args) | 1523 | static int nfs4_xdr_enc_open(struct rpc_rqst *req, __be32 *p, struct nfs_openargs *args) |
| 1524 | { | 1524 | { |
| 1525 | struct xdr_stream xdr; | 1525 | struct xdr_stream xdr; |
| 1526 | struct compound_hdr hdr = { | 1526 | struct compound_hdr hdr = { |
| @@ -1556,7 +1556,7 @@ out: | |||
| 1556 | /* | 1556 | /* |
| 1557 | * Encode an OPEN_CONFIRM request | 1557 | * Encode an OPEN_CONFIRM request |
| 1558 | */ | 1558 | */ |
| 1559 | static int nfs4_xdr_enc_open_confirm(struct rpc_rqst *req, uint32_t *p, struct nfs_open_confirmargs *args) | 1559 | static int nfs4_xdr_enc_open_confirm(struct rpc_rqst *req, __be32 *p, struct nfs_open_confirmargs *args) |
| 1560 | { | 1560 | { |
| 1561 | struct xdr_stream xdr; | 1561 | struct xdr_stream xdr; |
| 1562 | struct compound_hdr hdr = { | 1562 | struct compound_hdr hdr = { |
| @@ -1577,7 +1577,7 @@ out: | |||
| 1577 | /* | 1577 | /* |
| 1578 | * Encode an OPEN request with no attributes. | 1578 | * Encode an OPEN request with no attributes. |
| 1579 | */ | 1579 | */ |
| 1580 | static int nfs4_xdr_enc_open_noattr(struct rpc_rqst *req, uint32_t *p, struct nfs_openargs *args) | 1580 | static int nfs4_xdr_enc_open_noattr(struct rpc_rqst *req, __be32 *p, struct nfs_openargs *args) |
| 1581 | { | 1581 | { |
| 1582 | struct xdr_stream xdr; | 1582 | struct xdr_stream xdr; |
| 1583 | struct compound_hdr hdr = { | 1583 | struct compound_hdr hdr = { |
| @@ -1601,7 +1601,7 @@ out: | |||
| 1601 | /* | 1601 | /* |
| 1602 | * Encode an OPEN_DOWNGRADE request | 1602 | * Encode an OPEN_DOWNGRADE request |
| 1603 | */ | 1603 | */ |
| 1604 | static int nfs4_xdr_enc_open_downgrade(struct rpc_rqst *req, uint32_t *p, struct nfs_closeargs *args) | 1604 | static int nfs4_xdr_enc_open_downgrade(struct rpc_rqst *req, __be32 *p, struct nfs_closeargs *args) |
| 1605 | { | 1605 | { |
| 1606 | struct xdr_stream xdr; | 1606 | struct xdr_stream xdr; |
| 1607 | struct compound_hdr hdr = { | 1607 | struct compound_hdr hdr = { |
| @@ -1625,7 +1625,7 @@ out: | |||
| 1625 | /* | 1625 | /* |
| 1626 | * Encode a LOCK request | 1626 | * Encode a LOCK request |
| 1627 | */ | 1627 | */ |
| 1628 | static int nfs4_xdr_enc_lock(struct rpc_rqst *req, uint32_t *p, struct nfs_lock_args *args) | 1628 | static int nfs4_xdr_enc_lock(struct rpc_rqst *req, __be32 *p, struct nfs_lock_args *args) |
| 1629 | { | 1629 | { |
| 1630 | struct xdr_stream xdr; | 1630 | struct xdr_stream xdr; |
| 1631 | struct compound_hdr hdr = { | 1631 | struct compound_hdr hdr = { |
| @@ -1646,7 +1646,7 @@ out: | |||
| 1646 | /* | 1646 | /* |
| 1647 | * Encode a LOCKT request | 1647 | * Encode a LOCKT request |
| 1648 | */ | 1648 | */ |
| 1649 | static int nfs4_xdr_enc_lockt(struct rpc_rqst *req, uint32_t *p, struct nfs_lockt_args *args) | 1649 | static int nfs4_xdr_enc_lockt(struct rpc_rqst *req, __be32 *p, struct nfs_lockt_args *args) |
| 1650 | { | 1650 | { |
| 1651 | struct xdr_stream xdr; | 1651 | struct xdr_stream xdr; |
| 1652 | struct compound_hdr hdr = { | 1652 | struct compound_hdr hdr = { |
| @@ -1667,7 +1667,7 @@ out: | |||
| 1667 | /* | 1667 | /* |
| 1668 | * Encode a LOCKU request | 1668 | * Encode a LOCKU request |
| 1669 | */ | 1669 | */ |
| 1670 | static int nfs4_xdr_enc_locku(struct rpc_rqst *req, uint32_t *p, struct nfs_locku_args *args) | 1670 | static int nfs4_xdr_enc_locku(struct rpc_rqst *req, __be32 *p, struct nfs_locku_args *args) |
| 1671 | { | 1671 | { |
| 1672 | struct xdr_stream xdr; | 1672 | struct xdr_stream xdr; |
| 1673 | struct compound_hdr hdr = { | 1673 | struct compound_hdr hdr = { |
| @@ -1688,7 +1688,7 @@ out: | |||
| 1688 | /* | 1688 | /* |
| 1689 | * Encode a READLINK request | 1689 | * Encode a READLINK request |
| 1690 | */ | 1690 | */ |
| 1691 | static int nfs4_xdr_enc_readlink(struct rpc_rqst *req, uint32_t *p, const struct nfs4_readlink *args) | 1691 | static int nfs4_xdr_enc_readlink(struct rpc_rqst *req, __be32 *p, const struct nfs4_readlink *args) |
| 1692 | { | 1692 | { |
| 1693 | struct xdr_stream xdr; | 1693 | struct xdr_stream xdr; |
| 1694 | struct compound_hdr hdr = { | 1694 | struct compound_hdr hdr = { |
| @@ -1709,7 +1709,7 @@ out: | |||
| 1709 | /* | 1709 | /* |
| 1710 | * Encode a READDIR request | 1710 | * Encode a READDIR request |
| 1711 | */ | 1711 | */ |
| 1712 | static int nfs4_xdr_enc_readdir(struct rpc_rqst *req, uint32_t *p, const struct nfs4_readdir_arg *args) | 1712 | static int nfs4_xdr_enc_readdir(struct rpc_rqst *req, __be32 *p, const struct nfs4_readdir_arg *args) |
| 1713 | { | 1713 | { |
| 1714 | struct xdr_stream xdr; | 1714 | struct xdr_stream xdr; |
| 1715 | struct compound_hdr hdr = { | 1715 | struct compound_hdr hdr = { |
| @@ -1730,7 +1730,7 @@ out: | |||
| 1730 | /* | 1730 | /* |
| 1731 | * Encode a READ request | 1731 | * Encode a READ request |
| 1732 | */ | 1732 | */ |
| 1733 | static int nfs4_xdr_enc_read(struct rpc_rqst *req, uint32_t *p, struct nfs_readargs *args) | 1733 | static int nfs4_xdr_enc_read(struct rpc_rqst *req, __be32 *p, struct nfs_readargs *args) |
| 1734 | { | 1734 | { |
| 1735 | struct rpc_auth *auth = req->rq_task->tk_auth; | 1735 | struct rpc_auth *auth = req->rq_task->tk_auth; |
| 1736 | struct xdr_stream xdr; | 1736 | struct xdr_stream xdr; |
| @@ -1762,7 +1762,7 @@ out: | |||
| 1762 | /* | 1762 | /* |
| 1763 | * Encode an SETATTR request | 1763 | * Encode an SETATTR request |
| 1764 | */ | 1764 | */ |
| 1765 | static int nfs4_xdr_enc_setattr(struct rpc_rqst *req, uint32_t *p, struct nfs_setattrargs *args) | 1765 | static int nfs4_xdr_enc_setattr(struct rpc_rqst *req, __be32 *p, struct nfs_setattrargs *args) |
| 1766 | 1766 | ||
| 1767 | { | 1767 | { |
| 1768 | struct xdr_stream xdr; | 1768 | struct xdr_stream xdr; |
| @@ -1788,7 +1788,7 @@ out: | |||
| 1788 | * Encode a GETACL request | 1788 | * Encode a GETACL request |
| 1789 | */ | 1789 | */ |
| 1790 | static int | 1790 | static int |
| 1791 | nfs4_xdr_enc_getacl(struct rpc_rqst *req, uint32_t *p, | 1791 | nfs4_xdr_enc_getacl(struct rpc_rqst *req, __be32 *p, |
| 1792 | struct nfs_getaclargs *args) | 1792 | struct nfs_getaclargs *args) |
| 1793 | { | 1793 | { |
| 1794 | struct xdr_stream xdr; | 1794 | struct xdr_stream xdr; |
| @@ -1815,7 +1815,7 @@ out: | |||
| 1815 | /* | 1815 | /* |
| 1816 | * Encode a WRITE request | 1816 | * Encode a WRITE request |
| 1817 | */ | 1817 | */ |
| 1818 | static int nfs4_xdr_enc_write(struct rpc_rqst *req, uint32_t *p, struct nfs_writeargs *args) | 1818 | static int nfs4_xdr_enc_write(struct rpc_rqst *req, __be32 *p, struct nfs_writeargs *args) |
| 1819 | { | 1819 | { |
| 1820 | struct xdr_stream xdr; | 1820 | struct xdr_stream xdr; |
| 1821 | struct compound_hdr hdr = { | 1821 | struct compound_hdr hdr = { |
| @@ -1839,7 +1839,7 @@ out: | |||
| 1839 | /* | 1839 | /* |
| 1840 | * a COMMIT request | 1840 | * a COMMIT request |
| 1841 | */ | 1841 | */ |
| 1842 | static int nfs4_xdr_enc_commit(struct rpc_rqst *req, uint32_t *p, struct nfs_writeargs *args) | 1842 | static int nfs4_xdr_enc_commit(struct rpc_rqst *req, __be32 *p, struct nfs_writeargs *args) |
| 1843 | { | 1843 | { |
| 1844 | struct xdr_stream xdr; | 1844 | struct xdr_stream xdr; |
| 1845 | struct compound_hdr hdr = { | 1845 | struct compound_hdr hdr = { |
| @@ -1863,7 +1863,7 @@ out: | |||
| 1863 | /* | 1863 | /* |
| 1864 | * FSINFO request | 1864 | * FSINFO request |
| 1865 | */ | 1865 | */ |
| 1866 | static int nfs4_xdr_enc_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs4_fsinfo_arg *args) | 1866 | static int nfs4_xdr_enc_fsinfo(struct rpc_rqst *req, __be32 *p, struct nfs4_fsinfo_arg *args) |
| 1867 | { | 1867 | { |
| 1868 | struct xdr_stream xdr; | 1868 | struct xdr_stream xdr; |
| 1869 | struct compound_hdr hdr = { | 1869 | struct compound_hdr hdr = { |
| @@ -1882,7 +1882,7 @@ static int nfs4_xdr_enc_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs4_fs | |||
| 1882 | /* | 1882 | /* |
| 1883 | * a PATHCONF request | 1883 | * a PATHCONF request |
| 1884 | */ | 1884 | */ |
| 1885 | static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, uint32_t *p, const struct nfs4_pathconf_arg *args) | 1885 | static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, __be32 *p, const struct nfs4_pathconf_arg *args) |
| 1886 | { | 1886 | { |
| 1887 | struct xdr_stream xdr; | 1887 | struct xdr_stream xdr; |
| 1888 | struct compound_hdr hdr = { | 1888 | struct compound_hdr hdr = { |
| @@ -1902,7 +1902,7 @@ static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, uint32_t *p, const struct | |||
| 1902 | /* | 1902 | /* |
| 1903 | * a STATFS request | 1903 | * a STATFS request |
| 1904 | */ | 1904 | */ |
| 1905 | static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, uint32_t *p, const struct nfs4_statfs_arg *args) | 1905 | static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, __be32 *p, const struct nfs4_statfs_arg *args) |
| 1906 | { | 1906 | { |
| 1907 | struct xdr_stream xdr; | 1907 | struct xdr_stream xdr; |
| 1908 | struct compound_hdr hdr = { | 1908 | struct compound_hdr hdr = { |
| @@ -1923,7 +1923,7 @@ static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, uint32_t *p, const struct n | |||
| 1923 | /* | 1923 | /* |
| 1924 | * GETATTR_BITMAP request | 1924 | * GETATTR_BITMAP request |
| 1925 | */ | 1925 | */ |
| 1926 | static int nfs4_xdr_enc_server_caps(struct rpc_rqst *req, uint32_t *p, const struct nfs_fh *fhandle) | 1926 | static int nfs4_xdr_enc_server_caps(struct rpc_rqst *req, __be32 *p, const struct nfs_fh *fhandle) |
| 1927 | { | 1927 | { |
| 1928 | struct xdr_stream xdr; | 1928 | struct xdr_stream xdr; |
| 1929 | struct compound_hdr hdr = { | 1929 | struct compound_hdr hdr = { |
| @@ -1945,7 +1945,7 @@ static int nfs4_xdr_enc_server_caps(struct rpc_rqst *req, uint32_t *p, const str | |||
| 1945 | /* | 1945 | /* |
| 1946 | * a RENEW request | 1946 | * a RENEW request |
| 1947 | */ | 1947 | */ |
| 1948 | static int nfs4_xdr_enc_renew(struct rpc_rqst *req, uint32_t *p, struct nfs_client *clp) | 1948 | static int nfs4_xdr_enc_renew(struct rpc_rqst *req, __be32 *p, struct nfs_client *clp) |
| 1949 | { | 1949 | { |
| 1950 | struct xdr_stream xdr; | 1950 | struct xdr_stream xdr; |
| 1951 | struct compound_hdr hdr = { | 1951 | struct compound_hdr hdr = { |
| @@ -1960,7 +1960,7 @@ static int nfs4_xdr_enc_renew(struct rpc_rqst *req, uint32_t *p, struct nfs_clie | |||
| 1960 | /* | 1960 | /* |
| 1961 | * a SETCLIENTID request | 1961 | * a SETCLIENTID request |
| 1962 | */ | 1962 | */ |
| 1963 | static int nfs4_xdr_enc_setclientid(struct rpc_rqst *req, uint32_t *p, struct nfs4_setclientid *sc) | 1963 | static int nfs4_xdr_enc_setclientid(struct rpc_rqst *req, __be32 *p, struct nfs4_setclientid *sc) |
| 1964 | { | 1964 | { |
| 1965 | struct xdr_stream xdr; | 1965 | struct xdr_stream xdr; |
| 1966 | struct compound_hdr hdr = { | 1966 | struct compound_hdr hdr = { |
| @@ -1975,7 +1975,7 @@ static int nfs4_xdr_enc_setclientid(struct rpc_rqst *req, uint32_t *p, struct nf | |||
| 1975 | /* | 1975 | /* |
| 1976 | * a SETCLIENTID_CONFIRM request | 1976 | * a SETCLIENTID_CONFIRM request |
| 1977 | */ | 1977 | */ |
| 1978 | static int nfs4_xdr_enc_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, struct nfs_client *clp) | 1978 | static int nfs4_xdr_enc_setclientid_confirm(struct rpc_rqst *req, __be32 *p, struct nfs_client *clp) |
| 1979 | { | 1979 | { |
| 1980 | struct xdr_stream xdr; | 1980 | struct xdr_stream xdr; |
| 1981 | struct compound_hdr hdr = { | 1981 | struct compound_hdr hdr = { |
| @@ -1997,7 +1997,7 @@ static int nfs4_xdr_enc_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, s | |||
| 1997 | /* | 1997 | /* |
| 1998 | * DELEGRETURN request | 1998 | * DELEGRETURN request |
| 1999 | */ | 1999 | */ |
| 2000 | static int nfs4_xdr_enc_delegreturn(struct rpc_rqst *req, uint32_t *p, const struct nfs4_delegreturnargs *args) | 2000 | static int nfs4_xdr_enc_delegreturn(struct rpc_rqst *req, __be32 *p, const struct nfs4_delegreturnargs *args) |
| 2001 | { | 2001 | { |
| 2002 | struct xdr_stream xdr; | 2002 | struct xdr_stream xdr; |
| 2003 | struct compound_hdr hdr = { | 2003 | struct compound_hdr hdr = { |
| @@ -2021,7 +2021,7 @@ out: | |||
| 2021 | /* | 2021 | /* |
| 2022 | * Encode FS_LOCATIONS request | 2022 | * Encode FS_LOCATIONS request |
| 2023 | */ | 2023 | */ |
| 2024 | static int nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, uint32_t *p, struct nfs4_fs_locations_arg *args) | 2024 | static int nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, __be32 *p, struct nfs4_fs_locations_arg *args) |
| 2025 | { | 2025 | { |
| 2026 | struct xdr_stream xdr; | 2026 | struct xdr_stream xdr; |
| 2027 | struct compound_hdr hdr = { | 2027 | struct compound_hdr hdr = { |
| @@ -2086,7 +2086,7 @@ out: | |||
| 2086 | 2086 | ||
| 2087 | static int decode_opaque_inline(struct xdr_stream *xdr, unsigned int *len, char **string) | 2087 | static int decode_opaque_inline(struct xdr_stream *xdr, unsigned int *len, char **string) |
| 2088 | { | 2088 | { |
| 2089 | uint32_t *p; | 2089 | __be32 *p; |
| 2090 | 2090 | ||
| 2091 | READ_BUF(4); | 2091 | READ_BUF(4); |
| 2092 | READ32(*len); | 2092 | READ32(*len); |
| @@ -2097,7 +2097,7 @@ static int decode_opaque_inline(struct xdr_stream *xdr, unsigned int *len, char | |||
| 2097 | 2097 | ||
| 2098 | static int decode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) | 2098 | static int decode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) |
| 2099 | { | 2099 | { |
| 2100 | uint32_t *p; | 2100 | __be32 *p; |
| 2101 | 2101 | ||
| 2102 | READ_BUF(8); | 2102 | READ_BUF(8); |
| 2103 | READ32(hdr->status); | 2103 | READ32(hdr->status); |
| @@ -2112,7 +2112,7 @@ static int decode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr) | |||
| 2112 | 2112 | ||
| 2113 | static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) | 2113 | static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) |
| 2114 | { | 2114 | { |
| 2115 | uint32_t *p; | 2115 | __be32 *p; |
| 2116 | uint32_t opnum; | 2116 | uint32_t opnum; |
| 2117 | int32_t nfserr; | 2117 | int32_t nfserr; |
| 2118 | 2118 | ||
| @@ -2134,7 +2134,7 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) | |||
| 2134 | /* Dummy routine */ | 2134 | /* Dummy routine */ |
| 2135 | static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs_client *clp) | 2135 | static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs_client *clp) |
| 2136 | { | 2136 | { |
| 2137 | uint32_t *p; | 2137 | __be32 *p; |
| 2138 | unsigned int strlen; | 2138 | unsigned int strlen; |
| 2139 | char *str; | 2139 | char *str; |
| 2140 | 2140 | ||
| @@ -2144,7 +2144,8 @@ static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs_client *clp) | |||
| 2144 | 2144 | ||
| 2145 | static int decode_attr_bitmap(struct xdr_stream *xdr, uint32_t *bitmap) | 2145 | static int decode_attr_bitmap(struct xdr_stream *xdr, uint32_t *bitmap) |
| 2146 | { | 2146 | { |
| 2147 | uint32_t bmlen, *p; | 2147 | uint32_t bmlen; |
| 2148 | __be32 *p; | ||
| 2148 | 2149 | ||
| 2149 | READ_BUF(4); | 2150 | READ_BUF(4); |
| 2150 | READ32(bmlen); | 2151 | READ32(bmlen); |
| @@ -2159,9 +2160,9 @@ static int decode_attr_bitmap(struct xdr_stream *xdr, uint32_t *bitmap) | |||
| 2159 | return 0; | 2160 | return 0; |
| 2160 | } | 2161 | } |
| 2161 | 2162 | ||
| 2162 | static inline int decode_attr_length(struct xdr_stream *xdr, uint32_t *attrlen, uint32_t **savep) | 2163 | static inline int decode_attr_length(struct xdr_stream *xdr, uint32_t *attrlen, __be32 **savep) |
| 2163 | { | 2164 | { |
| 2164 | uint32_t *p; | 2165 | __be32 *p; |
| 2165 | 2166 | ||
| 2166 | READ_BUF(4); | 2167 | READ_BUF(4); |
| 2167 | READ32(*attrlen); | 2168 | READ32(*attrlen); |
| @@ -2182,7 +2183,7 @@ static int decode_attr_supported(struct xdr_stream *xdr, uint32_t *bitmap, uint3 | |||
| 2182 | 2183 | ||
| 2183 | static int decode_attr_type(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *type) | 2184 | static int decode_attr_type(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *type) |
| 2184 | { | 2185 | { |
| 2185 | uint32_t *p; | 2186 | __be32 *p; |
| 2186 | 2187 | ||
| 2187 | *type = 0; | 2188 | *type = 0; |
| 2188 | if (unlikely(bitmap[0] & (FATTR4_WORD0_TYPE - 1U))) | 2189 | if (unlikely(bitmap[0] & (FATTR4_WORD0_TYPE - 1U))) |
| @@ -2202,7 +2203,7 @@ static int decode_attr_type(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t * | |||
| 2202 | 2203 | ||
| 2203 | static int decode_attr_change(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *change) | 2204 | static int decode_attr_change(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *change) |
| 2204 | { | 2205 | { |
| 2205 | uint32_t *p; | 2206 | __be32 *p; |
| 2206 | 2207 | ||
| 2207 | *change = 0; | 2208 | *change = 0; |
| 2208 | if (unlikely(bitmap[0] & (FATTR4_WORD0_CHANGE - 1U))) | 2209 | if (unlikely(bitmap[0] & (FATTR4_WORD0_CHANGE - 1U))) |
| @@ -2219,7 +2220,7 @@ static int decode_attr_change(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t | |||
| 2219 | 2220 | ||
| 2220 | static int decode_attr_size(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *size) | 2221 | static int decode_attr_size(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *size) |
| 2221 | { | 2222 | { |
| 2222 | uint32_t *p; | 2223 | __be32 *p; |
| 2223 | 2224 | ||
| 2224 | *size = 0; | 2225 | *size = 0; |
| 2225 | if (unlikely(bitmap[0] & (FATTR4_WORD0_SIZE - 1U))) | 2226 | if (unlikely(bitmap[0] & (FATTR4_WORD0_SIZE - 1U))) |
| @@ -2235,7 +2236,7 @@ static int decode_attr_size(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t * | |||
| 2235 | 2236 | ||
| 2236 | static int decode_attr_link_support(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2237 | static int decode_attr_link_support(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
| 2237 | { | 2238 | { |
| 2238 | uint32_t *p; | 2239 | __be32 *p; |
| 2239 | 2240 | ||
| 2240 | *res = 0; | 2241 | *res = 0; |
| 2241 | if (unlikely(bitmap[0] & (FATTR4_WORD0_LINK_SUPPORT - 1U))) | 2242 | if (unlikely(bitmap[0] & (FATTR4_WORD0_LINK_SUPPORT - 1U))) |
| @@ -2251,7 +2252,7 @@ static int decode_attr_link_support(struct xdr_stream *xdr, uint32_t *bitmap, ui | |||
| 2251 | 2252 | ||
| 2252 | static int decode_attr_symlink_support(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2253 | static int decode_attr_symlink_support(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
| 2253 | { | 2254 | { |
| 2254 | uint32_t *p; | 2255 | __be32 *p; |
| 2255 | 2256 | ||
| 2256 | *res = 0; | 2257 | *res = 0; |
| 2257 | if (unlikely(bitmap[0] & (FATTR4_WORD0_SYMLINK_SUPPORT - 1U))) | 2258 | if (unlikely(bitmap[0] & (FATTR4_WORD0_SYMLINK_SUPPORT - 1U))) |
| @@ -2267,7 +2268,7 @@ static int decode_attr_symlink_support(struct xdr_stream *xdr, uint32_t *bitmap, | |||
| 2267 | 2268 | ||
| 2268 | static int decode_attr_fsid(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_fsid *fsid) | 2269 | static int decode_attr_fsid(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_fsid *fsid) |
| 2269 | { | 2270 | { |
| 2270 | uint32_t *p; | 2271 | __be32 *p; |
| 2271 | 2272 | ||
| 2272 | fsid->major = 0; | 2273 | fsid->major = 0; |
| 2273 | fsid->minor = 0; | 2274 | fsid->minor = 0; |
| @@ -2287,7 +2288,7 @@ static int decode_attr_fsid(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs | |||
| 2287 | 2288 | ||
| 2288 | static int decode_attr_lease_time(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2289 | static int decode_attr_lease_time(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
| 2289 | { | 2290 | { |
| 2290 | uint32_t *p; | 2291 | __be32 *p; |
| 2291 | 2292 | ||
| 2292 | *res = 60; | 2293 | *res = 60; |
| 2293 | if (unlikely(bitmap[0] & (FATTR4_WORD0_LEASE_TIME - 1U))) | 2294 | if (unlikely(bitmap[0] & (FATTR4_WORD0_LEASE_TIME - 1U))) |
| @@ -2303,7 +2304,7 @@ static int decode_attr_lease_time(struct xdr_stream *xdr, uint32_t *bitmap, uint | |||
| 2303 | 2304 | ||
| 2304 | static int decode_attr_aclsupport(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2305 | static int decode_attr_aclsupport(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
| 2305 | { | 2306 | { |
| 2306 | uint32_t *p; | 2307 | __be32 *p; |
| 2307 | 2308 | ||
| 2308 | *res = ACL4_SUPPORT_ALLOW_ACL|ACL4_SUPPORT_DENY_ACL; | 2309 | *res = ACL4_SUPPORT_ALLOW_ACL|ACL4_SUPPORT_DENY_ACL; |
| 2309 | if (unlikely(bitmap[0] & (FATTR4_WORD0_ACLSUPPORT - 1U))) | 2310 | if (unlikely(bitmap[0] & (FATTR4_WORD0_ACLSUPPORT - 1U))) |
| @@ -2319,7 +2320,7 @@ static int decode_attr_aclsupport(struct xdr_stream *xdr, uint32_t *bitmap, uint | |||
| 2319 | 2320 | ||
| 2320 | static int decode_attr_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *fileid) | 2321 | static int decode_attr_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *fileid) |
| 2321 | { | 2322 | { |
| 2322 | uint32_t *p; | 2323 | __be32 *p; |
| 2323 | 2324 | ||
| 2324 | *fileid = 0; | 2325 | *fileid = 0; |
| 2325 | if (unlikely(bitmap[0] & (FATTR4_WORD0_FILEID - 1U))) | 2326 | if (unlikely(bitmap[0] & (FATTR4_WORD0_FILEID - 1U))) |
| @@ -2335,7 +2336,7 @@ static int decode_attr_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t | |||
| 2335 | 2336 | ||
| 2336 | static int decode_attr_mounted_on_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *fileid) | 2337 | static int decode_attr_mounted_on_fileid(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *fileid) |
| 2337 | { | 2338 | { |
| 2338 | uint32_t *p; | 2339 | __be32 *p; |
| 2339 | 2340 | ||
| 2340 | *fileid = 0; | 2341 | *fileid = 0; |
| 2341 | if (unlikely(bitmap[1] & (FATTR4_WORD1_MOUNTED_ON_FILEID - 1U))) | 2342 | if (unlikely(bitmap[1] & (FATTR4_WORD1_MOUNTED_ON_FILEID - 1U))) |
| @@ -2351,7 +2352,7 @@ static int decode_attr_mounted_on_fileid(struct xdr_stream *xdr, uint32_t *bitma | |||
| 2351 | 2352 | ||
| 2352 | static int decode_attr_files_avail(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2353 | static int decode_attr_files_avail(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
| 2353 | { | 2354 | { |
| 2354 | uint32_t *p; | 2355 | __be32 *p; |
| 2355 | int status = 0; | 2356 | int status = 0; |
| 2356 | 2357 | ||
| 2357 | *res = 0; | 2358 | *res = 0; |
| @@ -2368,7 +2369,7 @@ static int decode_attr_files_avail(struct xdr_stream *xdr, uint32_t *bitmap, uin | |||
| 2368 | 2369 | ||
| 2369 | static int decode_attr_files_free(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2370 | static int decode_attr_files_free(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
| 2370 | { | 2371 | { |
| 2371 | uint32_t *p; | 2372 | __be32 *p; |
| 2372 | int status = 0; | 2373 | int status = 0; |
| 2373 | 2374 | ||
| 2374 | *res = 0; | 2375 | *res = 0; |
| @@ -2385,7 +2386,7 @@ static int decode_attr_files_free(struct xdr_stream *xdr, uint32_t *bitmap, uint | |||
| 2385 | 2386 | ||
| 2386 | static int decode_attr_files_total(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2387 | static int decode_attr_files_total(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
| 2387 | { | 2388 | { |
| 2388 | uint32_t *p; | 2389 | __be32 *p; |
| 2389 | int status = 0; | 2390 | int status = 0; |
| 2390 | 2391 | ||
| 2391 | *res = 0; | 2392 | *res = 0; |
| @@ -2403,7 +2404,7 @@ static int decode_attr_files_total(struct xdr_stream *xdr, uint32_t *bitmap, uin | |||
| 2403 | static int decode_pathname(struct xdr_stream *xdr, struct nfs4_pathname *path) | 2404 | static int decode_pathname(struct xdr_stream *xdr, struct nfs4_pathname *path) |
| 2404 | { | 2405 | { |
| 2405 | int n; | 2406 | int n; |
| 2406 | uint32_t *p; | 2407 | __be32 *p; |
| 2407 | int status = 0; | 2408 | int status = 0; |
| 2408 | 2409 | ||
| 2409 | READ_BUF(4); | 2410 | READ_BUF(4); |
| @@ -2448,7 +2449,7 @@ out_eio: | |||
| 2448 | static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs4_fs_locations *res) | 2449 | static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs4_fs_locations *res) |
| 2449 | { | 2450 | { |
| 2450 | int n; | 2451 | int n; |
| 2451 | uint32_t *p; | 2452 | __be32 *p; |
| 2452 | int status = -EIO; | 2453 | int status = -EIO; |
| 2453 | 2454 | ||
| 2454 | if (unlikely(bitmap[0] & (FATTR4_WORD0_FS_LOCATIONS -1U))) | 2455 | if (unlikely(bitmap[0] & (FATTR4_WORD0_FS_LOCATIONS -1U))) |
| @@ -2512,7 +2513,7 @@ out_eio: | |||
| 2512 | 2513 | ||
| 2513 | static int decode_attr_maxfilesize(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2514 | static int decode_attr_maxfilesize(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
| 2514 | { | 2515 | { |
| 2515 | uint32_t *p; | 2516 | __be32 *p; |
| 2516 | int status = 0; | 2517 | int status = 0; |
| 2517 | 2518 | ||
| 2518 | *res = 0; | 2519 | *res = 0; |
| @@ -2529,7 +2530,7 @@ static int decode_attr_maxfilesize(struct xdr_stream *xdr, uint32_t *bitmap, uin | |||
| 2529 | 2530 | ||
| 2530 | static int decode_attr_maxlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *maxlink) | 2531 | static int decode_attr_maxlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *maxlink) |
| 2531 | { | 2532 | { |
| 2532 | uint32_t *p; | 2533 | __be32 *p; |
| 2533 | int status = 0; | 2534 | int status = 0; |
| 2534 | 2535 | ||
| 2535 | *maxlink = 1; | 2536 | *maxlink = 1; |
| @@ -2546,7 +2547,7 @@ static int decode_attr_maxlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_ | |||
| 2546 | 2547 | ||
| 2547 | static int decode_attr_maxname(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *maxname) | 2548 | static int decode_attr_maxname(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *maxname) |
| 2548 | { | 2549 | { |
| 2549 | uint32_t *p; | 2550 | __be32 *p; |
| 2550 | int status = 0; | 2551 | int status = 0; |
| 2551 | 2552 | ||
| 2552 | *maxname = 1024; | 2553 | *maxname = 1024; |
| @@ -2563,7 +2564,7 @@ static int decode_attr_maxname(struct xdr_stream *xdr, uint32_t *bitmap, uint32_ | |||
| 2563 | 2564 | ||
| 2564 | static int decode_attr_maxread(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2565 | static int decode_attr_maxread(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
| 2565 | { | 2566 | { |
| 2566 | uint32_t *p; | 2567 | __be32 *p; |
| 2567 | int status = 0; | 2568 | int status = 0; |
| 2568 | 2569 | ||
| 2569 | *res = 1024; | 2570 | *res = 1024; |
| @@ -2584,7 +2585,7 @@ static int decode_attr_maxread(struct xdr_stream *xdr, uint32_t *bitmap, uint32_ | |||
| 2584 | 2585 | ||
| 2585 | static int decode_attr_maxwrite(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) | 2586 | static int decode_attr_maxwrite(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *res) |
| 2586 | { | 2587 | { |
| 2587 | uint32_t *p; | 2588 | __be32 *p; |
| 2588 | int status = 0; | 2589 | int status = 0; |
| 2589 | 2590 | ||
| 2590 | *res = 1024; | 2591 | *res = 1024; |
| @@ -2605,7 +2606,7 @@ static int decode_attr_maxwrite(struct xdr_stream *xdr, uint32_t *bitmap, uint32 | |||
| 2605 | 2606 | ||
| 2606 | static int decode_attr_mode(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *mode) | 2607 | static int decode_attr_mode(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *mode) |
| 2607 | { | 2608 | { |
| 2608 | uint32_t *p; | 2609 | __be32 *p; |
| 2609 | 2610 | ||
| 2610 | *mode = 0; | 2611 | *mode = 0; |
| 2611 | if (unlikely(bitmap[1] & (FATTR4_WORD1_MODE - 1U))) | 2612 | if (unlikely(bitmap[1] & (FATTR4_WORD1_MODE - 1U))) |
| @@ -2622,7 +2623,7 @@ static int decode_attr_mode(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t * | |||
| 2622 | 2623 | ||
| 2623 | static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *nlink) | 2624 | static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t *nlink) |
| 2624 | { | 2625 | { |
| 2625 | uint32_t *p; | 2626 | __be32 *p; |
| 2626 | 2627 | ||
| 2627 | *nlink = 1; | 2628 | *nlink = 1; |
| 2628 | if (unlikely(bitmap[1] & (FATTR4_WORD1_NUMLINKS - 1U))) | 2629 | if (unlikely(bitmap[1] & (FATTR4_WORD1_NUMLINKS - 1U))) |
| @@ -2638,7 +2639,8 @@ static int decode_attr_nlink(struct xdr_stream *xdr, uint32_t *bitmap, uint32_t | |||
| 2638 | 2639 | ||
| 2639 | static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *uid) | 2640 | static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *uid) |
| 2640 | { | 2641 | { |
| 2641 | uint32_t len, *p; | 2642 | uint32_t len; |
| 2643 | __be32 *p; | ||
| 2642 | 2644 | ||
| 2643 | *uid = -2; | 2645 | *uid = -2; |
| 2644 | if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER - 1U))) | 2646 | if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER - 1U))) |
| @@ -2662,7 +2664,8 @@ static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, struct nf | |||
| 2662 | 2664 | ||
| 2663 | static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *gid) | 2665 | static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs_client *clp, int32_t *gid) |
| 2664 | { | 2666 | { |
| 2665 | uint32_t len, *p; | 2667 | uint32_t len; |
| 2668 | __be32 *p; | ||
| 2666 | 2669 | ||
| 2667 | *gid = -2; | 2670 | *gid = -2; |
| 2668 | if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER_GROUP - 1U))) | 2671 | if (unlikely(bitmap[1] & (FATTR4_WORD1_OWNER_GROUP - 1U))) |
| @@ -2686,7 +2689,8 @@ static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, struct nf | |||
| 2686 | 2689 | ||
| 2687 | static int decode_attr_rdev(struct xdr_stream *xdr, uint32_t *bitmap, dev_t *rdev) | 2690 | static int decode_attr_rdev(struct xdr_stream *xdr, uint32_t *bitmap, dev_t *rdev) |
| 2688 | { | 2691 | { |
| 2689 | uint32_t major = 0, minor = 0, *p; | 2692 | uint32_t major = 0, minor = 0; |
| 2693 | __be32 *p; | ||
| 2690 | 2694 | ||
| 2691 | *rdev = MKDEV(0,0); | 2695 | *rdev = MKDEV(0,0); |
| 2692 | if (unlikely(bitmap[1] & (FATTR4_WORD1_RAWDEV - 1U))) | 2696 | if (unlikely(bitmap[1] & (FATTR4_WORD1_RAWDEV - 1U))) |
| @@ -2708,7 +2712,7 @@ static int decode_attr_rdev(struct xdr_stream *xdr, uint32_t *bitmap, dev_t *rde | |||
| 2708 | 2712 | ||
| 2709 | static int decode_attr_space_avail(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2713 | static int decode_attr_space_avail(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
| 2710 | { | 2714 | { |
| 2711 | uint32_t *p; | 2715 | __be32 *p; |
| 2712 | int status = 0; | 2716 | int status = 0; |
| 2713 | 2717 | ||
| 2714 | *res = 0; | 2718 | *res = 0; |
| @@ -2725,7 +2729,7 @@ static int decode_attr_space_avail(struct xdr_stream *xdr, uint32_t *bitmap, uin | |||
| 2725 | 2729 | ||
| 2726 | static int decode_attr_space_free(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2730 | static int decode_attr_space_free(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
| 2727 | { | 2731 | { |
| 2728 | uint32_t *p; | 2732 | __be32 *p; |
| 2729 | int status = 0; | 2733 | int status = 0; |
| 2730 | 2734 | ||
| 2731 | *res = 0; | 2735 | *res = 0; |
| @@ -2742,7 +2746,7 @@ static int decode_attr_space_free(struct xdr_stream *xdr, uint32_t *bitmap, uint | |||
| 2742 | 2746 | ||
| 2743 | static int decode_attr_space_total(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) | 2747 | static int decode_attr_space_total(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *res) |
| 2744 | { | 2748 | { |
| 2745 | uint32_t *p; | 2749 | __be32 *p; |
| 2746 | int status = 0; | 2750 | int status = 0; |
| 2747 | 2751 | ||
| 2748 | *res = 0; | 2752 | *res = 0; |
| @@ -2759,7 +2763,7 @@ static int decode_attr_space_total(struct xdr_stream *xdr, uint32_t *bitmap, uin | |||
| 2759 | 2763 | ||
| 2760 | static int decode_attr_space_used(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *used) | 2764 | static int decode_attr_space_used(struct xdr_stream *xdr, uint32_t *bitmap, uint64_t *used) |
| 2761 | { | 2765 | { |
| 2762 | uint32_t *p; | 2766 | __be32 *p; |
| 2763 | 2767 | ||
| 2764 | *used = 0; | 2768 | *used = 0; |
| 2765 | if (unlikely(bitmap[1] & (FATTR4_WORD1_SPACE_USED - 1U))) | 2769 | if (unlikely(bitmap[1] & (FATTR4_WORD1_SPACE_USED - 1U))) |
| @@ -2776,7 +2780,7 @@ static int decode_attr_space_used(struct xdr_stream *xdr, uint32_t *bitmap, uint | |||
| 2776 | 2780 | ||
| 2777 | static int decode_attr_time(struct xdr_stream *xdr, struct timespec *time) | 2781 | static int decode_attr_time(struct xdr_stream *xdr, struct timespec *time) |
| 2778 | { | 2782 | { |
| 2779 | uint32_t *p; | 2783 | __be32 *p; |
| 2780 | uint64_t sec; | 2784 | uint64_t sec; |
| 2781 | uint32_t nsec; | 2785 | uint32_t nsec; |
| 2782 | 2786 | ||
| @@ -2836,7 +2840,7 @@ static int decode_attr_time_modify(struct xdr_stream *xdr, uint32_t *bitmap, str | |||
| 2836 | return status; | 2840 | return status; |
| 2837 | } | 2841 | } |
| 2838 | 2842 | ||
| 2839 | static int verify_attr_len(struct xdr_stream *xdr, uint32_t *savep, uint32_t attrlen) | 2843 | static int verify_attr_len(struct xdr_stream *xdr, __be32 *savep, uint32_t attrlen) |
| 2840 | { | 2844 | { |
| 2841 | unsigned int attrwords = XDR_QUADLEN(attrlen); | 2845 | unsigned int attrwords = XDR_QUADLEN(attrlen); |
| 2842 | unsigned int nwords = xdr->p - savep; | 2846 | unsigned int nwords = xdr->p - savep; |
| @@ -2854,7 +2858,7 @@ static int verify_attr_len(struct xdr_stream *xdr, uint32_t *savep, uint32_t att | |||
| 2854 | 2858 | ||
| 2855 | static int decode_change_info(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) | 2859 | static int decode_change_info(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) |
| 2856 | { | 2860 | { |
| 2857 | uint32_t *p; | 2861 | __be32 *p; |
| 2858 | 2862 | ||
| 2859 | READ_BUF(20); | 2863 | READ_BUF(20); |
| 2860 | READ32(cinfo->atomic); | 2864 | READ32(cinfo->atomic); |
| @@ -2865,7 +2869,7 @@ static int decode_change_info(struct xdr_stream *xdr, struct nfs4_change_info *c | |||
| 2865 | 2869 | ||
| 2866 | static int decode_access(struct xdr_stream *xdr, struct nfs4_accessres *access) | 2870 | static int decode_access(struct xdr_stream *xdr, struct nfs4_accessres *access) |
| 2867 | { | 2871 | { |
| 2868 | uint32_t *p; | 2872 | __be32 *p; |
| 2869 | uint32_t supp, acc; | 2873 | uint32_t supp, acc; |
| 2870 | int status; | 2874 | int status; |
| 2871 | 2875 | ||
| @@ -2882,7 +2886,7 @@ static int decode_access(struct xdr_stream *xdr, struct nfs4_accessres *access) | |||
| 2882 | 2886 | ||
| 2883 | static int decode_close(struct xdr_stream *xdr, struct nfs_closeres *res) | 2887 | static int decode_close(struct xdr_stream *xdr, struct nfs_closeres *res) |
| 2884 | { | 2888 | { |
| 2885 | uint32_t *p; | 2889 | __be32 *p; |
| 2886 | int status; | 2890 | int status; |
| 2887 | 2891 | ||
| 2888 | status = decode_op_hdr(xdr, OP_CLOSE); | 2892 | status = decode_op_hdr(xdr, OP_CLOSE); |
| @@ -2895,7 +2899,7 @@ static int decode_close(struct xdr_stream *xdr, struct nfs_closeres *res) | |||
| 2895 | 2899 | ||
| 2896 | static int decode_commit(struct xdr_stream *xdr, struct nfs_writeres *res) | 2900 | static int decode_commit(struct xdr_stream *xdr, struct nfs_writeres *res) |
| 2897 | { | 2901 | { |
| 2898 | uint32_t *p; | 2902 | __be32 *p; |
| 2899 | int status; | 2903 | int status; |
| 2900 | 2904 | ||
| 2901 | status = decode_op_hdr(xdr, OP_COMMIT); | 2905 | status = decode_op_hdr(xdr, OP_COMMIT); |
| @@ -2908,7 +2912,7 @@ static int decode_commit(struct xdr_stream *xdr, struct nfs_writeres *res) | |||
| 2908 | 2912 | ||
| 2909 | static int decode_create(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) | 2913 | static int decode_create(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) |
| 2910 | { | 2914 | { |
| 2911 | uint32_t *p; | 2915 | __be32 *p; |
| 2912 | uint32_t bmlen; | 2916 | uint32_t bmlen; |
| 2913 | int status; | 2917 | int status; |
| 2914 | 2918 | ||
| @@ -2925,7 +2929,7 @@ static int decode_create(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) | |||
| 2925 | 2929 | ||
| 2926 | static int decode_server_caps(struct xdr_stream *xdr, struct nfs4_server_caps_res *res) | 2930 | static int decode_server_caps(struct xdr_stream *xdr, struct nfs4_server_caps_res *res) |
| 2927 | { | 2931 | { |
| 2928 | uint32_t *savep; | 2932 | __be32 *savep; |
| 2929 | uint32_t attrlen, | 2933 | uint32_t attrlen, |
| 2930 | bitmap[2] = {0}; | 2934 | bitmap[2] = {0}; |
| 2931 | int status; | 2935 | int status; |
| @@ -2952,7 +2956,7 @@ xdr_error: | |||
| 2952 | 2956 | ||
| 2953 | static int decode_statfs(struct xdr_stream *xdr, struct nfs_fsstat *fsstat) | 2957 | static int decode_statfs(struct xdr_stream *xdr, struct nfs_fsstat *fsstat) |
| 2954 | { | 2958 | { |
| 2955 | uint32_t *savep; | 2959 | __be32 *savep; |
| 2956 | uint32_t attrlen, | 2960 | uint32_t attrlen, |
| 2957 | bitmap[2] = {0}; | 2961 | bitmap[2] = {0}; |
| 2958 | int status; | 2962 | int status; |
| @@ -2985,7 +2989,7 @@ xdr_error: | |||
| 2985 | 2989 | ||
| 2986 | static int decode_pathconf(struct xdr_stream *xdr, struct nfs_pathconf *pathconf) | 2990 | static int decode_pathconf(struct xdr_stream *xdr, struct nfs_pathconf *pathconf) |
| 2987 | { | 2991 | { |
| 2988 | uint32_t *savep; | 2992 | __be32 *savep; |
| 2989 | uint32_t attrlen, | 2993 | uint32_t attrlen, |
| 2990 | bitmap[2] = {0}; | 2994 | bitmap[2] = {0}; |
| 2991 | int status; | 2995 | int status; |
| @@ -3010,7 +3014,7 @@ xdr_error: | |||
| 3010 | 3014 | ||
| 3011 | static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, const struct nfs_server *server) | 3015 | static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, const struct nfs_server *server) |
| 3012 | { | 3016 | { |
| 3013 | uint32_t *savep; | 3017 | __be32 *savep; |
| 3014 | uint32_t attrlen, | 3018 | uint32_t attrlen, |
| 3015 | bitmap[2] = {0}, | 3019 | bitmap[2] = {0}, |
| 3016 | type; | 3020 | type; |
| @@ -3079,7 +3083,7 @@ xdr_error: | |||
| 3079 | 3083 | ||
| 3080 | static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo) | 3084 | static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo) |
| 3081 | { | 3085 | { |
| 3082 | uint32_t *savep; | 3086 | __be32 *savep; |
| 3083 | uint32_t attrlen, bitmap[2]; | 3087 | uint32_t attrlen, bitmap[2]; |
| 3084 | int status; | 3088 | int status; |
| 3085 | 3089 | ||
| @@ -3111,7 +3115,7 @@ xdr_error: | |||
| 3111 | 3115 | ||
| 3112 | static int decode_getfh(struct xdr_stream *xdr, struct nfs_fh *fh) | 3116 | static int decode_getfh(struct xdr_stream *xdr, struct nfs_fh *fh) |
| 3113 | { | 3117 | { |
| 3114 | uint32_t *p; | 3118 | __be32 *p; |
| 3115 | uint32_t len; | 3119 | uint32_t len; |
| 3116 | int status; | 3120 | int status; |
| 3117 | 3121 | ||
| @@ -3147,7 +3151,7 @@ static int decode_link(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) | |||
| 3147 | static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl) | 3151 | static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl) |
| 3148 | { | 3152 | { |
| 3149 | uint64_t offset, length, clientid; | 3153 | uint64_t offset, length, clientid; |
| 3150 | uint32_t *p; | 3154 | __be32 *p; |
| 3151 | uint32_t namelen, type; | 3155 | uint32_t namelen, type; |
| 3152 | 3156 | ||
| 3153 | READ_BUF(32); | 3157 | READ_BUF(32); |
| @@ -3172,7 +3176,7 @@ static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl) | |||
| 3172 | 3176 | ||
| 3173 | static int decode_lock(struct xdr_stream *xdr, struct nfs_lock_res *res) | 3177 | static int decode_lock(struct xdr_stream *xdr, struct nfs_lock_res *res) |
| 3174 | { | 3178 | { |
| 3175 | uint32_t *p; | 3179 | __be32 *p; |
| 3176 | int status; | 3180 | int status; |
| 3177 | 3181 | ||
| 3178 | status = decode_op_hdr(xdr, OP_LOCK); | 3182 | status = decode_op_hdr(xdr, OP_LOCK); |
| @@ -3195,7 +3199,7 @@ static int decode_lockt(struct xdr_stream *xdr, struct nfs_lockt_res *res) | |||
| 3195 | 3199 | ||
| 3196 | static int decode_locku(struct xdr_stream *xdr, struct nfs_locku_res *res) | 3200 | static int decode_locku(struct xdr_stream *xdr, struct nfs_locku_res *res) |
| 3197 | { | 3201 | { |
| 3198 | uint32_t *p; | 3202 | __be32 *p; |
| 3199 | int status; | 3203 | int status; |
| 3200 | 3204 | ||
| 3201 | status = decode_op_hdr(xdr, OP_LOCKU); | 3205 | status = decode_op_hdr(xdr, OP_LOCKU); |
| @@ -3214,7 +3218,7 @@ static int decode_lookup(struct xdr_stream *xdr) | |||
| 3214 | /* This is too sick! */ | 3218 | /* This is too sick! */ |
| 3215 | static int decode_space_limit(struct xdr_stream *xdr, u64 *maxsize) | 3219 | static int decode_space_limit(struct xdr_stream *xdr, u64 *maxsize) |
| 3216 | { | 3220 | { |
| 3217 | uint32_t *p; | 3221 | __be32 *p; |
| 3218 | uint32_t limit_type, nblocks, blocksize; | 3222 | uint32_t limit_type, nblocks, blocksize; |
| 3219 | 3223 | ||
| 3220 | READ_BUF(12); | 3224 | READ_BUF(12); |
| @@ -3233,7 +3237,7 @@ static int decode_space_limit(struct xdr_stream *xdr, u64 *maxsize) | |||
| 3233 | 3237 | ||
| 3234 | static int decode_delegation(struct xdr_stream *xdr, struct nfs_openres *res) | 3238 | static int decode_delegation(struct xdr_stream *xdr, struct nfs_openres *res) |
| 3235 | { | 3239 | { |
| 3236 | uint32_t *p; | 3240 | __be32 *p; |
| 3237 | uint32_t delegation_type; | 3241 | uint32_t delegation_type; |
| 3238 | 3242 | ||
| 3239 | READ_BUF(4); | 3243 | READ_BUF(4); |
| @@ -3259,7 +3263,7 @@ static int decode_delegation(struct xdr_stream *xdr, struct nfs_openres *res) | |||
| 3259 | 3263 | ||
| 3260 | static int decode_open(struct xdr_stream *xdr, struct nfs_openres *res) | 3264 | static int decode_open(struct xdr_stream *xdr, struct nfs_openres *res) |
| 3261 | { | 3265 | { |
| 3262 | uint32_t *p; | 3266 | __be32 *p; |
| 3263 | uint32_t bmlen; | 3267 | uint32_t bmlen; |
| 3264 | int status; | 3268 | int status; |
| 3265 | 3269 | ||
| @@ -3287,7 +3291,7 @@ xdr_error: | |||
| 3287 | 3291 | ||
| 3288 | static int decode_open_confirm(struct xdr_stream *xdr, struct nfs_open_confirmres *res) | 3292 | static int decode_open_confirm(struct xdr_stream *xdr, struct nfs_open_confirmres *res) |
| 3289 | { | 3293 | { |
| 3290 | uint32_t *p; | 3294 | __be32 *p; |
| 3291 | int status; | 3295 | int status; |
| 3292 | 3296 | ||
| 3293 | status = decode_op_hdr(xdr, OP_OPEN_CONFIRM); | 3297 | status = decode_op_hdr(xdr, OP_OPEN_CONFIRM); |
| @@ -3300,7 +3304,7 @@ static int decode_open_confirm(struct xdr_stream *xdr, struct nfs_open_confirmre | |||
| 3300 | 3304 | ||
| 3301 | static int decode_open_downgrade(struct xdr_stream *xdr, struct nfs_closeres *res) | 3305 | static int decode_open_downgrade(struct xdr_stream *xdr, struct nfs_closeres *res) |
| 3302 | { | 3306 | { |
| 3303 | uint32_t *p; | 3307 | __be32 *p; |
| 3304 | int status; | 3308 | int status; |
| 3305 | 3309 | ||
| 3306 | status = decode_op_hdr(xdr, OP_OPEN_DOWNGRADE); | 3310 | status = decode_op_hdr(xdr, OP_OPEN_DOWNGRADE); |
| @@ -3324,7 +3328,7 @@ static int decode_putrootfh(struct xdr_stream *xdr) | |||
| 3324 | static int decode_read(struct xdr_stream *xdr, struct rpc_rqst *req, struct nfs_readres *res) | 3328 | static int decode_read(struct xdr_stream *xdr, struct rpc_rqst *req, struct nfs_readres *res) |
| 3325 | { | 3329 | { |
| 3326 | struct kvec *iov = req->rq_rcv_buf.head; | 3330 | struct kvec *iov = req->rq_rcv_buf.head; |
| 3327 | uint32_t *p; | 3331 | __be32 *p; |
| 3328 | uint32_t count, eof, recvd, hdrlen; | 3332 | uint32_t count, eof, recvd, hdrlen; |
| 3329 | int status; | 3333 | int status; |
| 3330 | 3334 | ||
| @@ -3354,7 +3358,7 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n | |||
| 3354 | struct page *page = *rcvbuf->pages; | 3358 | struct page *page = *rcvbuf->pages; |
| 3355 | struct kvec *iov = rcvbuf->head; | 3359 | struct kvec *iov = rcvbuf->head; |
| 3356 | unsigned int nr, pglen = rcvbuf->page_len; | 3360 | unsigned int nr, pglen = rcvbuf->page_len; |
| 3357 | uint32_t *end, *entry, *p, *kaddr; | 3361 | __be32 *end, *entry, *p, *kaddr; |
| 3358 | uint32_t len, attrlen, xlen; | 3362 | uint32_t len, attrlen, xlen; |
| 3359 | int hdrlen, recvd, status; | 3363 | int hdrlen, recvd, status; |
| 3360 | 3364 | ||
| @@ -3376,7 +3380,7 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n | |||
| 3376 | xdr_read_pages(xdr, pglen); | 3380 | xdr_read_pages(xdr, pglen); |
| 3377 | 3381 | ||
| 3378 | BUG_ON(pglen + readdir->pgbase > PAGE_CACHE_SIZE); | 3382 | BUG_ON(pglen + readdir->pgbase > PAGE_CACHE_SIZE); |
| 3379 | kaddr = p = (uint32_t *) kmap_atomic(page, KM_USER0); | 3383 | kaddr = p = kmap_atomic(page, KM_USER0); |
| 3380 | end = p + ((pglen + readdir->pgbase) >> 2); | 3384 | end = p + ((pglen + readdir->pgbase) >> 2); |
| 3381 | entry = p; | 3385 | entry = p; |
| 3382 | for (nr = 0; *p++; nr++) { | 3386 | for (nr = 0; *p++; nr++) { |
| @@ -3428,7 +3432,7 @@ static int decode_readlink(struct xdr_stream *xdr, struct rpc_rqst *req) | |||
| 3428 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; | 3432 | struct xdr_buf *rcvbuf = &req->rq_rcv_buf; |
| 3429 | struct kvec *iov = rcvbuf->head; | 3433 | struct kvec *iov = rcvbuf->head; |
| 3430 | int hdrlen, len, recvd; | 3434 | int hdrlen, len, recvd; |
| 3431 | uint32_t *p; | 3435 | __be32 *p; |
| 3432 | char *kaddr; | 3436 | char *kaddr; |
| 3433 | int status; | 3437 | int status; |
| 3434 | 3438 | ||
| @@ -3505,7 +3509,7 @@ decode_restorefh(struct xdr_stream *xdr) | |||
| 3505 | static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req, | 3509 | static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req, |
| 3506 | size_t *acl_len) | 3510 | size_t *acl_len) |
| 3507 | { | 3511 | { |
| 3508 | uint32_t *savep; | 3512 | __be32 *savep; |
| 3509 | uint32_t attrlen, | 3513 | uint32_t attrlen, |
| 3510 | bitmap[2] = {0}; | 3514 | bitmap[2] = {0}; |
| 3511 | struct kvec *iov = req->rq_rcv_buf.head; | 3515 | struct kvec *iov = req->rq_rcv_buf.head; |
| @@ -3551,7 +3555,7 @@ decode_savefh(struct xdr_stream *xdr) | |||
| 3551 | 3555 | ||
| 3552 | static int decode_setattr(struct xdr_stream *xdr, struct nfs_setattrres *res) | 3556 | static int decode_setattr(struct xdr_stream *xdr, struct nfs_setattrres *res) |
| 3553 | { | 3557 | { |
| 3554 | uint32_t *p; | 3558 | __be32 *p; |
| 3555 | uint32_t bmlen; | 3559 | uint32_t bmlen; |
| 3556 | int status; | 3560 | int status; |
| 3557 | 3561 | ||
| @@ -3567,7 +3571,7 @@ static int decode_setattr(struct xdr_stream *xdr, struct nfs_setattrres *res) | |||
| 3567 | 3571 | ||
| 3568 | static int decode_setclientid(struct xdr_stream *xdr, struct nfs_client *clp) | 3572 | static int decode_setclientid(struct xdr_stream *xdr, struct nfs_client *clp) |
| 3569 | { | 3573 | { |
| 3570 | uint32_t *p; | 3574 | __be32 *p; |
| 3571 | uint32_t opnum; | 3575 | uint32_t opnum; |
| 3572 | int32_t nfserr; | 3576 | int32_t nfserr; |
| 3573 | 3577 | ||
| @@ -3610,7 +3614,7 @@ static int decode_setclientid_confirm(struct xdr_stream *xdr) | |||
| 3610 | 3614 | ||
| 3611 | static int decode_write(struct xdr_stream *xdr, struct nfs_writeres *res) | 3615 | static int decode_write(struct xdr_stream *xdr, struct nfs_writeres *res) |
| 3612 | { | 3616 | { |
| 3613 | uint32_t *p; | 3617 | __be32 *p; |
| 3614 | int status; | 3618 | int status; |
| 3615 | 3619 | ||
| 3616 | status = decode_op_hdr(xdr, OP_WRITE); | 3620 | status = decode_op_hdr(xdr, OP_WRITE); |
| @@ -3632,7 +3636,7 @@ static int decode_delegreturn(struct xdr_stream *xdr) | |||
| 3632 | /* | 3636 | /* |
| 3633 | * Decode OPEN_DOWNGRADE response | 3637 | * Decode OPEN_DOWNGRADE response |
| 3634 | */ | 3638 | */ |
| 3635 | static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_closeres *res) | 3639 | static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, __be32 *p, struct nfs_closeres *res) |
| 3636 | { | 3640 | { |
| 3637 | struct xdr_stream xdr; | 3641 | struct xdr_stream xdr; |
| 3638 | struct compound_hdr hdr; | 3642 | struct compound_hdr hdr; |
| @@ -3660,7 +3664,7 @@ out: | |||
| 3660 | /* | 3664 | /* |
| 3661 | * Decode ACCESS response | 3665 | * Decode ACCESS response |
| 3662 | */ | 3666 | */ |
| 3663 | static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_accessres *res) | 3667 | static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_accessres *res) |
| 3664 | { | 3668 | { |
| 3665 | struct xdr_stream xdr; | 3669 | struct xdr_stream xdr; |
| 3666 | struct compound_hdr hdr; | 3670 | struct compound_hdr hdr; |
| @@ -3678,7 +3682,7 @@ out: | |||
| 3678 | /* | 3682 | /* |
| 3679 | * Decode LOOKUP response | 3683 | * Decode LOOKUP response |
| 3680 | */ | 3684 | */ |
| 3681 | static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_lookup_res *res) | 3685 | static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_lookup_res *res) |
| 3682 | { | 3686 | { |
| 3683 | struct xdr_stream xdr; | 3687 | struct xdr_stream xdr; |
| 3684 | struct compound_hdr hdr; | 3688 | struct compound_hdr hdr; |
| @@ -3701,7 +3705,7 @@ out: | |||
| 3701 | /* | 3705 | /* |
| 3702 | * Decode LOOKUP_ROOT response | 3706 | * Decode LOOKUP_ROOT response |
| 3703 | */ | 3707 | */ |
| 3704 | static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_lookup_res *res) | 3708 | static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_lookup_res *res) |
| 3705 | { | 3709 | { |
| 3706 | struct xdr_stream xdr; | 3710 | struct xdr_stream xdr; |
| 3707 | struct compound_hdr hdr; | 3711 | struct compound_hdr hdr; |
| @@ -3721,7 +3725,7 @@ out: | |||
| 3721 | /* | 3725 | /* |
| 3722 | * Decode REMOVE response | 3726 | * Decode REMOVE response |
| 3723 | */ | 3727 | */ |
| 3724 | static int nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_remove_res *res) | 3728 | static int nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_remove_res *res) |
| 3725 | { | 3729 | { |
| 3726 | struct xdr_stream xdr; | 3730 | struct xdr_stream xdr; |
| 3727 | struct compound_hdr hdr; | 3731 | struct compound_hdr hdr; |
| @@ -3742,7 +3746,7 @@ out: | |||
| 3742 | /* | 3746 | /* |
| 3743 | * Decode RENAME response | 3747 | * Decode RENAME response |
| 3744 | */ | 3748 | */ |
| 3745 | static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_rename_res *res) | 3749 | static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_rename_res *res) |
| 3746 | { | 3750 | { |
| 3747 | struct xdr_stream xdr; | 3751 | struct xdr_stream xdr; |
| 3748 | struct compound_hdr hdr; | 3752 | struct compound_hdr hdr; |
| @@ -3772,7 +3776,7 @@ out: | |||
| 3772 | /* | 3776 | /* |
| 3773 | * Decode LINK response | 3777 | * Decode LINK response |
| 3774 | */ | 3778 | */ |
| 3775 | static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_link_res *res) | 3779 | static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_link_res *res) |
| 3776 | { | 3780 | { |
| 3777 | struct xdr_stream xdr; | 3781 | struct xdr_stream xdr; |
| 3778 | struct compound_hdr hdr; | 3782 | struct compound_hdr hdr; |
| @@ -3805,7 +3809,7 @@ out: | |||
| 3805 | /* | 3809 | /* |
| 3806 | * Decode CREATE response | 3810 | * Decode CREATE response |
| 3807 | */ | 3811 | */ |
| 3808 | static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_create_res *res) | 3812 | static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_create_res *res) |
| 3809 | { | 3813 | { |
| 3810 | struct xdr_stream xdr; | 3814 | struct xdr_stream xdr; |
| 3811 | struct compound_hdr hdr; | 3815 | struct compound_hdr hdr; |
| @@ -3834,7 +3838,7 @@ out: | |||
| 3834 | /* | 3838 | /* |
| 3835 | * Decode SYMLINK response | 3839 | * Decode SYMLINK response |
| 3836 | */ | 3840 | */ |
| 3837 | static int nfs4_xdr_dec_symlink(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_create_res *res) | 3841 | static int nfs4_xdr_dec_symlink(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_create_res *res) |
| 3838 | { | 3842 | { |
| 3839 | return nfs4_xdr_dec_create(rqstp, p, res); | 3843 | return nfs4_xdr_dec_create(rqstp, p, res); |
| 3840 | } | 3844 | } |
| @@ -3842,7 +3846,7 @@ static int nfs4_xdr_dec_symlink(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4 | |||
| 3842 | /* | 3846 | /* |
| 3843 | * Decode GETATTR response | 3847 | * Decode GETATTR response |
| 3844 | */ | 3848 | */ |
| 3845 | static int nfs4_xdr_dec_getattr(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_getattr_res *res) | 3849 | static int nfs4_xdr_dec_getattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_getattr_res *res) |
| 3846 | { | 3850 | { |
| 3847 | struct xdr_stream xdr; | 3851 | struct xdr_stream xdr; |
| 3848 | struct compound_hdr hdr; | 3852 | struct compound_hdr hdr; |
| @@ -3865,7 +3869,7 @@ out: | |||
| 3865 | * Encode an SETACL request | 3869 | * Encode an SETACL request |
| 3866 | */ | 3870 | */ |
| 3867 | static int | 3871 | static int |
| 3868 | nfs4_xdr_enc_setacl(struct rpc_rqst *req, uint32_t *p, struct nfs_setaclargs *args) | 3872 | nfs4_xdr_enc_setacl(struct rpc_rqst *req, __be32 *p, struct nfs_setaclargs *args) |
| 3869 | { | 3873 | { |
| 3870 | struct xdr_stream xdr; | 3874 | struct xdr_stream xdr; |
| 3871 | struct compound_hdr hdr = { | 3875 | struct compound_hdr hdr = { |
| @@ -3886,7 +3890,7 @@ out: | |||
| 3886 | * Decode SETACL response | 3890 | * Decode SETACL response |
| 3887 | */ | 3891 | */ |
| 3888 | static int | 3892 | static int |
| 3889 | nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, uint32_t *p, void *res) | 3893 | nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p, void *res) |
| 3890 | { | 3894 | { |
| 3891 | struct xdr_stream xdr; | 3895 | struct xdr_stream xdr; |
| 3892 | struct compound_hdr hdr; | 3896 | struct compound_hdr hdr; |
| @@ -3908,7 +3912,7 @@ out: | |||
| 3908 | * Decode GETACL response | 3912 | * Decode GETACL response |
| 3909 | */ | 3913 | */ |
| 3910 | static int | 3914 | static int |
| 3911 | nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, uint32_t *p, size_t *acl_len) | 3915 | nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, __be32 *p, size_t *acl_len) |
| 3912 | { | 3916 | { |
| 3913 | struct xdr_stream xdr; | 3917 | struct xdr_stream xdr; |
| 3914 | struct compound_hdr hdr; | 3918 | struct compound_hdr hdr; |
| @@ -3930,7 +3934,7 @@ out: | |||
| 3930 | /* | 3934 | /* |
| 3931 | * Decode CLOSE response | 3935 | * Decode CLOSE response |
| 3932 | */ | 3936 | */ |
| 3933 | static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_closeres *res) | 3937 | static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, __be32 *p, struct nfs_closeres *res) |
| 3934 | { | 3938 | { |
| 3935 | struct xdr_stream xdr; | 3939 | struct xdr_stream xdr; |
| 3936 | struct compound_hdr hdr; | 3940 | struct compound_hdr hdr; |
| @@ -3960,7 +3964,7 @@ out: | |||
| 3960 | /* | 3964 | /* |
| 3961 | * Decode OPEN response | 3965 | * Decode OPEN response |
| 3962 | */ | 3966 | */ |
| 3963 | static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_openres *res) | 3967 | static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, __be32 *p, struct nfs_openres *res) |
| 3964 | { | 3968 | { |
| 3965 | struct xdr_stream xdr; | 3969 | struct xdr_stream xdr; |
| 3966 | struct compound_hdr hdr; | 3970 | struct compound_hdr hdr; |
| @@ -3994,7 +3998,7 @@ out: | |||
| 3994 | /* | 3998 | /* |
| 3995 | * Decode OPEN_CONFIRM response | 3999 | * Decode OPEN_CONFIRM response |
| 3996 | */ | 4000 | */ |
| 3997 | static int nfs4_xdr_dec_open_confirm(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_open_confirmres *res) | 4001 | static int nfs4_xdr_dec_open_confirm(struct rpc_rqst *rqstp, __be32 *p, struct nfs_open_confirmres *res) |
| 3998 | { | 4002 | { |
| 3999 | struct xdr_stream xdr; | 4003 | struct xdr_stream xdr; |
| 4000 | struct compound_hdr hdr; | 4004 | struct compound_hdr hdr; |
| @@ -4015,7 +4019,7 @@ out: | |||
| 4015 | /* | 4019 | /* |
| 4016 | * Decode OPEN response | 4020 | * Decode OPEN response |
| 4017 | */ | 4021 | */ |
| 4018 | static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_openres *res) | 4022 | static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs_openres *res) |
| 4019 | { | 4023 | { |
| 4020 | struct xdr_stream xdr; | 4024 | struct xdr_stream xdr; |
| 4021 | struct compound_hdr hdr; | 4025 | struct compound_hdr hdr; |
| @@ -4039,7 +4043,7 @@ out: | |||
| 4039 | /* | 4043 | /* |
| 4040 | * Decode SETATTR response | 4044 | * Decode SETATTR response |
| 4041 | */ | 4045 | */ |
| 4042 | static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_setattrres *res) | 4046 | static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs_setattrres *res) |
| 4043 | { | 4047 | { |
| 4044 | struct xdr_stream xdr; | 4048 | struct xdr_stream xdr; |
| 4045 | struct compound_hdr hdr; | 4049 | struct compound_hdr hdr; |
| @@ -4065,7 +4069,7 @@ out: | |||
| 4065 | /* | 4069 | /* |
| 4066 | * Decode LOCK response | 4070 | * Decode LOCK response |
| 4067 | */ | 4071 | */ |
| 4068 | static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_lock_res *res) | 4072 | static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lock_res *res) |
| 4069 | { | 4073 | { |
| 4070 | struct xdr_stream xdr; | 4074 | struct xdr_stream xdr; |
| 4071 | struct compound_hdr hdr; | 4075 | struct compound_hdr hdr; |
| @@ -4086,7 +4090,7 @@ out: | |||
| 4086 | /* | 4090 | /* |
| 4087 | * Decode LOCKT response | 4091 | * Decode LOCKT response |
| 4088 | */ | 4092 | */ |
| 4089 | static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_lockt_res *res) | 4093 | static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lockt_res *res) |
| 4090 | { | 4094 | { |
| 4091 | struct xdr_stream xdr; | 4095 | struct xdr_stream xdr; |
| 4092 | struct compound_hdr hdr; | 4096 | struct compound_hdr hdr; |
| @@ -4107,7 +4111,7 @@ out: | |||
| 4107 | /* | 4111 | /* |
| 4108 | * Decode LOCKU response | 4112 | * Decode LOCKU response |
| 4109 | */ | 4113 | */ |
| 4110 | static int nfs4_xdr_dec_locku(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_locku_res *res) | 4114 | static int nfs4_xdr_dec_locku(struct rpc_rqst *rqstp, __be32 *p, struct nfs_locku_res *res) |
| 4111 | { | 4115 | { |
| 4112 | struct xdr_stream xdr; | 4116 | struct xdr_stream xdr; |
| 4113 | struct compound_hdr hdr; | 4117 | struct compound_hdr hdr; |
| @@ -4128,7 +4132,7 @@ out: | |||
| 4128 | /* | 4132 | /* |
| 4129 | * Decode READLINK response | 4133 | * Decode READLINK response |
| 4130 | */ | 4134 | */ |
| 4131 | static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, uint32_t *p, void *res) | 4135 | static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, __be32 *p, void *res) |
| 4132 | { | 4136 | { |
| 4133 | struct xdr_stream xdr; | 4137 | struct xdr_stream xdr; |
| 4134 | struct compound_hdr hdr; | 4138 | struct compound_hdr hdr; |
| @@ -4149,7 +4153,7 @@ out: | |||
| 4149 | /* | 4153 | /* |
| 4150 | * Decode READDIR response | 4154 | * Decode READDIR response |
| 4151 | */ | 4155 | */ |
| 4152 | static int nfs4_xdr_dec_readdir(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_readdir_res *res) | 4156 | static int nfs4_xdr_dec_readdir(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_readdir_res *res) |
| 4153 | { | 4157 | { |
| 4154 | struct xdr_stream xdr; | 4158 | struct xdr_stream xdr; |
| 4155 | struct compound_hdr hdr; | 4159 | struct compound_hdr hdr; |
| @@ -4170,7 +4174,7 @@ out: | |||
| 4170 | /* | 4174 | /* |
| 4171 | * Decode Read response | 4175 | * Decode Read response |
| 4172 | */ | 4176 | */ |
| 4173 | static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_readres *res) | 4177 | static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, __be32 *p, struct nfs_readres *res) |
| 4174 | { | 4178 | { |
| 4175 | struct xdr_stream xdr; | 4179 | struct xdr_stream xdr; |
| 4176 | struct compound_hdr hdr; | 4180 | struct compound_hdr hdr; |
| @@ -4193,7 +4197,7 @@ out: | |||
| 4193 | /* | 4197 | /* |
| 4194 | * Decode WRITE response | 4198 | * Decode WRITE response |
| 4195 | */ | 4199 | */ |
| 4196 | static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_writeres *res) | 4200 | static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, __be32 *p, struct nfs_writeres *res) |
| 4197 | { | 4201 | { |
| 4198 | struct xdr_stream xdr; | 4202 | struct xdr_stream xdr; |
| 4199 | struct compound_hdr hdr; | 4203 | struct compound_hdr hdr; |
| @@ -4219,7 +4223,7 @@ out: | |||
| 4219 | /* | 4223 | /* |
| 4220 | * Decode COMMIT response | 4224 | * Decode COMMIT response |
| 4221 | */ | 4225 | */ |
| 4222 | static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_writeres *res) | 4226 | static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, __be32 *p, struct nfs_writeres *res) |
| 4223 | { | 4227 | { |
| 4224 | struct xdr_stream xdr; | 4228 | struct xdr_stream xdr; |
| 4225 | struct compound_hdr hdr; | 4229 | struct compound_hdr hdr; |
| @@ -4243,7 +4247,7 @@ out: | |||
| 4243 | /* | 4247 | /* |
| 4244 | * FSINFO request | 4248 | * FSINFO request |
| 4245 | */ | 4249 | */ |
| 4246 | static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs_fsinfo *fsinfo) | 4250 | static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, __be32 *p, struct nfs_fsinfo *fsinfo) |
| 4247 | { | 4251 | { |
| 4248 | struct xdr_stream xdr; | 4252 | struct xdr_stream xdr; |
| 4249 | struct compound_hdr hdr; | 4253 | struct compound_hdr hdr; |
| @@ -4263,7 +4267,7 @@ static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs_fsi | |||
| 4263 | /* | 4267 | /* |
| 4264 | * PATHCONF request | 4268 | * PATHCONF request |
| 4265 | */ | 4269 | */ |
| 4266 | static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, uint32_t *p, struct nfs_pathconf *pathconf) | 4270 | static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, __be32 *p, struct nfs_pathconf *pathconf) |
| 4267 | { | 4271 | { |
| 4268 | struct xdr_stream xdr; | 4272 | struct xdr_stream xdr; |
| 4269 | struct compound_hdr hdr; | 4273 | struct compound_hdr hdr; |
| @@ -4281,7 +4285,7 @@ static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, uint32_t *p, struct nfs_p | |||
| 4281 | /* | 4285 | /* |
| 4282 | * STATFS request | 4286 | * STATFS request |
| 4283 | */ | 4287 | */ |
| 4284 | static int nfs4_xdr_dec_statfs(struct rpc_rqst *req, uint32_t *p, struct nfs_fsstat *fsstat) | 4288 | static int nfs4_xdr_dec_statfs(struct rpc_rqst *req, __be32 *p, struct nfs_fsstat *fsstat) |
| 4285 | { | 4289 | { |
| 4286 | struct xdr_stream xdr; | 4290 | struct xdr_stream xdr; |
| 4287 | struct compound_hdr hdr; | 4291 | struct compound_hdr hdr; |
| @@ -4299,7 +4303,7 @@ static int nfs4_xdr_dec_statfs(struct rpc_rqst *req, uint32_t *p, struct nfs_fss | |||
| 4299 | /* | 4303 | /* |
| 4300 | * GETATTR_BITMAP request | 4304 | * GETATTR_BITMAP request |
| 4301 | */ | 4305 | */ |
| 4302 | static int nfs4_xdr_dec_server_caps(struct rpc_rqst *req, uint32_t *p, struct nfs4_server_caps_res *res) | 4306 | static int nfs4_xdr_dec_server_caps(struct rpc_rqst *req, __be32 *p, struct nfs4_server_caps_res *res) |
| 4303 | { | 4307 | { |
| 4304 | struct xdr_stream xdr; | 4308 | struct xdr_stream xdr; |
| 4305 | struct compound_hdr hdr; | 4309 | struct compound_hdr hdr; |
| @@ -4318,7 +4322,7 @@ out: | |||
| 4318 | /* | 4322 | /* |
| 4319 | * Decode RENEW response | 4323 | * Decode RENEW response |
| 4320 | */ | 4324 | */ |
| 4321 | static int nfs4_xdr_dec_renew(struct rpc_rqst *rqstp, uint32_t *p, void *dummy) | 4325 | static int nfs4_xdr_dec_renew(struct rpc_rqst *rqstp, __be32 *p, void *dummy) |
| 4322 | { | 4326 | { |
| 4323 | struct xdr_stream xdr; | 4327 | struct xdr_stream xdr; |
| 4324 | struct compound_hdr hdr; | 4328 | struct compound_hdr hdr; |
| @@ -4334,7 +4338,7 @@ static int nfs4_xdr_dec_renew(struct rpc_rqst *rqstp, uint32_t *p, void *dummy) | |||
| 4334 | /* | 4338 | /* |
| 4335 | * a SETCLIENTID request | 4339 | * a SETCLIENTID request |
| 4336 | */ | 4340 | */ |
| 4337 | static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, uint32_t *p, | 4341 | static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, __be32 *p, |
| 4338 | struct nfs_client *clp) | 4342 | struct nfs_client *clp) |
| 4339 | { | 4343 | { |
| 4340 | struct xdr_stream xdr; | 4344 | struct xdr_stream xdr; |
| @@ -4353,7 +4357,7 @@ static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, uint32_t *p, | |||
| 4353 | /* | 4357 | /* |
| 4354 | * a SETCLIENTID_CONFIRM request | 4358 | * a SETCLIENTID_CONFIRM request |
| 4355 | */ | 4359 | */ |
| 4356 | static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, struct nfs_fsinfo *fsinfo) | 4360 | static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req, __be32 *p, struct nfs_fsinfo *fsinfo) |
| 4357 | { | 4361 | { |
| 4358 | struct xdr_stream xdr; | 4362 | struct xdr_stream xdr; |
| 4359 | struct compound_hdr hdr; | 4363 | struct compound_hdr hdr; |
| @@ -4375,7 +4379,7 @@ static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, s | |||
| 4375 | /* | 4379 | /* |
| 4376 | * DELEGRETURN request | 4380 | * DELEGRETURN request |
| 4377 | */ | 4381 | */ |
| 4378 | static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_delegreturnres *res) | 4382 | static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_delegreturnres *res) |
| 4379 | { | 4383 | { |
| 4380 | struct xdr_stream xdr; | 4384 | struct xdr_stream xdr; |
| 4381 | struct compound_hdr hdr; | 4385 | struct compound_hdr hdr; |
| @@ -4397,7 +4401,7 @@ out: | |||
| 4397 | /* | 4401 | /* |
| 4398 | * FS_LOCATIONS request | 4402 | * FS_LOCATIONS request |
| 4399 | */ | 4403 | */ |
| 4400 | static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, uint32_t *p, struct nfs4_fs_locations *res) | 4404 | static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, __be32 *p, struct nfs4_fs_locations *res) |
| 4401 | { | 4405 | { |
| 4402 | struct xdr_stream xdr; | 4406 | struct xdr_stream xdr; |
| 4403 | struct compound_hdr hdr; | 4407 | struct compound_hdr hdr; |
| @@ -4417,7 +4421,7 @@ out: | |||
| 4417 | return status; | 4421 | return status; |
| 4418 | } | 4422 | } |
| 4419 | 4423 | ||
| 4420 | uint32_t *nfs4_decode_dirent(uint32_t *p, struct nfs_entry *entry, int plus) | 4424 | __be32 *nfs4_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus) |
| 4421 | { | 4425 | { |
| 4422 | uint32_t bitmap[2] = {0}; | 4426 | uint32_t bitmap[2] = {0}; |
| 4423 | uint32_t len; | 4427 | uint32_t len; |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 28659a919d6e..28108c82b887 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -834,7 +834,7 @@ static int nfs4_get_sb(struct file_system_type *fs_type, | |||
| 834 | } | 834 | } |
| 835 | /* RFC3530: The default port for NFS is 2049 */ | 835 | /* RFC3530: The default port for NFS is 2049 */ |
| 836 | if (addr.sin_port == 0) | 836 | if (addr.sin_port == 0) |
| 837 | addr.sin_port = NFS_PORT; | 837 | addr.sin_port = htons(NFS_PORT); |
| 838 | 838 | ||
| 839 | /* Grab the authentication type */ | 839 | /* Grab the authentication type */ |
| 840 | authflavour = RPC_AUTH_UNIX; | 840 | authflavour = RPC_AUTH_UNIX; |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index f6675d2c386c..883dd4a1c157 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
| @@ -57,6 +57,8 @@ | |||
| 57 | #include <linux/nfs_fs.h> | 57 | #include <linux/nfs_fs.h> |
| 58 | #include <linux/nfs_mount.h> | 58 | #include <linux/nfs_mount.h> |
| 59 | #include <linux/nfs_page.h> | 59 | #include <linux/nfs_page.h> |
| 60 | #include <linux/backing-dev.h> | ||
| 61 | |||
| 60 | #include <asm/uaccess.h> | 62 | #include <asm/uaccess.h> |
| 61 | #include <linux/smp_lock.h> | 63 | #include <linux/smp_lock.h> |
| 62 | 64 | ||
| @@ -395,7 +397,7 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc) | |||
| 395 | out: | 397 | out: |
| 396 | clear_bit(BDI_write_congested, &bdi->state); | 398 | clear_bit(BDI_write_congested, &bdi->state); |
| 397 | wake_up_all(&nfs_write_congestion); | 399 | wake_up_all(&nfs_write_congestion); |
| 398 | writeback_congestion_end(); | 400 | congestion_end(WRITE); |
| 399 | return err; | 401 | return err; |
| 400 | } | 402 | } |
| 401 | 403 | ||
| @@ -588,10 +590,10 @@ static void nfs_cancel_commit_list(struct list_head *head) | |||
| 588 | 590 | ||
| 589 | while(!list_empty(head)) { | 591 | while(!list_empty(head)) { |
| 590 | req = nfs_list_entry(head->next); | 592 | req = nfs_list_entry(head->next); |
| 593 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); | ||
| 591 | nfs_list_remove_request(req); | 594 | nfs_list_remove_request(req); |
| 592 | nfs_inode_remove_request(req); | 595 | nfs_inode_remove_request(req); |
| 593 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); | 596 | nfs_unlock_request(req); |
| 594 | nfs_clear_page_writeback(req); | ||
| 595 | } | 597 | } |
| 596 | } | 598 | } |
| 597 | 599 | ||
diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c index 0c2be8c0307d..c11f5375d7c1 100644 --- a/fs/nfs_common/nfsacl.c +++ b/fs/nfs_common/nfsacl.c | |||
| @@ -46,7 +46,7 @@ xdr_nfsace_encode(struct xdr_array2_desc *desc, void *elem) | |||
| 46 | { | 46 | { |
| 47 | struct nfsacl_encode_desc *nfsacl_desc = | 47 | struct nfsacl_encode_desc *nfsacl_desc = |
| 48 | (struct nfsacl_encode_desc *) desc; | 48 | (struct nfsacl_encode_desc *) desc; |
| 49 | u32 *p = (u32 *) elem; | 49 | __be32 *p = elem; |
| 50 | 50 | ||
| 51 | struct posix_acl_entry *entry = | 51 | struct posix_acl_entry *entry = |
| 52 | &nfsacl_desc->acl->a_entries[nfsacl_desc->count++]; | 52 | &nfsacl_desc->acl->a_entries[nfsacl_desc->count++]; |
| @@ -127,7 +127,7 @@ xdr_nfsace_decode(struct xdr_array2_desc *desc, void *elem) | |||
| 127 | { | 127 | { |
| 128 | struct nfsacl_decode_desc *nfsacl_desc = | 128 | struct nfsacl_decode_desc *nfsacl_desc = |
| 129 | (struct nfsacl_decode_desc *) desc; | 129 | (struct nfsacl_decode_desc *) desc; |
| 130 | u32 *p = (u32 *) elem; | 130 | __be32 *p = elem; |
| 131 | struct posix_acl_entry *entry; | 131 | struct posix_acl_entry *entry; |
| 132 | 132 | ||
| 133 | if (!nfsacl_desc->acl) { | 133 | if (!nfsacl_desc->acl) { |
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index e13fa23bd108..f37df46d2eaa 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c | |||
| @@ -1148,12 +1148,12 @@ exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv, | |||
| 1148 | * for a given NFSv4 client. The root is defined to be the | 1148 | * for a given NFSv4 client. The root is defined to be the |
| 1149 | * export point with fsid==0 | 1149 | * export point with fsid==0 |
| 1150 | */ | 1150 | */ |
| 1151 | int | 1151 | __be32 |
| 1152 | exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp, | 1152 | exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp, |
| 1153 | struct cache_req *creq) | 1153 | struct cache_req *creq) |
| 1154 | { | 1154 | { |
| 1155 | struct svc_export *exp; | 1155 | struct svc_export *exp; |
| 1156 | int rv; | 1156 | __be32 rv; |
| 1157 | u32 fsidv[2]; | 1157 | u32 fsidv[2]; |
| 1158 | 1158 | ||
| 1159 | mk_fsid_v1(fsidv, 0); | 1159 | mk_fsid_v1(fsidv, 0); |
diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c index 9b9e7e127c03..11fdaf7721b4 100644 --- a/fs/nfsd/lockd.c +++ b/fs/nfsd/lockd.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | static u32 | 25 | static u32 |
| 26 | nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp) | 26 | nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp) |
| 27 | { | 27 | { |
| 28 | u32 nfserr; | 28 | __be32 nfserr; |
| 29 | struct svc_fh fh; | 29 | struct svc_fh fh; |
| 30 | 30 | ||
| 31 | /* must initialize before using! but maxsize doesn't matter */ | 31 | /* must initialize before using! but maxsize doesn't matter */ |
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c index 9187755661df..e3eca0816986 100644 --- a/fs/nfsd/nfs2acl.c +++ b/fs/nfsd/nfs2acl.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | /* | 21 | /* |
| 22 | * NULL call. | 22 | * NULL call. |
| 23 | */ | 23 | */ |
| 24 | static int | 24 | static __be32 |
| 25 | nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | 25 | nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) |
| 26 | { | 26 | { |
| 27 | return nfs_ok; | 27 | return nfs_ok; |
| @@ -30,12 +30,12 @@ nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | |||
| 30 | /* | 30 | /* |
| 31 | * Get the Access and/or Default ACL of a file. | 31 | * Get the Access and/or Default ACL of a file. |
| 32 | */ | 32 | */ |
| 33 | static int nfsacld_proc_getacl(struct svc_rqst * rqstp, | 33 | static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, |
| 34 | struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp) | 34 | struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp) |
| 35 | { | 35 | { |
| 36 | svc_fh *fh; | 36 | svc_fh *fh; |
| 37 | struct posix_acl *acl; | 37 | struct posix_acl *acl; |
| 38 | int nfserr = 0; | 38 | __be32 nfserr = 0; |
| 39 | 39 | ||
| 40 | dprintk("nfsd: GETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); | 40 | dprintk("nfsd: GETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); |
| 41 | 41 | ||
| @@ -97,12 +97,12 @@ fail: | |||
| 97 | /* | 97 | /* |
| 98 | * Set the Access and/or Default ACL of a file. | 98 | * Set the Access and/or Default ACL of a file. |
| 99 | */ | 99 | */ |
| 100 | static int nfsacld_proc_setacl(struct svc_rqst * rqstp, | 100 | static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp, |
| 101 | struct nfsd3_setaclargs *argp, | 101 | struct nfsd3_setaclargs *argp, |
| 102 | struct nfsd_attrstat *resp) | 102 | struct nfsd_attrstat *resp) |
| 103 | { | 103 | { |
| 104 | svc_fh *fh; | 104 | svc_fh *fh; |
| 105 | int nfserr = 0; | 105 | __be32 nfserr = 0; |
| 106 | 106 | ||
| 107 | dprintk("nfsd: SETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); | 107 | dprintk("nfsd: SETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); |
| 108 | 108 | ||
| @@ -128,7 +128,7 @@ static int nfsacld_proc_setacl(struct svc_rqst * rqstp, | |||
| 128 | /* | 128 | /* |
| 129 | * Check file attributes | 129 | * Check file attributes |
| 130 | */ | 130 | */ |
| 131 | static int nfsacld_proc_getattr(struct svc_rqst * rqstp, | 131 | static __be32 nfsacld_proc_getattr(struct svc_rqst * rqstp, |
| 132 | struct nfsd_fhandle *argp, struct nfsd_attrstat *resp) | 132 | struct nfsd_fhandle *argp, struct nfsd_attrstat *resp) |
| 133 | { | 133 | { |
| 134 | dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); | 134 | dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); |
| @@ -140,10 +140,10 @@ static int nfsacld_proc_getattr(struct svc_rqst * rqstp, | |||
| 140 | /* | 140 | /* |
| 141 | * Check file access | 141 | * Check file access |
| 142 | */ | 142 | */ |
| 143 | static int nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, | 143 | static __be32 nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, |
| 144 | struct nfsd3_accessres *resp) | 144 | struct nfsd3_accessres *resp) |
| 145 | { | 145 | { |
| 146 | int nfserr; | 146 | __be32 nfserr; |
| 147 | 147 | ||
| 148 | dprintk("nfsd: ACCESS(2acl) %s 0x%x\n", | 148 | dprintk("nfsd: ACCESS(2acl) %s 0x%x\n", |
| 149 | SVCFH_fmt(&argp->fh), | 149 | SVCFH_fmt(&argp->fh), |
| @@ -158,7 +158,7 @@ static int nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs * | |||
| 158 | /* | 158 | /* |
| 159 | * XDR decode functions | 159 | * XDR decode functions |
| 160 | */ | 160 | */ |
| 161 | static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p, | 161 | static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p, |
| 162 | struct nfsd3_getaclargs *argp) | 162 | struct nfsd3_getaclargs *argp) |
| 163 | { | 163 | { |
| 164 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) | 164 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) |
| @@ -169,7 +169,7 @@ static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p, | |||
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | 171 | ||
| 172 | static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p, | 172 | static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p, |
| 173 | struct nfsd3_setaclargs *argp) | 173 | struct nfsd3_setaclargs *argp) |
| 174 | { | 174 | { |
| 175 | struct kvec *head = rqstp->rq_arg.head; | 175 | struct kvec *head = rqstp->rq_arg.head; |
| @@ -194,7 +194,7 @@ static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p, | |||
| 194 | return (n > 0); | 194 | return (n > 0); |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, u32 *p, | 197 | static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, __be32 *p, |
| 198 | struct nfsd_fhandle *argp) | 198 | struct nfsd_fhandle *argp) |
| 199 | { | 199 | { |
| 200 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) | 200 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) |
| @@ -202,7 +202,7 @@ static int nfsaclsvc_decode_fhandleargs(struct svc_rqst *rqstp, u32 *p, | |||
| 202 | return xdr_argsize_check(rqstp, p); | 202 | return xdr_argsize_check(rqstp, p); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, u32 *p, | 205 | static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p, |
| 206 | struct nfsd3_accessargs *argp) | 206 | struct nfsd3_accessargs *argp) |
| 207 | { | 207 | { |
| 208 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) | 208 | if (!(p = nfs2svc_decode_fh(p, &argp->fh))) |
| @@ -217,7 +217,7 @@ static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, u32 *p, | |||
| 217 | */ | 217 | */ |
| 218 | 218 | ||
| 219 | /* GETACL */ | 219 | /* GETACL */ |
| 220 | static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, | 220 | static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p, |
| 221 | struct nfsd3_getaclres *resp) | 221 | struct nfsd3_getaclres *resp) |
| 222 | { | 222 | { |
| 223 | struct dentry *dentry = resp->fh.fh_dentry; | 223 | struct dentry *dentry = resp->fh.fh_dentry; |
| @@ -259,7 +259,7 @@ static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, | |||
| 259 | return 1; | 259 | return 1; |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, u32 *p, | 262 | static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, __be32 *p, |
| 263 | struct nfsd_attrstat *resp) | 263 | struct nfsd_attrstat *resp) |
| 264 | { | 264 | { |
| 265 | p = nfs2svc_encode_fattr(rqstp, p, &resp->fh); | 265 | p = nfs2svc_encode_fattr(rqstp, p, &resp->fh); |
| @@ -267,7 +267,7 @@ static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, u32 *p, | |||
| 267 | } | 267 | } |
| 268 | 268 | ||
| 269 | /* ACCESS */ | 269 | /* ACCESS */ |
| 270 | static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, u32 *p, | 270 | static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, __be32 *p, |
| 271 | struct nfsd3_accessres *resp) | 271 | struct nfsd3_accessres *resp) |
| 272 | { | 272 | { |
| 273 | p = nfs2svc_encode_fattr(rqstp, p, &resp->fh); | 273 | p = nfs2svc_encode_fattr(rqstp, p, &resp->fh); |
| @@ -278,7 +278,7 @@ static int nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, u32 *p, | |||
| 278 | /* | 278 | /* |
| 279 | * XDR release functions | 279 | * XDR release functions |
| 280 | */ | 280 | */ |
| 281 | static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, u32 *p, | 281 | static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, __be32 *p, |
| 282 | struct nfsd3_getaclres *resp) | 282 | struct nfsd3_getaclres *resp) |
| 283 | { | 283 | { |
| 284 | fh_put(&resp->fh); | 284 | fh_put(&resp->fh); |
| @@ -287,7 +287,7 @@ static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, u32 *p, | |||
| 287 | return 1; | 287 | return 1; |
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | static int nfsaclsvc_release_fhandle(struct svc_rqst *rqstp, u32 *p, | 290 | static int nfsaclsvc_release_fhandle(struct svc_rqst *rqstp, __be32 *p, |
| 291 | struct nfsd_fhandle *resp) | 291 | struct nfsd_fhandle *resp) |
| 292 | { | 292 | { |
| 293 | fh_put(&resp->fh); | 293 | fh_put(&resp->fh); |
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c index d4bdc00c1169..fcad2895ddb0 100644 --- a/fs/nfsd/nfs3acl.c +++ b/fs/nfsd/nfs3acl.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | /* | 19 | /* |
| 20 | * NULL call. | 20 | * NULL call. |
| 21 | */ | 21 | */ |
| 22 | static int | 22 | static __be32 |
| 23 | nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | 23 | nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) |
| 24 | { | 24 | { |
| 25 | return nfs_ok; | 25 | return nfs_ok; |
| @@ -28,12 +28,12 @@ nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | |||
| 28 | /* | 28 | /* |
| 29 | * Get the Access and/or Default ACL of a file. | 29 | * Get the Access and/or Default ACL of a file. |
| 30 | */ | 30 | */ |
| 31 | static int nfsd3_proc_getacl(struct svc_rqst * rqstp, | 31 | static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp, |
| 32 | struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp) | 32 | struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp) |
| 33 | { | 33 | { |
| 34 | svc_fh *fh; | 34 | svc_fh *fh; |
| 35 | struct posix_acl *acl; | 35 | struct posix_acl *acl; |
| 36 | int nfserr = 0; | 36 | __be32 nfserr = 0; |
| 37 | 37 | ||
| 38 | fh = fh_copy(&resp->fh, &argp->fh); | 38 | fh = fh_copy(&resp->fh, &argp->fh); |
| 39 | if ((nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP))) | 39 | if ((nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP))) |
| @@ -93,12 +93,12 @@ fail: | |||
| 93 | /* | 93 | /* |
| 94 | * Set the Access and/or Default ACL of a file. | 94 | * Set the Access and/or Default ACL of a file. |
| 95 | */ | 95 | */ |
| 96 | static int nfsd3_proc_setacl(struct svc_rqst * rqstp, | 96 | static __be32 nfsd3_proc_setacl(struct svc_rqst * rqstp, |
| 97 | struct nfsd3_setaclargs *argp, | 97 | struct nfsd3_setaclargs *argp, |
| 98 | struct nfsd3_attrstat *resp) | 98 | struct nfsd3_attrstat *resp) |
| 99 | { | 99 | { |
| 100 | svc_fh *fh; | 100 | svc_fh *fh; |
| 101 | int nfserr = 0; | 101 | __be32 nfserr = 0; |
| 102 | 102 | ||
| 103 | fh = fh_copy(&resp->fh, &argp->fh); | 103 | fh = fh_copy(&resp->fh, &argp->fh); |
| 104 | nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR); | 104 | nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR); |
| @@ -122,7 +122,7 @@ static int nfsd3_proc_setacl(struct svc_rqst * rqstp, | |||
| 122 | /* | 122 | /* |
| 123 | * XDR decode functions | 123 | * XDR decode functions |
| 124 | */ | 124 | */ |
| 125 | static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p, | 125 | static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p, |
| 126 | struct nfsd3_getaclargs *args) | 126 | struct nfsd3_getaclargs *args) |
| 127 | { | 127 | { |
| 128 | if (!(p = nfs3svc_decode_fh(p, &args->fh))) | 128 | if (!(p = nfs3svc_decode_fh(p, &args->fh))) |
| @@ -133,7 +133,7 @@ static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, u32 *p, | |||
| 133 | } | 133 | } |
| 134 | 134 | ||
| 135 | 135 | ||
| 136 | static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p, | 136 | static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p, |
| 137 | struct nfsd3_setaclargs *args) | 137 | struct nfsd3_setaclargs *args) |
| 138 | { | 138 | { |
| 139 | struct kvec *head = rqstp->rq_arg.head; | 139 | struct kvec *head = rqstp->rq_arg.head; |
| @@ -163,7 +163,7 @@ static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, u32 *p, | |||
| 163 | */ | 163 | */ |
| 164 | 164 | ||
| 165 | /* GETACL */ | 165 | /* GETACL */ |
| 166 | static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, | 166 | static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p, |
| 167 | struct nfsd3_getaclres *resp) | 167 | struct nfsd3_getaclres *resp) |
| 168 | { | 168 | { |
| 169 | struct dentry *dentry = resp->fh.fh_dentry; | 169 | struct dentry *dentry = resp->fh.fh_dentry; |
| @@ -208,7 +208,7 @@ static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, | |||
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | /* SETACL */ | 210 | /* SETACL */ |
| 211 | static int nfs3svc_encode_setaclres(struct svc_rqst *rqstp, u32 *p, | 211 | static int nfs3svc_encode_setaclres(struct svc_rqst *rqstp, __be32 *p, |
| 212 | struct nfsd3_attrstat *resp) | 212 | struct nfsd3_attrstat *resp) |
| 213 | { | 213 | { |
| 214 | p = nfs3svc_encode_post_op_attr(rqstp, p, &resp->fh); | 214 | p = nfs3svc_encode_post_op_attr(rqstp, p, &resp->fh); |
| @@ -219,7 +219,7 @@ static int nfs3svc_encode_setaclres(struct svc_rqst *rqstp, u32 *p, | |||
| 219 | /* | 219 | /* |
| 220 | * XDR release functions | 220 | * XDR release functions |
| 221 | */ | 221 | */ |
| 222 | static int nfs3svc_release_getacl(struct svc_rqst *rqstp, u32 *p, | 222 | static int nfs3svc_release_getacl(struct svc_rqst *rqstp, __be32 *p, |
| 223 | struct nfsd3_getaclres *resp) | 223 | struct nfsd3_getaclres *resp) |
| 224 | { | 224 | { |
| 225 | fh_put(&resp->fh); | 225 | fh_put(&resp->fh); |
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index a5ebc7dbb384..64db601c2bd2 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c | |||
| @@ -43,7 +43,7 @@ static int nfs3_ftypes[] = { | |||
| 43 | /* | 43 | /* |
| 44 | * NULL call. | 44 | * NULL call. |
| 45 | */ | 45 | */ |
| 46 | static int | 46 | static __be32 |
| 47 | nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | 47 | nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) |
| 48 | { | 48 | { |
| 49 | return nfs_ok; | 49 | return nfs_ok; |
| @@ -52,11 +52,12 @@ nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | |||
| 52 | /* | 52 | /* |
| 53 | * Get a file's attributes | 53 | * Get a file's attributes |
| 54 | */ | 54 | */ |
| 55 | static int | 55 | static __be32 |
| 56 | nfsd3_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, | 56 | nfsd3_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, |
| 57 | struct nfsd3_attrstat *resp) | 57 | struct nfsd3_attrstat *resp) |
| 58 | { | 58 | { |
| 59 | int err, nfserr; | 59 | int err; |
| 60 | __be32 nfserr; | ||
| 60 | 61 | ||
| 61 | dprintk("nfsd: GETATTR(3) %s\n", | 62 | dprintk("nfsd: GETATTR(3) %s\n", |
| 62 | SVCFH_fmt(&argp->fh)); | 63 | SVCFH_fmt(&argp->fh)); |
| @@ -76,11 +77,11 @@ nfsd3_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, | |||
| 76 | /* | 77 | /* |
| 77 | * Set a file's attributes | 78 | * Set a file's attributes |
| 78 | */ | 79 | */ |
| 79 | static int | 80 | static __be32 |
| 80 | nfsd3_proc_setattr(struct svc_rqst *rqstp, struct nfsd3_sattrargs *argp, | 81 | nfsd3_proc_setattr(struct svc_rqst *rqstp, struct nfsd3_sattrargs *argp, |
| 81 | struct nfsd3_attrstat *resp) | 82 | struct nfsd3_attrstat *resp) |
| 82 | { | 83 | { |
| 83 | int nfserr; | 84 | __be32 nfserr; |
| 84 | 85 | ||
| 85 | dprintk("nfsd: SETATTR(3) %s\n", | 86 | dprintk("nfsd: SETATTR(3) %s\n", |
| 86 | SVCFH_fmt(&argp->fh)); | 87 | SVCFH_fmt(&argp->fh)); |
| @@ -94,11 +95,11 @@ nfsd3_proc_setattr(struct svc_rqst *rqstp, struct nfsd3_sattrargs *argp, | |||
| 94 | /* | 95 | /* |
| 95 | * Look up a path name component | 96 | * Look up a path name component |
| 96 | */ | 97 | */ |
| 97 | static int | 98 | static __be32 |
| 98 | nfsd3_proc_lookup(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | 99 | nfsd3_proc_lookup(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, |
| 99 | struct nfsd3_diropres *resp) | 100 | struct nfsd3_diropres *resp) |
| 100 | { | 101 | { |
| 101 | int nfserr; | 102 | __be32 nfserr; |
| 102 | 103 | ||
| 103 | dprintk("nfsd: LOOKUP(3) %s %.*s\n", | 104 | dprintk("nfsd: LOOKUP(3) %s %.*s\n", |
| 104 | SVCFH_fmt(&argp->fh), | 105 | SVCFH_fmt(&argp->fh), |
| @@ -118,11 +119,11 @@ nfsd3_proc_lookup(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | |||
| 118 | /* | 119 | /* |
| 119 | * Check file access | 120 | * Check file access |
| 120 | */ | 121 | */ |
| 121 | static int | 122 | static __be32 |
| 122 | nfsd3_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, | 123 | nfsd3_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, |
| 123 | struct nfsd3_accessres *resp) | 124 | struct nfsd3_accessres *resp) |
| 124 | { | 125 | { |
| 125 | int nfserr; | 126 | __be32 nfserr; |
| 126 | 127 | ||
| 127 | dprintk("nfsd: ACCESS(3) %s 0x%x\n", | 128 | dprintk("nfsd: ACCESS(3) %s 0x%x\n", |
| 128 | SVCFH_fmt(&argp->fh), | 129 | SVCFH_fmt(&argp->fh), |
| @@ -137,11 +138,11 @@ nfsd3_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, | |||
| 137 | /* | 138 | /* |
| 138 | * Read a symlink. | 139 | * Read a symlink. |
| 139 | */ | 140 | */ |
| 140 | static int | 141 | static __be32 |
| 141 | nfsd3_proc_readlink(struct svc_rqst *rqstp, struct nfsd3_readlinkargs *argp, | 142 | nfsd3_proc_readlink(struct svc_rqst *rqstp, struct nfsd3_readlinkargs *argp, |
| 142 | struct nfsd3_readlinkres *resp) | 143 | struct nfsd3_readlinkres *resp) |
| 143 | { | 144 | { |
| 144 | int nfserr; | 145 | __be32 nfserr; |
| 145 | 146 | ||
| 146 | dprintk("nfsd: READLINK(3) %s\n", SVCFH_fmt(&argp->fh)); | 147 | dprintk("nfsd: READLINK(3) %s\n", SVCFH_fmt(&argp->fh)); |
| 147 | 148 | ||
| @@ -155,11 +156,11 @@ nfsd3_proc_readlink(struct svc_rqst *rqstp, struct nfsd3_readlinkargs *argp, | |||
| 155 | /* | 156 | /* |
| 156 | * Read a portion of a file. | 157 | * Read a portion of a file. |
| 157 | */ | 158 | */ |
| 158 | static int | 159 | static __be32 |
| 159 | nfsd3_proc_read(struct svc_rqst *rqstp, struct nfsd3_readargs *argp, | 160 | nfsd3_proc_read(struct svc_rqst *rqstp, struct nfsd3_readargs *argp, |
| 160 | struct nfsd3_readres *resp) | 161 | struct nfsd3_readres *resp) |
| 161 | { | 162 | { |
| 162 | int nfserr; | 163 | __be32 nfserr; |
| 163 | u32 max_blocksize = svc_max_payload(rqstp); | 164 | u32 max_blocksize = svc_max_payload(rqstp); |
| 164 | 165 | ||
| 165 | dprintk("nfsd: READ(3) %s %lu bytes at %lu\n", | 166 | dprintk("nfsd: READ(3) %s %lu bytes at %lu\n", |
| @@ -195,11 +196,11 @@ nfsd3_proc_read(struct svc_rqst *rqstp, struct nfsd3_readargs *argp, | |||
| 195 | /* | 196 | /* |
| 196 | * Write data to a file | 197 | * Write data to a file |
| 197 | */ | 198 | */ |
| 198 | static int | 199 | static __be32 |
| 199 | nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp, | 200 | nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp, |
| 200 | struct nfsd3_writeres *resp) | 201 | struct nfsd3_writeres *resp) |
| 201 | { | 202 | { |
| 202 | int nfserr; | 203 | __be32 nfserr; |
| 203 | 204 | ||
| 204 | dprintk("nfsd: WRITE(3) %s %d bytes at %ld%s\n", | 205 | dprintk("nfsd: WRITE(3) %s %d bytes at %ld%s\n", |
| 205 | SVCFH_fmt(&argp->fh), | 206 | SVCFH_fmt(&argp->fh), |
| @@ -223,13 +224,13 @@ nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp, | |||
| 223 | * At least in theory; we'll see how it fares in practice when the | 224 | * At least in theory; we'll see how it fares in practice when the |
| 224 | * first reports about SunOS compatibility problems start to pour in... | 225 | * first reports about SunOS compatibility problems start to pour in... |
| 225 | */ | 226 | */ |
| 226 | static int | 227 | static __be32 |
| 227 | nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, | 228 | nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, |
| 228 | struct nfsd3_diropres *resp) | 229 | struct nfsd3_diropres *resp) |
| 229 | { | 230 | { |
| 230 | svc_fh *dirfhp, *newfhp = NULL; | 231 | svc_fh *dirfhp, *newfhp = NULL; |
| 231 | struct iattr *attr; | 232 | struct iattr *attr; |
| 232 | u32 nfserr; | 233 | __be32 nfserr; |
| 233 | 234 | ||
| 234 | dprintk("nfsd: CREATE(3) %s %.*s\n", | 235 | dprintk("nfsd: CREATE(3) %s %.*s\n", |
| 235 | SVCFH_fmt(&argp->fh), | 236 | SVCFH_fmt(&argp->fh), |
| @@ -265,11 +266,11 @@ nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, | |||
| 265 | /* | 266 | /* |
| 266 | * Make directory. This operation is not idempotent. | 267 | * Make directory. This operation is not idempotent. |
| 267 | */ | 268 | */ |
| 268 | static int | 269 | static __be32 |
| 269 | nfsd3_proc_mkdir(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, | 270 | nfsd3_proc_mkdir(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, |
| 270 | struct nfsd3_diropres *resp) | 271 | struct nfsd3_diropres *resp) |
| 271 | { | 272 | { |
| 272 | int nfserr; | 273 | __be32 nfserr; |
| 273 | 274 | ||
| 274 | dprintk("nfsd: MKDIR(3) %s %.*s\n", | 275 | dprintk("nfsd: MKDIR(3) %s %.*s\n", |
| 275 | SVCFH_fmt(&argp->fh), | 276 | SVCFH_fmt(&argp->fh), |
| @@ -285,11 +286,11 @@ nfsd3_proc_mkdir(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, | |||
| 285 | RETURN_STATUS(nfserr); | 286 | RETURN_STATUS(nfserr); |
| 286 | } | 287 | } |
| 287 | 288 | ||
| 288 | static int | 289 | static __be32 |
| 289 | nfsd3_proc_symlink(struct svc_rqst *rqstp, struct nfsd3_symlinkargs *argp, | 290 | nfsd3_proc_symlink(struct svc_rqst *rqstp, struct nfsd3_symlinkargs *argp, |
| 290 | struct nfsd3_diropres *resp) | 291 | struct nfsd3_diropres *resp) |
| 291 | { | 292 | { |
| 292 | int nfserr; | 293 | __be32 nfserr; |
| 293 | 294 | ||
| 294 | dprintk("nfsd: SYMLINK(3) %s %.*s -> %.*s\n", | 295 | dprintk("nfsd: SYMLINK(3) %s %.*s -> %.*s\n", |
| 295 | SVCFH_fmt(&argp->ffh), | 296 | SVCFH_fmt(&argp->ffh), |
| @@ -307,11 +308,12 @@ nfsd3_proc_symlink(struct svc_rqst *rqstp, struct nfsd3_symlinkargs *argp, | |||
| 307 | /* | 308 | /* |
| 308 | * Make socket/fifo/device. | 309 | * Make socket/fifo/device. |
| 309 | */ | 310 | */ |
| 310 | static int | 311 | static __be32 |
| 311 | nfsd3_proc_mknod(struct svc_rqst *rqstp, struct nfsd3_mknodargs *argp, | 312 | nfsd3_proc_mknod(struct svc_rqst *rqstp, struct nfsd3_mknodargs *argp, |
| 312 | struct nfsd3_diropres *resp) | 313 | struct nfsd3_diropres *resp) |
| 313 | { | 314 | { |
| 314 | int nfserr, type; | 315 | __be32 nfserr; |
| 316 | int type; | ||
| 315 | dev_t rdev = 0; | 317 | dev_t rdev = 0; |
| 316 | 318 | ||
| 317 | dprintk("nfsd: MKNOD(3) %s %.*s\n", | 319 | dprintk("nfsd: MKNOD(3) %s %.*s\n", |
| @@ -343,11 +345,11 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp, struct nfsd3_mknodargs *argp, | |||
| 343 | /* | 345 | /* |
| 344 | * Remove file/fifo/socket etc. | 346 | * Remove file/fifo/socket etc. |
| 345 | */ | 347 | */ |
| 346 | static int | 348 | static __be32 |
| 347 | nfsd3_proc_remove(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | 349 | nfsd3_proc_remove(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, |
| 348 | struct nfsd3_attrstat *resp) | 350 | struct nfsd3_attrstat *resp) |
| 349 | { | 351 | { |
| 350 | int nfserr; | 352 | __be32 nfserr; |
| 351 | 353 | ||
| 352 | dprintk("nfsd: REMOVE(3) %s %.*s\n", | 354 | dprintk("nfsd: REMOVE(3) %s %.*s\n", |
| 353 | SVCFH_fmt(&argp->fh), | 355 | SVCFH_fmt(&argp->fh), |
| @@ -363,11 +365,11 @@ nfsd3_proc_remove(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | |||
| 363 | /* | 365 | /* |
| 364 | * Remove a directory | 366 | * Remove a directory |
| 365 | */ | 367 | */ |
| 366 | static int | 368 | static __be32 |
| 367 | nfsd3_proc_rmdir(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | 369 | nfsd3_proc_rmdir(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, |
| 368 | struct nfsd3_attrstat *resp) | 370 | struct nfsd3_attrstat *resp) |
| 369 | { | 371 | { |
| 370 | int nfserr; | 372 | __be32 nfserr; |
| 371 | 373 | ||
| 372 | dprintk("nfsd: RMDIR(3) %s %.*s\n", | 374 | dprintk("nfsd: RMDIR(3) %s %.*s\n", |
| 373 | SVCFH_fmt(&argp->fh), | 375 | SVCFH_fmt(&argp->fh), |
| @@ -379,11 +381,11 @@ nfsd3_proc_rmdir(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | |||
| 379 | RETURN_STATUS(nfserr); | 381 | RETURN_STATUS(nfserr); |
| 380 | } | 382 | } |
| 381 | 383 | ||
| 382 | static int | 384 | static __be32 |
| 383 | nfsd3_proc_rename(struct svc_rqst *rqstp, struct nfsd3_renameargs *argp, | 385 | nfsd3_proc_rename(struct svc_rqst *rqstp, struct nfsd3_renameargs *argp, |
| 384 | struct nfsd3_renameres *resp) | 386 | struct nfsd3_renameres *resp) |
| 385 | { | 387 | { |
| 386 | int nfserr; | 388 | __be32 nfserr; |
| 387 | 389 | ||
| 388 | dprintk("nfsd: RENAME(3) %s %.*s ->\n", | 390 | dprintk("nfsd: RENAME(3) %s %.*s ->\n", |
| 389 | SVCFH_fmt(&argp->ffh), | 391 | SVCFH_fmt(&argp->ffh), |
| @@ -401,11 +403,11 @@ nfsd3_proc_rename(struct svc_rqst *rqstp, struct nfsd3_renameargs *argp, | |||
| 401 | RETURN_STATUS(nfserr); | 403 | RETURN_STATUS(nfserr); |
| 402 | } | 404 | } |
| 403 | 405 | ||
| 404 | static int | 406 | static __be32 |
| 405 | nfsd3_proc_link(struct svc_rqst *rqstp, struct nfsd3_linkargs *argp, | 407 | nfsd3_proc_link(struct svc_rqst *rqstp, struct nfsd3_linkargs *argp, |
| 406 | struct nfsd3_linkres *resp) | 408 | struct nfsd3_linkres *resp) |
| 407 | { | 409 | { |
| 408 | int nfserr; | 410 | __be32 nfserr; |
| 409 | 411 | ||
| 410 | dprintk("nfsd: LINK(3) %s ->\n", | 412 | dprintk("nfsd: LINK(3) %s ->\n", |
| 411 | SVCFH_fmt(&argp->ffh)); | 413 | SVCFH_fmt(&argp->ffh)); |
| @@ -424,11 +426,12 @@ nfsd3_proc_link(struct svc_rqst *rqstp, struct nfsd3_linkargs *argp, | |||
| 424 | /* | 426 | /* |
| 425 | * Read a portion of a directory. | 427 | * Read a portion of a directory. |
| 426 | */ | 428 | */ |
| 427 | static int | 429 | static __be32 |
| 428 | nfsd3_proc_readdir(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, | 430 | nfsd3_proc_readdir(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, |
| 429 | struct nfsd3_readdirres *resp) | 431 | struct nfsd3_readdirres *resp) |
| 430 | { | 432 | { |
| 431 | int nfserr, count; | 433 | __be32 nfserr; |
| 434 | int count; | ||
| 432 | 435 | ||
| 433 | dprintk("nfsd: READDIR(3) %s %d bytes at %d\n", | 436 | dprintk("nfsd: READDIR(3) %s %d bytes at %d\n", |
| 434 | SVCFH_fmt(&argp->fh), | 437 | SVCFH_fmt(&argp->fh), |
| @@ -459,11 +462,12 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, | |||
| 459 | * Read a portion of a directory, including file handles and attrs. | 462 | * Read a portion of a directory, including file handles and attrs. |
| 460 | * For now, we choose to ignore the dircount parameter. | 463 | * For now, we choose to ignore the dircount parameter. |
| 461 | */ | 464 | */ |
| 462 | static int | 465 | static __be32 |
| 463 | nfsd3_proc_readdirplus(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, | 466 | nfsd3_proc_readdirplus(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, |
| 464 | struct nfsd3_readdirres *resp) | 467 | struct nfsd3_readdirres *resp) |
| 465 | { | 468 | { |
| 466 | int nfserr, count = 0; | 469 | __be32 nfserr; |
| 470 | int count = 0; | ||
| 467 | loff_t offset; | 471 | loff_t offset; |
| 468 | int i; | 472 | int i; |
| 469 | caddr_t page_addr = NULL; | 473 | caddr_t page_addr = NULL; |
| @@ -517,11 +521,11 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, | |||
| 517 | /* | 521 | /* |
| 518 | * Get file system stats | 522 | * Get file system stats |
| 519 | */ | 523 | */ |
| 520 | static int | 524 | static __be32 |
| 521 | nfsd3_proc_fsstat(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | 525 | nfsd3_proc_fsstat(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, |
| 522 | struct nfsd3_fsstatres *resp) | 526 | struct nfsd3_fsstatres *resp) |
| 523 | { | 527 | { |
| 524 | int nfserr; | 528 | __be32 nfserr; |
| 525 | 529 | ||
| 526 | dprintk("nfsd: FSSTAT(3) %s\n", | 530 | dprintk("nfsd: FSSTAT(3) %s\n", |
| 527 | SVCFH_fmt(&argp->fh)); | 531 | SVCFH_fmt(&argp->fh)); |
| @@ -534,11 +538,11 @@ nfsd3_proc_fsstat(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | |||
| 534 | /* | 538 | /* |
| 535 | * Get file system info | 539 | * Get file system info |
| 536 | */ | 540 | */ |
| 537 | static int | 541 | static __be32 |
| 538 | nfsd3_proc_fsinfo(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | 542 | nfsd3_proc_fsinfo(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, |
| 539 | struct nfsd3_fsinfores *resp) | 543 | struct nfsd3_fsinfores *resp) |
| 540 | { | 544 | { |
| 541 | int nfserr; | 545 | __be32 nfserr; |
| 542 | u32 max_blocksize = svc_max_payload(rqstp); | 546 | u32 max_blocksize = svc_max_payload(rqstp); |
| 543 | 547 | ||
| 544 | dprintk("nfsd: FSINFO(3) %s\n", | 548 | dprintk("nfsd: FSINFO(3) %s\n", |
| @@ -576,11 +580,11 @@ nfsd3_proc_fsinfo(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | |||
| 576 | /* | 580 | /* |
| 577 | * Get pathconf info for the specified file | 581 | * Get pathconf info for the specified file |
| 578 | */ | 582 | */ |
| 579 | static int | 583 | static __be32 |
| 580 | nfsd3_proc_pathconf(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | 584 | nfsd3_proc_pathconf(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, |
| 581 | struct nfsd3_pathconfres *resp) | 585 | struct nfsd3_pathconfres *resp) |
| 582 | { | 586 | { |
| 583 | int nfserr; | 587 | __be32 nfserr; |
| 584 | 588 | ||
| 585 | dprintk("nfsd: PATHCONF(3) %s\n", | 589 | dprintk("nfsd: PATHCONF(3) %s\n", |
| 586 | SVCFH_fmt(&argp->fh)); | 590 | SVCFH_fmt(&argp->fh)); |
| @@ -619,11 +623,11 @@ nfsd3_proc_pathconf(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | |||
| 619 | /* | 623 | /* |
| 620 | * Commit a file (range) to stable storage. | 624 | * Commit a file (range) to stable storage. |
| 621 | */ | 625 | */ |
| 622 | static int | 626 | static __be32 |
| 623 | nfsd3_proc_commit(struct svc_rqst * rqstp, struct nfsd3_commitargs *argp, | 627 | nfsd3_proc_commit(struct svc_rqst * rqstp, struct nfsd3_commitargs *argp, |
| 624 | struct nfsd3_commitres *resp) | 628 | struct nfsd3_commitres *resp) |
| 625 | { | 629 | { |
| 626 | int nfserr; | 630 | __be32 nfserr; |
| 627 | 631 | ||
| 628 | dprintk("nfsd: COMMIT(3) %s %u@%Lu\n", | 632 | dprintk("nfsd: COMMIT(3) %s %u@%Lu\n", |
| 629 | SVCFH_fmt(&argp->fh), | 633 | SVCFH_fmt(&argp->fh), |
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index 247d518248bf..b4baca3053c3 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c | |||
| @@ -42,23 +42,23 @@ static u32 nfs3_ftypes[] = { | |||
| 42 | /* | 42 | /* |
| 43 | * XDR functions for basic NFS types | 43 | * XDR functions for basic NFS types |
| 44 | */ | 44 | */ |
| 45 | static inline u32 * | 45 | static inline __be32 * |
| 46 | encode_time3(u32 *p, struct timespec *time) | 46 | encode_time3(__be32 *p, struct timespec *time) |
| 47 | { | 47 | { |
| 48 | *p++ = htonl((u32) time->tv_sec); *p++ = htonl(time->tv_nsec); | 48 | *p++ = htonl((u32) time->tv_sec); *p++ = htonl(time->tv_nsec); |
| 49 | return p; | 49 | return p; |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | static inline u32 * | 52 | static inline __be32 * |
| 53 | decode_time3(u32 *p, struct timespec *time) | 53 | decode_time3(__be32 *p, struct timespec *time) |
| 54 | { | 54 | { |
| 55 | time->tv_sec = ntohl(*p++); | 55 | time->tv_sec = ntohl(*p++); |
| 56 | time->tv_nsec = ntohl(*p++); | 56 | time->tv_nsec = ntohl(*p++); |
| 57 | return p; | 57 | return p; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | static inline u32 * | 60 | static inline __be32 * |
| 61 | decode_fh(u32 *p, struct svc_fh *fhp) | 61 | decode_fh(__be32 *p, struct svc_fh *fhp) |
| 62 | { | 62 | { |
| 63 | unsigned int size; | 63 | unsigned int size; |
| 64 | fh_init(fhp, NFS3_FHSIZE); | 64 | fh_init(fhp, NFS3_FHSIZE); |
| @@ -72,13 +72,13 @@ decode_fh(u32 *p, struct svc_fh *fhp) | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | /* Helper function for NFSv3 ACL code */ | 74 | /* Helper function for NFSv3 ACL code */ |
| 75 | u32 *nfs3svc_decode_fh(u32 *p, struct svc_fh *fhp) | 75 | __be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp) |
| 76 | { | 76 | { |
| 77 | return decode_fh(p, fhp); | 77 | return decode_fh(p, fhp); |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | static inline u32 * | 80 | static inline __be32 * |
| 81 | encode_fh(u32 *p, struct svc_fh *fhp) | 81 | encode_fh(__be32 *p, struct svc_fh *fhp) |
| 82 | { | 82 | { |
| 83 | unsigned int size = fhp->fh_handle.fh_size; | 83 | unsigned int size = fhp->fh_handle.fh_size; |
| 84 | *p++ = htonl(size); | 84 | *p++ = htonl(size); |
| @@ -91,8 +91,8 @@ encode_fh(u32 *p, struct svc_fh *fhp) | |||
| 91 | * Decode a file name and make sure that the path contains | 91 | * Decode a file name and make sure that the path contains |
| 92 | * no slashes or null bytes. | 92 | * no slashes or null bytes. |
| 93 | */ | 93 | */ |
| 94 | static inline u32 * | 94 | static inline __be32 * |
| 95 | decode_filename(u32 *p, char **namp, int *lenp) | 95 | decode_filename(__be32 *p, char **namp, int *lenp) |
| 96 | { | 96 | { |
| 97 | char *name; | 97 | char *name; |
| 98 | int i; | 98 | int i; |
| @@ -107,8 +107,8 @@ decode_filename(u32 *p, char **namp, int *lenp) | |||
| 107 | return p; | 107 | return p; |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | static inline u32 * | 110 | static inline __be32 * |
| 111 | decode_sattr3(u32 *p, struct iattr *iap) | 111 | decode_sattr3(__be32 *p, struct iattr *iap) |
| 112 | { | 112 | { |
| 113 | u32 tmp; | 113 | u32 tmp; |
| 114 | 114 | ||
| @@ -153,8 +153,8 @@ decode_sattr3(u32 *p, struct iattr *iap) | |||
| 153 | return p; | 153 | return p; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | static inline u32 * | 156 | static inline __be32 * |
| 157 | encode_fattr3(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp, | 157 | encode_fattr3(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, |
| 158 | struct kstat *stat) | 158 | struct kstat *stat) |
| 159 | { | 159 | { |
| 160 | struct dentry *dentry = fhp->fh_dentry; | 160 | struct dentry *dentry = fhp->fh_dentry; |
| @@ -186,8 +186,8 @@ encode_fattr3(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp, | |||
| 186 | return p; | 186 | return p; |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | static inline u32 * | 189 | static inline __be32 * |
| 190 | encode_saved_post_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | 190 | encode_saved_post_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) |
| 191 | { | 191 | { |
| 192 | struct inode *inode = fhp->fh_dentry->d_inode; | 192 | struct inode *inode = fhp->fh_dentry->d_inode; |
| 193 | 193 | ||
| @@ -224,8 +224,8 @@ encode_saved_post_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | |||
| 224 | * The inode may be NULL if the call failed because of a stale file | 224 | * The inode may be NULL if the call failed because of a stale file |
| 225 | * handle. In this case, no attributes are returned. | 225 | * handle. In this case, no attributes are returned. |
| 226 | */ | 226 | */ |
| 227 | static u32 * | 227 | static __be32 * |
| 228 | encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | 228 | encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) |
| 229 | { | 229 | { |
| 230 | struct dentry *dentry = fhp->fh_dentry; | 230 | struct dentry *dentry = fhp->fh_dentry; |
| 231 | if (dentry && dentry->d_inode != NULL) { | 231 | if (dentry && dentry->d_inode != NULL) { |
| @@ -243,8 +243,8 @@ encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | |||
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | /* Helper for NFSv3 ACLs */ | 245 | /* Helper for NFSv3 ACLs */ |
| 246 | u32 * | 246 | __be32 * |
| 247 | nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | 247 | nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) |
| 248 | { | 248 | { |
| 249 | return encode_post_op_attr(rqstp, p, fhp); | 249 | return encode_post_op_attr(rqstp, p, fhp); |
| 250 | } | 250 | } |
| @@ -252,8 +252,8 @@ nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | |||
| 252 | /* | 252 | /* |
| 253 | * Enocde weak cache consistency data | 253 | * Enocde weak cache consistency data |
| 254 | */ | 254 | */ |
| 255 | static u32 * | 255 | static __be32 * |
| 256 | encode_wcc_data(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | 256 | encode_wcc_data(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) |
| 257 | { | 257 | { |
| 258 | struct dentry *dentry = fhp->fh_dentry; | 258 | struct dentry *dentry = fhp->fh_dentry; |
| 259 | 259 | ||
| @@ -278,7 +278,7 @@ encode_wcc_data(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | |||
| 278 | * XDR decode functions | 278 | * XDR decode functions |
| 279 | */ | 279 | */ |
| 280 | int | 280 | int |
| 281 | nfs3svc_decode_fhandle(struct svc_rqst *rqstp, u32 *p, struct nfsd_fhandle *args) | 281 | nfs3svc_decode_fhandle(struct svc_rqst *rqstp, __be32 *p, struct nfsd_fhandle *args) |
| 282 | { | 282 | { |
| 283 | if (!(p = decode_fh(p, &args->fh))) | 283 | if (!(p = decode_fh(p, &args->fh))) |
| 284 | return 0; | 284 | return 0; |
| @@ -286,7 +286,7 @@ nfs3svc_decode_fhandle(struct svc_rqst *rqstp, u32 *p, struct nfsd_fhandle *args | |||
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | int | 288 | int |
| 289 | nfs3svc_decode_sattrargs(struct svc_rqst *rqstp, u32 *p, | 289 | nfs3svc_decode_sattrargs(struct svc_rqst *rqstp, __be32 *p, |
| 290 | struct nfsd3_sattrargs *args) | 290 | struct nfsd3_sattrargs *args) |
| 291 | { | 291 | { |
| 292 | if (!(p = decode_fh(p, &args->fh)) | 292 | if (!(p = decode_fh(p, &args->fh)) |
| @@ -303,7 +303,7 @@ nfs3svc_decode_sattrargs(struct svc_rqst *rqstp, u32 *p, | |||
| 303 | } | 303 | } |
| 304 | 304 | ||
| 305 | int | 305 | int |
| 306 | nfs3svc_decode_diropargs(struct svc_rqst *rqstp, u32 *p, | 306 | nfs3svc_decode_diropargs(struct svc_rqst *rqstp, __be32 *p, |
| 307 | struct nfsd3_diropargs *args) | 307 | struct nfsd3_diropargs *args) |
| 308 | { | 308 | { |
| 309 | if (!(p = decode_fh(p, &args->fh)) | 309 | if (!(p = decode_fh(p, &args->fh)) |
| @@ -314,7 +314,7 @@ nfs3svc_decode_diropargs(struct svc_rqst *rqstp, u32 *p, | |||
| 314 | } | 314 | } |
| 315 | 315 | ||
| 316 | int | 316 | int |
| 317 | nfs3svc_decode_accessargs(struct svc_rqst *rqstp, u32 *p, | 317 | nfs3svc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p, |
| 318 | struct nfsd3_accessargs *args) | 318 | struct nfsd3_accessargs *args) |
| 319 | { | 319 | { |
| 320 | if (!(p = decode_fh(p, &args->fh))) | 320 | if (!(p = decode_fh(p, &args->fh))) |
| @@ -325,7 +325,7 @@ nfs3svc_decode_accessargs(struct svc_rqst *rqstp, u32 *p, | |||
| 325 | } | 325 | } |
| 326 | 326 | ||
| 327 | int | 327 | int |
| 328 | nfs3svc_decode_readargs(struct svc_rqst *rqstp, u32 *p, | 328 | nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p, |
| 329 | struct nfsd3_readargs *args) | 329 | struct nfsd3_readargs *args) |
| 330 | { | 330 | { |
| 331 | unsigned int len; | 331 | unsigned int len; |
| @@ -355,7 +355,7 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, u32 *p, | |||
| 355 | } | 355 | } |
| 356 | 356 | ||
| 357 | int | 357 | int |
| 358 | nfs3svc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, | 358 | nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, |
| 359 | struct nfsd3_writeargs *args) | 359 | struct nfsd3_writeargs *args) |
| 360 | { | 360 | { |
| 361 | unsigned int len, v, hdr; | 361 | unsigned int len, v, hdr; |
| @@ -393,7 +393,7 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, | |||
| 393 | } | 393 | } |
| 394 | 394 | ||
| 395 | int | 395 | int |
| 396 | nfs3svc_decode_createargs(struct svc_rqst *rqstp, u32 *p, | 396 | nfs3svc_decode_createargs(struct svc_rqst *rqstp, __be32 *p, |
| 397 | struct nfsd3_createargs *args) | 397 | struct nfsd3_createargs *args) |
| 398 | { | 398 | { |
| 399 | if (!(p = decode_fh(p, &args->fh)) | 399 | if (!(p = decode_fh(p, &args->fh)) |
| @@ -417,7 +417,7 @@ nfs3svc_decode_createargs(struct svc_rqst *rqstp, u32 *p, | |||
| 417 | return xdr_argsize_check(rqstp, p); | 417 | return xdr_argsize_check(rqstp, p); |
| 418 | } | 418 | } |
| 419 | int | 419 | int |
| 420 | nfs3svc_decode_mkdirargs(struct svc_rqst *rqstp, u32 *p, | 420 | nfs3svc_decode_mkdirargs(struct svc_rqst *rqstp, __be32 *p, |
| 421 | struct nfsd3_createargs *args) | 421 | struct nfsd3_createargs *args) |
| 422 | { | 422 | { |
| 423 | if (!(p = decode_fh(p, &args->fh)) | 423 | if (!(p = decode_fh(p, &args->fh)) |
| @@ -429,7 +429,7 @@ nfs3svc_decode_mkdirargs(struct svc_rqst *rqstp, u32 *p, | |||
| 429 | } | 429 | } |
| 430 | 430 | ||
| 431 | int | 431 | int |
| 432 | nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, u32 *p, | 432 | nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p, |
| 433 | struct nfsd3_symlinkargs *args) | 433 | struct nfsd3_symlinkargs *args) |
| 434 | { | 434 | { |
| 435 | unsigned int len; | 435 | unsigned int len; |
| @@ -481,7 +481,7 @@ nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, u32 *p, | |||
| 481 | } | 481 | } |
| 482 | 482 | ||
| 483 | int | 483 | int |
| 484 | nfs3svc_decode_mknodargs(struct svc_rqst *rqstp, u32 *p, | 484 | nfs3svc_decode_mknodargs(struct svc_rqst *rqstp, __be32 *p, |
| 485 | struct nfsd3_mknodargs *args) | 485 | struct nfsd3_mknodargs *args) |
| 486 | { | 486 | { |
| 487 | if (!(p = decode_fh(p, &args->fh)) | 487 | if (!(p = decode_fh(p, &args->fh)) |
| @@ -505,7 +505,7 @@ nfs3svc_decode_mknodargs(struct svc_rqst *rqstp, u32 *p, | |||
| 505 | } | 505 | } |
| 506 | 506 | ||
| 507 | int | 507 | int |
| 508 | nfs3svc_decode_renameargs(struct svc_rqst *rqstp, u32 *p, | 508 | nfs3svc_decode_renameargs(struct svc_rqst *rqstp, __be32 *p, |
| 509 | struct nfsd3_renameargs *args) | 509 | struct nfsd3_renameargs *args) |
| 510 | { | 510 | { |
| 511 | if (!(p = decode_fh(p, &args->ffh)) | 511 | if (!(p = decode_fh(p, &args->ffh)) |
| @@ -518,7 +518,7 @@ nfs3svc_decode_renameargs(struct svc_rqst *rqstp, u32 *p, | |||
| 518 | } | 518 | } |
| 519 | 519 | ||
| 520 | int | 520 | int |
| 521 | nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, | 521 | nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p, |
| 522 | struct nfsd3_readlinkargs *args) | 522 | struct nfsd3_readlinkargs *args) |
| 523 | { | 523 | { |
| 524 | if (!(p = decode_fh(p, &args->fh))) | 524 | if (!(p = decode_fh(p, &args->fh))) |
| @@ -530,7 +530,7 @@ nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, | |||
| 530 | } | 530 | } |
| 531 | 531 | ||
| 532 | int | 532 | int |
| 533 | nfs3svc_decode_linkargs(struct svc_rqst *rqstp, u32 *p, | 533 | nfs3svc_decode_linkargs(struct svc_rqst *rqstp, __be32 *p, |
| 534 | struct nfsd3_linkargs *args) | 534 | struct nfsd3_linkargs *args) |
| 535 | { | 535 | { |
| 536 | if (!(p = decode_fh(p, &args->ffh)) | 536 | if (!(p = decode_fh(p, &args->ffh)) |
| @@ -542,7 +542,7 @@ nfs3svc_decode_linkargs(struct svc_rqst *rqstp, u32 *p, | |||
| 542 | } | 542 | } |
| 543 | 543 | ||
| 544 | int | 544 | int |
| 545 | nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p, | 545 | nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p, |
| 546 | struct nfsd3_readdirargs *args) | 546 | struct nfsd3_readdirargs *args) |
| 547 | { | 547 | { |
| 548 | if (!(p = decode_fh(p, &args->fh))) | 548 | if (!(p = decode_fh(p, &args->fh))) |
| @@ -562,7 +562,7 @@ nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p, | |||
| 562 | } | 562 | } |
| 563 | 563 | ||
| 564 | int | 564 | int |
| 565 | nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, u32 *p, | 565 | nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p, |
| 566 | struct nfsd3_readdirargs *args) | 566 | struct nfsd3_readdirargs *args) |
| 567 | { | 567 | { |
| 568 | int len, pn; | 568 | int len, pn; |
| @@ -590,7 +590,7 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, u32 *p, | |||
| 590 | } | 590 | } |
| 591 | 591 | ||
| 592 | int | 592 | int |
| 593 | nfs3svc_decode_commitargs(struct svc_rqst *rqstp, u32 *p, | 593 | nfs3svc_decode_commitargs(struct svc_rqst *rqstp, __be32 *p, |
| 594 | struct nfsd3_commitargs *args) | 594 | struct nfsd3_commitargs *args) |
| 595 | { | 595 | { |
| 596 | if (!(p = decode_fh(p, &args->fh))) | 596 | if (!(p = decode_fh(p, &args->fh))) |
| @@ -609,14 +609,14 @@ nfs3svc_decode_commitargs(struct svc_rqst *rqstp, u32 *p, | |||
| 609 | * will work properly. | 609 | * will work properly. |
| 610 | */ | 610 | */ |
| 611 | int | 611 | int |
| 612 | nfs3svc_encode_voidres(struct svc_rqst *rqstp, u32 *p, void *dummy) | 612 | nfs3svc_encode_voidres(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
| 613 | { | 613 | { |
| 614 | return xdr_ressize_check(rqstp, p); | 614 | return xdr_ressize_check(rqstp, p); |
| 615 | } | 615 | } |
| 616 | 616 | ||
| 617 | /* GETATTR */ | 617 | /* GETATTR */ |
| 618 | int | 618 | int |
| 619 | nfs3svc_encode_attrstat(struct svc_rqst *rqstp, u32 *p, | 619 | nfs3svc_encode_attrstat(struct svc_rqst *rqstp, __be32 *p, |
| 620 | struct nfsd3_attrstat *resp) | 620 | struct nfsd3_attrstat *resp) |
| 621 | { | 621 | { |
| 622 | if (resp->status == 0) | 622 | if (resp->status == 0) |
| @@ -626,7 +626,7 @@ nfs3svc_encode_attrstat(struct svc_rqst *rqstp, u32 *p, | |||
| 626 | 626 | ||
| 627 | /* SETATTR, REMOVE, RMDIR */ | 627 | /* SETATTR, REMOVE, RMDIR */ |
| 628 | int | 628 | int |
| 629 | nfs3svc_encode_wccstat(struct svc_rqst *rqstp, u32 *p, | 629 | nfs3svc_encode_wccstat(struct svc_rqst *rqstp, __be32 *p, |
| 630 | struct nfsd3_attrstat *resp) | 630 | struct nfsd3_attrstat *resp) |
| 631 | { | 631 | { |
| 632 | p = encode_wcc_data(rqstp, p, &resp->fh); | 632 | p = encode_wcc_data(rqstp, p, &resp->fh); |
| @@ -635,7 +635,7 @@ nfs3svc_encode_wccstat(struct svc_rqst *rqstp, u32 *p, | |||
| 635 | 635 | ||
| 636 | /* LOOKUP */ | 636 | /* LOOKUP */ |
| 637 | int | 637 | int |
| 638 | nfs3svc_encode_diropres(struct svc_rqst *rqstp, u32 *p, | 638 | nfs3svc_encode_diropres(struct svc_rqst *rqstp, __be32 *p, |
| 639 | struct nfsd3_diropres *resp) | 639 | struct nfsd3_diropres *resp) |
| 640 | { | 640 | { |
| 641 | if (resp->status == 0) { | 641 | if (resp->status == 0) { |
| @@ -648,7 +648,7 @@ nfs3svc_encode_diropres(struct svc_rqst *rqstp, u32 *p, | |||
| 648 | 648 | ||
| 649 | /* ACCESS */ | 649 | /* ACCESS */ |
| 650 | int | 650 | int |
| 651 | nfs3svc_encode_accessres(struct svc_rqst *rqstp, u32 *p, | 651 | nfs3svc_encode_accessres(struct svc_rqst *rqstp, __be32 *p, |
| 652 | struct nfsd3_accessres *resp) | 652 | struct nfsd3_accessres *resp) |
| 653 | { | 653 | { |
| 654 | p = encode_post_op_attr(rqstp, p, &resp->fh); | 654 | p = encode_post_op_attr(rqstp, p, &resp->fh); |
| @@ -659,7 +659,7 @@ nfs3svc_encode_accessres(struct svc_rqst *rqstp, u32 *p, | |||
| 659 | 659 | ||
| 660 | /* READLINK */ | 660 | /* READLINK */ |
| 661 | int | 661 | int |
| 662 | nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p, | 662 | nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, __be32 *p, |
| 663 | struct nfsd3_readlinkres *resp) | 663 | struct nfsd3_readlinkres *resp) |
| 664 | { | 664 | { |
| 665 | p = encode_post_op_attr(rqstp, p, &resp->fh); | 665 | p = encode_post_op_attr(rqstp, p, &resp->fh); |
| @@ -680,7 +680,7 @@ nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p, | |||
| 680 | 680 | ||
| 681 | /* READ */ | 681 | /* READ */ |
| 682 | int | 682 | int |
| 683 | nfs3svc_encode_readres(struct svc_rqst *rqstp, u32 *p, | 683 | nfs3svc_encode_readres(struct svc_rqst *rqstp, __be32 *p, |
| 684 | struct nfsd3_readres *resp) | 684 | struct nfsd3_readres *resp) |
| 685 | { | 685 | { |
| 686 | p = encode_post_op_attr(rqstp, p, &resp->fh); | 686 | p = encode_post_op_attr(rqstp, p, &resp->fh); |
| @@ -704,7 +704,7 @@ nfs3svc_encode_readres(struct svc_rqst *rqstp, u32 *p, | |||
| 704 | 704 | ||
| 705 | /* WRITE */ | 705 | /* WRITE */ |
| 706 | int | 706 | int |
| 707 | nfs3svc_encode_writeres(struct svc_rqst *rqstp, u32 *p, | 707 | nfs3svc_encode_writeres(struct svc_rqst *rqstp, __be32 *p, |
| 708 | struct nfsd3_writeres *resp) | 708 | struct nfsd3_writeres *resp) |
| 709 | { | 709 | { |
| 710 | p = encode_wcc_data(rqstp, p, &resp->fh); | 710 | p = encode_wcc_data(rqstp, p, &resp->fh); |
| @@ -719,7 +719,7 @@ nfs3svc_encode_writeres(struct svc_rqst *rqstp, u32 *p, | |||
| 719 | 719 | ||
| 720 | /* CREATE, MKDIR, SYMLINK, MKNOD */ | 720 | /* CREATE, MKDIR, SYMLINK, MKNOD */ |
| 721 | int | 721 | int |
| 722 | nfs3svc_encode_createres(struct svc_rqst *rqstp, u32 *p, | 722 | nfs3svc_encode_createres(struct svc_rqst *rqstp, __be32 *p, |
| 723 | struct nfsd3_diropres *resp) | 723 | struct nfsd3_diropres *resp) |
| 724 | { | 724 | { |
| 725 | if (resp->status == 0) { | 725 | if (resp->status == 0) { |
| @@ -733,7 +733,7 @@ nfs3svc_encode_createres(struct svc_rqst *rqstp, u32 *p, | |||
| 733 | 733 | ||
| 734 | /* RENAME */ | 734 | /* RENAME */ |
| 735 | int | 735 | int |
| 736 | nfs3svc_encode_renameres(struct svc_rqst *rqstp, u32 *p, | 736 | nfs3svc_encode_renameres(struct svc_rqst *rqstp, __be32 *p, |
| 737 | struct nfsd3_renameres *resp) | 737 | struct nfsd3_renameres *resp) |
| 738 | { | 738 | { |
| 739 | p = encode_wcc_data(rqstp, p, &resp->ffh); | 739 | p = encode_wcc_data(rqstp, p, &resp->ffh); |
| @@ -743,7 +743,7 @@ nfs3svc_encode_renameres(struct svc_rqst *rqstp, u32 *p, | |||
| 743 | 743 | ||
| 744 | /* LINK */ | 744 | /* LINK */ |
| 745 | int | 745 | int |
| 746 | nfs3svc_encode_linkres(struct svc_rqst *rqstp, u32 *p, | 746 | nfs3svc_encode_linkres(struct svc_rqst *rqstp, __be32 *p, |
| 747 | struct nfsd3_linkres *resp) | 747 | struct nfsd3_linkres *resp) |
| 748 | { | 748 | { |
| 749 | p = encode_post_op_attr(rqstp, p, &resp->fh); | 749 | p = encode_post_op_attr(rqstp, p, &resp->fh); |
| @@ -753,7 +753,7 @@ nfs3svc_encode_linkres(struct svc_rqst *rqstp, u32 *p, | |||
| 753 | 753 | ||
| 754 | /* READDIR */ | 754 | /* READDIR */ |
| 755 | int | 755 | int |
| 756 | nfs3svc_encode_readdirres(struct svc_rqst *rqstp, u32 *p, | 756 | nfs3svc_encode_readdirres(struct svc_rqst *rqstp, __be32 *p, |
| 757 | struct nfsd3_readdirres *resp) | 757 | struct nfsd3_readdirres *resp) |
| 758 | { | 758 | { |
| 759 | p = encode_post_op_attr(rqstp, p, &resp->fh); | 759 | p = encode_post_op_attr(rqstp, p, &resp->fh); |
| @@ -776,8 +776,8 @@ nfs3svc_encode_readdirres(struct svc_rqst *rqstp, u32 *p, | |||
| 776 | return xdr_ressize_check(rqstp, p); | 776 | return xdr_ressize_check(rqstp, p); |
| 777 | } | 777 | } |
| 778 | 778 | ||
| 779 | static inline u32 * | 779 | static inline __be32 * |
| 780 | encode_entry_baggage(struct nfsd3_readdirres *cd, u32 *p, const char *name, | 780 | encode_entry_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name, |
| 781 | int namlen, ino_t ino) | 781 | int namlen, ino_t ino) |
| 782 | { | 782 | { |
| 783 | *p++ = xdr_one; /* mark entry present */ | 783 | *p++ = xdr_one; /* mark entry present */ |
| @@ -790,8 +790,8 @@ encode_entry_baggage(struct nfsd3_readdirres *cd, u32 *p, const char *name, | |||
| 790 | return p; | 790 | return p; |
| 791 | } | 791 | } |
| 792 | 792 | ||
| 793 | static inline u32 * | 793 | static inline __be32 * |
| 794 | encode_entryplus_baggage(struct nfsd3_readdirres *cd, u32 *p, | 794 | encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p, |
| 795 | struct svc_fh *fhp) | 795 | struct svc_fh *fhp) |
| 796 | { | 796 | { |
| 797 | p = encode_post_op_attr(cd->rqstp, p, fhp); | 797 | p = encode_post_op_attr(cd->rqstp, p, fhp); |
| @@ -853,7 +853,7 @@ encode_entry(struct readdir_cd *ccd, const char *name, | |||
| 853 | { | 853 | { |
| 854 | struct nfsd3_readdirres *cd = container_of(ccd, struct nfsd3_readdirres, | 854 | struct nfsd3_readdirres *cd = container_of(ccd, struct nfsd3_readdirres, |
| 855 | common); | 855 | common); |
| 856 | u32 *p = cd->buffer; | 856 | __be32 *p = cd->buffer; |
| 857 | caddr_t curr_page_addr = NULL; | 857 | caddr_t curr_page_addr = NULL; |
| 858 | int pn; /* current page number */ | 858 | int pn; /* current page number */ |
| 859 | int slen; /* string (name) length */ | 859 | int slen; /* string (name) length */ |
| @@ -919,7 +919,7 @@ encode_entry(struct readdir_cd *ccd, const char *name, | |||
| 919 | } else if (cd->rqstp->rq_respages[pn+1] != NULL) { | 919 | } else if (cd->rqstp->rq_respages[pn+1] != NULL) { |
| 920 | /* temporarily encode entry into next page, then move back to | 920 | /* temporarily encode entry into next page, then move back to |
| 921 | * current and next page in rq_respages[] */ | 921 | * current and next page in rq_respages[] */ |
| 922 | u32 *p1, *tmp; | 922 | __be32 *p1, *tmp; |
| 923 | int len1, len2; | 923 | int len1, len2; |
| 924 | 924 | ||
| 925 | /* grab next page for temporary storage of entry */ | 925 | /* grab next page for temporary storage of entry */ |
| @@ -1009,7 +1009,7 @@ nfs3svc_encode_entry_plus(struct readdir_cd *cd, const char *name, | |||
| 1009 | 1009 | ||
| 1010 | /* FSSTAT */ | 1010 | /* FSSTAT */ |
| 1011 | int | 1011 | int |
| 1012 | nfs3svc_encode_fsstatres(struct svc_rqst *rqstp, u32 *p, | 1012 | nfs3svc_encode_fsstatres(struct svc_rqst *rqstp, __be32 *p, |
| 1013 | struct nfsd3_fsstatres *resp) | 1013 | struct nfsd3_fsstatres *resp) |
| 1014 | { | 1014 | { |
| 1015 | struct kstatfs *s = &resp->stats; | 1015 | struct kstatfs *s = &resp->stats; |
| @@ -1031,7 +1031,7 @@ nfs3svc_encode_fsstatres(struct svc_rqst *rqstp, u32 *p, | |||
| 1031 | 1031 | ||
| 1032 | /* FSINFO */ | 1032 | /* FSINFO */ |
| 1033 | int | 1033 | int |
| 1034 | nfs3svc_encode_fsinfores(struct svc_rqst *rqstp, u32 *p, | 1034 | nfs3svc_encode_fsinfores(struct svc_rqst *rqstp, __be32 *p, |
| 1035 | struct nfsd3_fsinfores *resp) | 1035 | struct nfsd3_fsinfores *resp) |
| 1036 | { | 1036 | { |
| 1037 | *p++ = xdr_zero; /* no post_op_attr */ | 1037 | *p++ = xdr_zero; /* no post_op_attr */ |
| @@ -1055,7 +1055,7 @@ nfs3svc_encode_fsinfores(struct svc_rqst *rqstp, u32 *p, | |||
| 1055 | 1055 | ||
| 1056 | /* PATHCONF */ | 1056 | /* PATHCONF */ |
| 1057 | int | 1057 | int |
| 1058 | nfs3svc_encode_pathconfres(struct svc_rqst *rqstp, u32 *p, | 1058 | nfs3svc_encode_pathconfres(struct svc_rqst *rqstp, __be32 *p, |
| 1059 | struct nfsd3_pathconfres *resp) | 1059 | struct nfsd3_pathconfres *resp) |
| 1060 | { | 1060 | { |
| 1061 | *p++ = xdr_zero; /* no post_op_attr */ | 1061 | *p++ = xdr_zero; /* no post_op_attr */ |
| @@ -1074,7 +1074,7 @@ nfs3svc_encode_pathconfres(struct svc_rqst *rqstp, u32 *p, | |||
| 1074 | 1074 | ||
| 1075 | /* COMMIT */ | 1075 | /* COMMIT */ |
| 1076 | int | 1076 | int |
| 1077 | nfs3svc_encode_commitres(struct svc_rqst *rqstp, u32 *p, | 1077 | nfs3svc_encode_commitres(struct svc_rqst *rqstp, __be32 *p, |
| 1078 | struct nfsd3_commitres *resp) | 1078 | struct nfsd3_commitres *resp) |
| 1079 | { | 1079 | { |
| 1080 | p = encode_wcc_data(rqstp, p, &resp->fh); | 1080 | p = encode_wcc_data(rqstp, p, &resp->fh); |
| @@ -1090,7 +1090,7 @@ nfs3svc_encode_commitres(struct svc_rqst *rqstp, u32 *p, | |||
| 1090 | * XDR release functions | 1090 | * XDR release functions |
| 1091 | */ | 1091 | */ |
| 1092 | int | 1092 | int |
| 1093 | nfs3svc_release_fhandle(struct svc_rqst *rqstp, u32 *p, | 1093 | nfs3svc_release_fhandle(struct svc_rqst *rqstp, __be32 *p, |
| 1094 | struct nfsd3_attrstat *resp) | 1094 | struct nfsd3_attrstat *resp) |
| 1095 | { | 1095 | { |
| 1096 | fh_put(&resp->fh); | 1096 | fh_put(&resp->fh); |
| @@ -1098,7 +1098,7 @@ nfs3svc_release_fhandle(struct svc_rqst *rqstp, u32 *p, | |||
| 1098 | } | 1098 | } |
| 1099 | 1099 | ||
| 1100 | int | 1100 | int |
| 1101 | nfs3svc_release_fhandle2(struct svc_rqst *rqstp, u32 *p, | 1101 | nfs3svc_release_fhandle2(struct svc_rqst *rqstp, __be32 *p, |
| 1102 | struct nfsd3_fhandle_pair *resp) | 1102 | struct nfsd3_fhandle_pair *resp) |
| 1103 | { | 1103 | { |
| 1104 | fh_put(&resp->fh1); | 1104 | fh_put(&resp->fh1); |
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 324a278f2808..f57655a7a2b6 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c | |||
| @@ -85,8 +85,8 @@ enum nfs_cb_opnum4 { | |||
| 85 | /* | 85 | /* |
| 86 | * Generic encode routines from fs/nfs/nfs4xdr.c | 86 | * Generic encode routines from fs/nfs/nfs4xdr.c |
| 87 | */ | 87 | */ |
| 88 | static inline u32 * | 88 | static inline __be32 * |
| 89 | xdr_writemem(u32 *p, const void *ptr, int nbytes) | 89 | xdr_writemem(__be32 *p, const void *ptr, int nbytes) |
| 90 | { | 90 | { |
| 91 | int tmp = XDR_QUADLEN(nbytes); | 91 | int tmp = XDR_QUADLEN(nbytes); |
| 92 | if (!tmp) | 92 | if (!tmp) |
| @@ -205,7 +205,7 @@ nfs_cb_stat_to_errno(int stat) | |||
| 205 | static int | 205 | static int |
| 206 | encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) | 206 | encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) |
| 207 | { | 207 | { |
| 208 | u32 * p; | 208 | __be32 * p; |
| 209 | 209 | ||
| 210 | RESERVE_SPACE(16); | 210 | RESERVE_SPACE(16); |
| 211 | WRITE32(0); /* tag length is always 0 */ | 211 | WRITE32(0); /* tag length is always 0 */ |
| @@ -218,7 +218,7 @@ encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) | |||
| 218 | static int | 218 | static int |
| 219 | encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec) | 219 | encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec) |
| 220 | { | 220 | { |
| 221 | u32 *p; | 221 | __be32 *p; |
| 222 | int len = cb_rec->cbr_fhlen; | 222 | int len = cb_rec->cbr_fhlen; |
| 223 | 223 | ||
| 224 | RESERVE_SPACE(12+sizeof(cb_rec->cbr_stateid) + len); | 224 | RESERVE_SPACE(12+sizeof(cb_rec->cbr_stateid) + len); |
| @@ -231,7 +231,7 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec) | |||
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | static int | 233 | static int |
| 234 | nfs4_xdr_enc_cb_null(struct rpc_rqst *req, u32 *p) | 234 | nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p) |
| 235 | { | 235 | { |
| 236 | struct xdr_stream xdrs, *xdr = &xdrs; | 236 | struct xdr_stream xdrs, *xdr = &xdrs; |
| 237 | 237 | ||
| @@ -241,7 +241,7 @@ nfs4_xdr_enc_cb_null(struct rpc_rqst *req, u32 *p) | |||
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | static int | 243 | static int |
| 244 | nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, u32 *p, struct nfs4_cb_recall *args) | 244 | nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_cb_recall *args) |
| 245 | { | 245 | { |
| 246 | struct xdr_stream xdr; | 246 | struct xdr_stream xdr; |
| 247 | struct nfs4_cb_compound_hdr hdr = { | 247 | struct nfs4_cb_compound_hdr hdr = { |
| @@ -257,7 +257,7 @@ nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, u32 *p, struct nfs4_cb_recall *args | |||
| 257 | 257 | ||
| 258 | static int | 258 | static int |
| 259 | decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr){ | 259 | decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr){ |
| 260 | u32 *p; | 260 | __be32 *p; |
| 261 | 261 | ||
| 262 | READ_BUF(8); | 262 | READ_BUF(8); |
| 263 | READ32(hdr->status); | 263 | READ32(hdr->status); |
| @@ -272,7 +272,7 @@ decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) | |||
| 272 | static int | 272 | static int |
| 273 | decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) | 273 | decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) |
| 274 | { | 274 | { |
| 275 | u32 *p; | 275 | __be32 *p; |
| 276 | u32 op; | 276 | u32 op; |
| 277 | int32_t nfserr; | 277 | int32_t nfserr; |
| 278 | 278 | ||
| @@ -291,13 +291,13 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) | |||
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | static int | 293 | static int |
| 294 | nfs4_xdr_dec_cb_null(struct rpc_rqst *req, u32 *p) | 294 | nfs4_xdr_dec_cb_null(struct rpc_rqst *req, __be32 *p) |
| 295 | { | 295 | { |
| 296 | return 0; | 296 | return 0; |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | static int | 299 | static int |
| 300 | nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, u32 *p) | 300 | nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p) |
| 301 | { | 301 | { |
| 302 | struct xdr_stream xdr; | 302 | struct xdr_stream xdr; |
| 303 | struct nfs4_cb_compound_hdr hdr; | 303 | struct nfs4_cb_compound_hdr hdr; |
| @@ -461,7 +461,7 @@ nfs4_cb_null(struct rpc_task *task, void *dummy) | |||
| 461 | { | 461 | { |
| 462 | struct nfs4_client *clp = (struct nfs4_client *)task->tk_msg.rpc_argp; | 462 | struct nfs4_client *clp = (struct nfs4_client *)task->tk_msg.rpc_argp; |
| 463 | struct nfs4_callback *cb = &clp->cl_callback; | 463 | struct nfs4_callback *cb = &clp->cl_callback; |
| 464 | u32 addr = htonl(cb->cb_addr); | 464 | __be32 addr = htonl(cb->cb_addr); |
| 465 | 465 | ||
| 466 | dprintk("NFSD: nfs4_cb_null task->tk_status %d\n", task->tk_status); | 466 | dprintk("NFSD: nfs4_cb_null task->tk_status %d\n", task->tk_status); |
| 467 | 467 | ||
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index d1fac6872c44..0a7bbdc4a10a 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c | |||
| @@ -67,10 +67,10 @@ fh_dup2(struct svc_fh *dst, struct svc_fh *src) | |||
| 67 | *dst = *src; | 67 | *dst = *src; |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | static int | 70 | static __be32 |
| 71 | do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open, int accmode) | 71 | do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open, int accmode) |
| 72 | { | 72 | { |
| 73 | int status; | 73 | __be32 status; |
| 74 | 74 | ||
| 75 | if (open->op_truncate && | 75 | if (open->op_truncate && |
| 76 | !(open->op_share_access & NFS4_SHARE_ACCESS_WRITE)) | 76 | !(open->op_share_access & NFS4_SHARE_ACCESS_WRITE)) |
| @@ -88,11 +88,11 @@ do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs | |||
| 88 | return status; | 88 | return status; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | static int | 91 | static __be32 |
| 92 | do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open) | 92 | do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open) |
| 93 | { | 93 | { |
| 94 | struct svc_fh resfh; | 94 | struct svc_fh resfh; |
| 95 | int status; | 95 | __be32 status; |
| 96 | 96 | ||
| 97 | fh_init(&resfh, NFS4_FHSIZE); | 97 | fh_init(&resfh, NFS4_FHSIZE); |
| 98 | open->op_truncate = 0; | 98 | open->op_truncate = 0; |
| @@ -131,10 +131,10 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o | |||
| 131 | return status; | 131 | return status; |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | static int | 134 | static __be32 |
| 135 | do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open) | 135 | do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open) |
| 136 | { | 136 | { |
| 137 | int status; | 137 | __be32 status; |
| 138 | 138 | ||
| 139 | /* Only reclaims from previously confirmed clients are valid */ | 139 | /* Only reclaims from previously confirmed clients are valid */ |
| 140 | if ((status = nfs4_check_open_reclaim(&open->op_clientid))) | 140 | if ((status = nfs4_check_open_reclaim(&open->op_clientid))) |
| @@ -161,10 +161,10 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_ | |||
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | 163 | ||
| 164 | static inline int | 164 | static inline __be32 |
| 165 | nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open, struct nfs4_stateowner **replay_owner) | 165 | nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open, struct nfs4_stateowner **replay_owner) |
| 166 | { | 166 | { |
| 167 | int status; | 167 | __be32 status; |
| 168 | dprintk("NFSD: nfsd4_open filename %.*s op_stateowner %p\n", | 168 | dprintk("NFSD: nfsd4_open filename %.*s op_stateowner %p\n", |
| 169 | (int)open->op_fname.len, open->op_fname.data, | 169 | (int)open->op_fname.len, open->op_fname.data, |
| 170 | open->op_stateowner); | 170 | open->op_stateowner); |
| @@ -177,7 +177,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open | |||
| 177 | 177 | ||
| 178 | /* check seqid for replay. set nfs4_owner */ | 178 | /* check seqid for replay. set nfs4_owner */ |
| 179 | status = nfsd4_process_open1(open); | 179 | status = nfsd4_process_open1(open); |
| 180 | if (status == NFSERR_REPLAY_ME) { | 180 | if (status == nfserr_replay_me) { |
| 181 | struct nfs4_replay *rp = &open->op_stateowner->so_replay; | 181 | struct nfs4_replay *rp = &open->op_stateowner->so_replay; |
| 182 | fh_put(current_fh); | 182 | fh_put(current_fh); |
| 183 | current_fh->fh_handle.fh_size = rp->rp_openfh_len; | 183 | current_fh->fh_handle.fh_size = rp->rp_openfh_len; |
| @@ -188,7 +188,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open | |||
| 188 | dprintk("nfsd4_open: replay failed" | 188 | dprintk("nfsd4_open: replay failed" |
| 189 | " restoring previous filehandle\n"); | 189 | " restoring previous filehandle\n"); |
| 190 | else | 190 | else |
| 191 | status = NFSERR_REPLAY_ME; | 191 | status = nfserr_replay_me; |
| 192 | } | 192 | } |
| 193 | if (status) | 193 | if (status) |
| 194 | goto out; | 194 | goto out; |
| @@ -261,7 +261,7 @@ out: | |||
| 261 | /* | 261 | /* |
| 262 | * filehandle-manipulating ops. | 262 | * filehandle-manipulating ops. |
| 263 | */ | 263 | */ |
| 264 | static inline int | 264 | static inline __be32 |
| 265 | nfsd4_getfh(struct svc_fh *current_fh, struct svc_fh **getfh) | 265 | nfsd4_getfh(struct svc_fh *current_fh, struct svc_fh **getfh) |
| 266 | { | 266 | { |
| 267 | if (!current_fh->fh_dentry) | 267 | if (!current_fh->fh_dentry) |
| @@ -271,7 +271,7 @@ nfsd4_getfh(struct svc_fh *current_fh, struct svc_fh **getfh) | |||
| 271 | return nfs_ok; | 271 | return nfs_ok; |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | static inline int | 274 | static inline __be32 |
| 275 | nfsd4_putfh(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_putfh *putfh) | 275 | nfsd4_putfh(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_putfh *putfh) |
| 276 | { | 276 | { |
| 277 | fh_put(current_fh); | 277 | fh_put(current_fh); |
| @@ -280,10 +280,10 @@ nfsd4_putfh(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_putf | |||
| 280 | return fh_verify(rqstp, current_fh, 0, MAY_NOP); | 280 | return fh_verify(rqstp, current_fh, 0, MAY_NOP); |
| 281 | } | 281 | } |
| 282 | 282 | ||
| 283 | static inline int | 283 | static inline __be32 |
| 284 | nfsd4_putrootfh(struct svc_rqst *rqstp, struct svc_fh *current_fh) | 284 | nfsd4_putrootfh(struct svc_rqst *rqstp, struct svc_fh *current_fh) |
| 285 | { | 285 | { |
| 286 | int status; | 286 | __be32 status; |
| 287 | 287 | ||
| 288 | fh_put(current_fh); | 288 | fh_put(current_fh); |
| 289 | status = exp_pseudoroot(rqstp->rq_client, current_fh, | 289 | status = exp_pseudoroot(rqstp->rq_client, current_fh, |
| @@ -291,7 +291,7 @@ nfsd4_putrootfh(struct svc_rqst *rqstp, struct svc_fh *current_fh) | |||
| 291 | return status; | 291 | return status; |
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | static inline int | 294 | static inline __be32 |
| 295 | nfsd4_restorefh(struct svc_fh *current_fh, struct svc_fh *save_fh) | 295 | nfsd4_restorefh(struct svc_fh *current_fh, struct svc_fh *save_fh) |
| 296 | { | 296 | { |
| 297 | if (!save_fh->fh_dentry) | 297 | if (!save_fh->fh_dentry) |
| @@ -301,7 +301,7 @@ nfsd4_restorefh(struct svc_fh *current_fh, struct svc_fh *save_fh) | |||
| 301 | return nfs_ok; | 301 | return nfs_ok; |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | static inline int | 304 | static inline __be32 |
| 305 | nfsd4_savefh(struct svc_fh *current_fh, struct svc_fh *save_fh) | 305 | nfsd4_savefh(struct svc_fh *current_fh, struct svc_fh *save_fh) |
| 306 | { | 306 | { |
| 307 | if (!current_fh->fh_dentry) | 307 | if (!current_fh->fh_dentry) |
| @@ -314,7 +314,7 @@ nfsd4_savefh(struct svc_fh *current_fh, struct svc_fh *save_fh) | |||
| 314 | /* | 314 | /* |
| 315 | * misc nfsv4 ops | 315 | * misc nfsv4 ops |
| 316 | */ | 316 | */ |
| 317 | static inline int | 317 | static inline __be32 |
| 318 | nfsd4_access(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_access *access) | 318 | nfsd4_access(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_access *access) |
| 319 | { | 319 | { |
| 320 | if (access->ac_req_access & ~NFS3_ACCESS_FULL) | 320 | if (access->ac_req_access & ~NFS3_ACCESS_FULL) |
| @@ -324,10 +324,10 @@ nfsd4_access(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_acc | |||
| 324 | return nfsd_access(rqstp, current_fh, &access->ac_resp_access, &access->ac_supported); | 324 | return nfsd_access(rqstp, current_fh, &access->ac_resp_access, &access->ac_supported); |
| 325 | } | 325 | } |
| 326 | 326 | ||
| 327 | static inline int | 327 | static inline __be32 |
| 328 | nfsd4_commit(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_commit *commit) | 328 | nfsd4_commit(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_commit *commit) |
| 329 | { | 329 | { |
| 330 | int status; | 330 | __be32 status; |
| 331 | 331 | ||
| 332 | u32 *p = (u32 *)commit->co_verf.data; | 332 | u32 *p = (u32 *)commit->co_verf.data; |
| 333 | *p++ = nfssvc_boot.tv_sec; | 333 | *p++ = nfssvc_boot.tv_sec; |
| @@ -339,11 +339,11 @@ nfsd4_commit(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_com | |||
| 339 | return status; | 339 | return status; |
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | static int | 342 | static __be32 |
| 343 | nfsd4_create(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_create *create) | 343 | nfsd4_create(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_create *create) |
| 344 | { | 344 | { |
| 345 | struct svc_fh resfh; | 345 | struct svc_fh resfh; |
| 346 | int status; | 346 | __be32 status; |
| 347 | dev_t rdev; | 347 | dev_t rdev; |
| 348 | 348 | ||
| 349 | fh_init(&resfh, NFS4_FHSIZE); | 349 | fh_init(&resfh, NFS4_FHSIZE); |
| @@ -423,10 +423,10 @@ nfsd4_create(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_cre | |||
| 423 | return status; | 423 | return status; |
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | static inline int | 426 | static inline __be32 |
| 427 | nfsd4_getattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_getattr *getattr) | 427 | nfsd4_getattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_getattr *getattr) |
| 428 | { | 428 | { |
| 429 | int status; | 429 | __be32 status; |
| 430 | 430 | ||
| 431 | status = fh_verify(rqstp, current_fh, 0, MAY_NOP); | 431 | status = fh_verify(rqstp, current_fh, 0, MAY_NOP); |
| 432 | if (status) | 432 | if (status) |
| @@ -442,11 +442,11 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_ge | |||
| 442 | return nfs_ok; | 442 | return nfs_ok; |
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | static inline int | 445 | static inline __be32 |
| 446 | nfsd4_link(struct svc_rqst *rqstp, struct svc_fh *current_fh, | 446 | nfsd4_link(struct svc_rqst *rqstp, struct svc_fh *current_fh, |
| 447 | struct svc_fh *save_fh, struct nfsd4_link *link) | 447 | struct svc_fh *save_fh, struct nfsd4_link *link) |
| 448 | { | 448 | { |
| 449 | int status = nfserr_nofilehandle; | 449 | __be32 status = nfserr_nofilehandle; |
| 450 | 450 | ||
| 451 | if (!save_fh->fh_dentry) | 451 | if (!save_fh->fh_dentry) |
| 452 | return status; | 452 | return status; |
| @@ -456,11 +456,11 @@ nfsd4_link(struct svc_rqst *rqstp, struct svc_fh *current_fh, | |||
| 456 | return status; | 456 | return status; |
| 457 | } | 457 | } |
| 458 | 458 | ||
| 459 | static int | 459 | static __be32 |
| 460 | nfsd4_lookupp(struct svc_rqst *rqstp, struct svc_fh *current_fh) | 460 | nfsd4_lookupp(struct svc_rqst *rqstp, struct svc_fh *current_fh) |
| 461 | { | 461 | { |
| 462 | struct svc_fh tmp_fh; | 462 | struct svc_fh tmp_fh; |
| 463 | int ret; | 463 | __be32 ret; |
| 464 | 464 | ||
| 465 | fh_init(&tmp_fh, NFS4_FHSIZE); | 465 | fh_init(&tmp_fh, NFS4_FHSIZE); |
| 466 | if((ret = exp_pseudoroot(rqstp->rq_client, &tmp_fh, | 466 | if((ret = exp_pseudoroot(rqstp->rq_client, &tmp_fh, |
| @@ -474,16 +474,16 @@ nfsd4_lookupp(struct svc_rqst *rqstp, struct svc_fh *current_fh) | |||
| 474 | return nfsd_lookup(rqstp, current_fh, "..", 2, current_fh); | 474 | return nfsd_lookup(rqstp, current_fh, "..", 2, current_fh); |
| 475 | } | 475 | } |
| 476 | 476 | ||
| 477 | static inline int | 477 | static inline __be32 |
| 478 | nfsd4_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lookup *lookup) | 478 | nfsd4_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lookup *lookup) |
| 479 | { | 479 | { |
| 480 | return nfsd_lookup(rqstp, current_fh, lookup->lo_name, lookup->lo_len, current_fh); | 480 | return nfsd_lookup(rqstp, current_fh, lookup->lo_name, lookup->lo_len, current_fh); |
| 481 | } | 481 | } |
| 482 | 482 | ||
| 483 | static inline int | 483 | static inline __be32 |
| 484 | nfsd4_read(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_read *read) | 484 | nfsd4_read(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_read *read) |
| 485 | { | 485 | { |
| 486 | int status; | 486 | __be32 status; |
| 487 | 487 | ||
| 488 | /* no need to check permission - this will be done in nfsd_read() */ | 488 | /* no need to check permission - this will be done in nfsd_read() */ |
| 489 | 489 | ||
| @@ -508,7 +508,7 @@ out: | |||
| 508 | return status; | 508 | return status; |
| 509 | } | 509 | } |
| 510 | 510 | ||
| 511 | static inline int | 511 | static inline __be32 |
| 512 | nfsd4_readdir(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_readdir *readdir) | 512 | nfsd4_readdir(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_readdir *readdir) |
| 513 | { | 513 | { |
| 514 | u64 cookie = readdir->rd_cookie; | 514 | u64 cookie = readdir->rd_cookie; |
| @@ -531,7 +531,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_re | |||
| 531 | return nfs_ok; | 531 | return nfs_ok; |
| 532 | } | 532 | } |
| 533 | 533 | ||
| 534 | static inline int | 534 | static inline __be32 |
| 535 | nfsd4_readlink(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_readlink *readlink) | 535 | nfsd4_readlink(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_readlink *readlink) |
| 536 | { | 536 | { |
| 537 | readlink->rl_rqstp = rqstp; | 537 | readlink->rl_rqstp = rqstp; |
| @@ -539,10 +539,10 @@ nfsd4_readlink(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_r | |||
| 539 | return nfs_ok; | 539 | return nfs_ok; |
| 540 | } | 540 | } |
| 541 | 541 | ||
| 542 | static inline int | 542 | static inline __be32 |
| 543 | nfsd4_remove(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_remove *remove) | 543 | nfsd4_remove(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_remove *remove) |
| 544 | { | 544 | { |
| 545 | int status; | 545 | __be32 status; |
| 546 | 546 | ||
| 547 | if (nfs4_in_grace()) | 547 | if (nfs4_in_grace()) |
| 548 | return nfserr_grace; | 548 | return nfserr_grace; |
| @@ -556,11 +556,11 @@ nfsd4_remove(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_rem | |||
| 556 | return status; | 556 | return status; |
| 557 | } | 557 | } |
| 558 | 558 | ||
| 559 | static inline int | 559 | static inline __be32 |
| 560 | nfsd4_rename(struct svc_rqst *rqstp, struct svc_fh *current_fh, | 560 | nfsd4_rename(struct svc_rqst *rqstp, struct svc_fh *current_fh, |
| 561 | struct svc_fh *save_fh, struct nfsd4_rename *rename) | 561 | struct svc_fh *save_fh, struct nfsd4_rename *rename) |
| 562 | { | 562 | { |
| 563 | int status = nfserr_nofilehandle; | 563 | __be32 status = nfserr_nofilehandle; |
| 564 | 564 | ||
| 565 | if (!save_fh->fh_dentry) | 565 | if (!save_fh->fh_dentry) |
| 566 | return status; | 566 | return status; |
| @@ -589,10 +589,10 @@ nfsd4_rename(struct svc_rqst *rqstp, struct svc_fh *current_fh, | |||
| 589 | return status; | 589 | return status; |
| 590 | } | 590 | } |
| 591 | 591 | ||
| 592 | static inline int | 592 | static inline __be32 |
| 593 | nfsd4_setattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_setattr *setattr) | 593 | nfsd4_setattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_setattr *setattr) |
| 594 | { | 594 | { |
| 595 | int status = nfs_ok; | 595 | __be32 status = nfs_ok; |
| 596 | 596 | ||
| 597 | if (setattr->sa_iattr.ia_valid & ATTR_SIZE) { | 597 | if (setattr->sa_iattr.ia_valid & ATTR_SIZE) { |
| 598 | nfs4_lock_state(); | 598 | nfs4_lock_state(); |
| @@ -614,13 +614,13 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_se | |||
| 614 | return status; | 614 | return status; |
| 615 | } | 615 | } |
| 616 | 616 | ||
| 617 | static inline int | 617 | static inline __be32 |
| 618 | nfsd4_write(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_write *write) | 618 | nfsd4_write(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_write *write) |
| 619 | { | 619 | { |
| 620 | stateid_t *stateid = &write->wr_stateid; | 620 | stateid_t *stateid = &write->wr_stateid; |
| 621 | struct file *filp = NULL; | 621 | struct file *filp = NULL; |
| 622 | u32 *p; | 622 | u32 *p; |
| 623 | int status = nfs_ok; | 623 | __be32 status = nfs_ok; |
| 624 | 624 | ||
| 625 | /* no need to check permission - this will be done in nfsd_write() */ | 625 | /* no need to check permission - this will be done in nfsd_write() */ |
| 626 | 626 | ||
| @@ -661,12 +661,12 @@ nfsd4_write(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_writ | |||
| 661 | * attributes matched. VERIFY is implemented by mapping NFSERR_SAME | 661 | * attributes matched. VERIFY is implemented by mapping NFSERR_SAME |
| 662 | * to NFS_OK after the call; NVERIFY by mapping NFSERR_NOT_SAME to NFS_OK. | 662 | * to NFS_OK after the call; NVERIFY by mapping NFSERR_NOT_SAME to NFS_OK. |
| 663 | */ | 663 | */ |
| 664 | static int | 664 | static __be32 |
| 665 | nfsd4_verify(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_verify *verify) | 665 | nfsd4_verify(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_verify *verify) |
| 666 | { | 666 | { |
| 667 | u32 *buf, *p; | 667 | __be32 *buf, *p; |
| 668 | int count; | 668 | int count; |
| 669 | int status; | 669 | __be32 status; |
| 670 | 670 | ||
| 671 | status = fh_verify(rqstp, current_fh, 0, MAY_NOP); | 671 | status = fh_verify(rqstp, current_fh, 0, MAY_NOP); |
| 672 | if (status) | 672 | if (status) |
| @@ -715,7 +715,7 @@ out_kfree: | |||
| 715 | /* | 715 | /* |
| 716 | * NULL call. | 716 | * NULL call. |
| 717 | */ | 717 | */ |
| 718 | static int | 718 | static __be32 |
| 719 | nfsd4_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | 719 | nfsd4_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) |
| 720 | { | 720 | { |
| 721 | return nfs_ok; | 721 | return nfs_ok; |
| @@ -731,7 +731,7 @@ static inline void nfsd4_increment_op_stats(u32 opnum) | |||
| 731 | /* | 731 | /* |
| 732 | * COMPOUND call. | 732 | * COMPOUND call. |
| 733 | */ | 733 | */ |
| 734 | static int | 734 | static __be32 |
| 735 | nfsd4_proc_compound(struct svc_rqst *rqstp, | 735 | nfsd4_proc_compound(struct svc_rqst *rqstp, |
| 736 | struct nfsd4_compoundargs *args, | 736 | struct nfsd4_compoundargs *args, |
| 737 | struct nfsd4_compoundres *resp) | 737 | struct nfsd4_compoundres *resp) |
| @@ -741,7 +741,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, | |||
| 741 | struct svc_fh *save_fh = NULL; | 741 | struct svc_fh *save_fh = NULL; |
| 742 | struct nfs4_stateowner *replay_owner = NULL; | 742 | struct nfs4_stateowner *replay_owner = NULL; |
| 743 | int slack_space; /* in words, not bytes! */ | 743 | int slack_space; /* in words, not bytes! */ |
| 744 | int status; | 744 | __be32 status; |
| 745 | 745 | ||
| 746 | status = nfserr_resource; | 746 | status = nfserr_resource; |
| 747 | current_fh = kmalloc(sizeof(*current_fh), GFP_KERNEL); | 747 | current_fh = kmalloc(sizeof(*current_fh), GFP_KERNEL); |
| @@ -937,7 +937,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, | |||
| 937 | } | 937 | } |
| 938 | 938 | ||
| 939 | encode_op: | 939 | encode_op: |
| 940 | if (op->status == NFSERR_REPLAY_ME) { | 940 | if (op->status == nfserr_replay_me) { |
| 941 | op->replay = &replay_owner->so_replay; | 941 | op->replay = &replay_owner->so_replay; |
| 942 | nfsd4_encode_replay(resp, op); | 942 | nfsd4_encode_replay(resp, op); |
| 943 | status = op->status = op->replay->rp_status; | 943 | status = op->status = op->replay->rp_status; |
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 1cbd2e4ee122..e9d07704680e 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c | |||
| @@ -83,13 +83,13 @@ md5_to_hex(char *out, char *md5) | |||
| 83 | *out = '\0'; | 83 | *out = '\0'; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | int | 86 | __be32 |
| 87 | nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) | 87 | nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) |
| 88 | { | 88 | { |
| 89 | struct xdr_netobj cksum; | 89 | struct xdr_netobj cksum; |
| 90 | struct hash_desc desc; | 90 | struct hash_desc desc; |
| 91 | struct scatterlist sg[1]; | 91 | struct scatterlist sg[1]; |
| 92 | int status = nfserr_resource; | 92 | __be32 status = nfserr_resource; |
| 93 | 93 | ||
| 94 | dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n", | 94 | dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n", |
| 95 | clname->len, clname->data); | 95 | clname->len, clname->data); |
| @@ -193,7 +193,7 @@ nfsd4_build_dentrylist(void *arg, const char *name, int namlen, | |||
| 193 | struct dentry_list *child; | 193 | struct dentry_list *child; |
| 194 | 194 | ||
| 195 | if (name && isdotent(name, namlen)) | 195 | if (name && isdotent(name, namlen)) |
| 196 | return nfs_ok; | 196 | return 0; |
| 197 | dentry = lookup_one_len(name, parent, namlen); | 197 | dentry = lookup_one_len(name, parent, namlen); |
| 198 | if (IS_ERR(dentry)) | 198 | if (IS_ERR(dentry)) |
| 199 | return PTR_ERR(dentry); | 199 | return PTR_ERR(dentry); |
| @@ -333,14 +333,14 @@ purge_old(struct dentry *parent, struct dentry *child) | |||
| 333 | int status; | 333 | int status; |
| 334 | 334 | ||
| 335 | if (nfs4_has_reclaimed_state(child->d_name.name)) | 335 | if (nfs4_has_reclaimed_state(child->d_name.name)) |
| 336 | return nfs_ok; | 336 | return 0; |
| 337 | 337 | ||
| 338 | status = nfsd4_clear_clid_dir(parent, child); | 338 | status = nfsd4_clear_clid_dir(parent, child); |
| 339 | if (status) | 339 | if (status) |
| 340 | printk("failed to remove client recovery directory %s\n", | 340 | printk("failed to remove client recovery directory %s\n", |
| 341 | child->d_name.name); | 341 | child->d_name.name); |
| 342 | /* Keep trying, success or failure: */ | 342 | /* Keep trying, success or failure: */ |
| 343 | return nfs_ok; | 343 | return 0; |
| 344 | } | 344 | } |
| 345 | 345 | ||
| 346 | void | 346 | void |
| @@ -365,10 +365,10 @@ load_recdir(struct dentry *parent, struct dentry *child) | |||
| 365 | printk("nfsd4: illegal name %s in recovery directory\n", | 365 | printk("nfsd4: illegal name %s in recovery directory\n", |
| 366 | child->d_name.name); | 366 | child->d_name.name); |
| 367 | /* Keep trying; maybe the others are OK: */ | 367 | /* Keep trying; maybe the others are OK: */ |
| 368 | return nfs_ok; | 368 | return 0; |
| 369 | } | 369 | } |
| 370 | nfs4_client_to_reclaim(child->d_name.name); | 370 | nfs4_client_to_reclaim(child->d_name.name); |
| 371 | return nfs_ok; | 371 | return 0; |
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | int | 374 | int |
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ebcf226a9e4a..293b6495829f 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -710,10 +710,10 @@ out_err: | |||
| 710 | * as described above. | 710 | * as described above. |
| 711 | * | 711 | * |
| 712 | */ | 712 | */ |
| 713 | int | 713 | __be32 |
| 714 | nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid) | 714 | nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid) |
| 715 | { | 715 | { |
| 716 | u32 ip_addr = rqstp->rq_addr.sin_addr.s_addr; | 716 | __be32 ip_addr = rqstp->rq_addr.sin_addr.s_addr; |
| 717 | struct xdr_netobj clname = { | 717 | struct xdr_netobj clname = { |
| 718 | .len = setclid->se_namelen, | 718 | .len = setclid->se_namelen, |
| 719 | .data = setclid->se_name, | 719 | .data = setclid->se_name, |
| @@ -721,7 +721,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid) | |||
| 721 | nfs4_verifier clverifier = setclid->se_verf; | 721 | nfs4_verifier clverifier = setclid->se_verf; |
| 722 | unsigned int strhashval; | 722 | unsigned int strhashval; |
| 723 | struct nfs4_client *conf, *unconf, *new; | 723 | struct nfs4_client *conf, *unconf, *new; |
| 724 | int status; | 724 | __be32 status; |
| 725 | char dname[HEXDIR_LEN]; | 725 | char dname[HEXDIR_LEN]; |
| 726 | 726 | ||
| 727 | if (!check_name(clname)) | 727 | if (!check_name(clname)) |
| @@ -875,14 +875,14 @@ out: | |||
| 875 | * | 875 | * |
| 876 | * NOTE: callback information will be processed here in a future patch | 876 | * NOTE: callback information will be processed here in a future patch |
| 877 | */ | 877 | */ |
| 878 | int | 878 | __be32 |
| 879 | nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confirm *setclientid_confirm) | 879 | nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confirm *setclientid_confirm) |
| 880 | { | 880 | { |
| 881 | u32 ip_addr = rqstp->rq_addr.sin_addr.s_addr; | 881 | __be32 ip_addr = rqstp->rq_addr.sin_addr.s_addr; |
| 882 | struct nfs4_client *conf, *unconf; | 882 | struct nfs4_client *conf, *unconf; |
| 883 | nfs4_verifier confirm = setclientid_confirm->sc_confirm; | 883 | nfs4_verifier confirm = setclientid_confirm->sc_confirm; |
| 884 | clientid_t * clid = &setclientid_confirm->sc_clientid; | 884 | clientid_t * clid = &setclientid_confirm->sc_clientid; |
| 885 | int status; | 885 | __be32 status; |
| 886 | 886 | ||
| 887 | if (STALE_CLIENTID(clid)) | 887 | if (STALE_CLIENTID(clid)) |
| 888 | return nfserr_stale_clientid; | 888 | return nfserr_stale_clientid; |
| @@ -1280,13 +1280,13 @@ test_share(struct nfs4_stateid *stp, struct nfsd4_open *open) { | |||
| 1280 | * Called to check deny when READ with all zero stateid or | 1280 | * Called to check deny when READ with all zero stateid or |
| 1281 | * WRITE with all zero or all one stateid | 1281 | * WRITE with all zero or all one stateid |
| 1282 | */ | 1282 | */ |
| 1283 | static int | 1283 | static __be32 |
| 1284 | nfs4_share_conflict(struct svc_fh *current_fh, unsigned int deny_type) | 1284 | nfs4_share_conflict(struct svc_fh *current_fh, unsigned int deny_type) |
| 1285 | { | 1285 | { |
| 1286 | struct inode *ino = current_fh->fh_dentry->d_inode; | 1286 | struct inode *ino = current_fh->fh_dentry->d_inode; |
| 1287 | struct nfs4_file *fp; | 1287 | struct nfs4_file *fp; |
| 1288 | struct nfs4_stateid *stp; | 1288 | struct nfs4_stateid *stp; |
| 1289 | int ret; | 1289 | __be32 ret; |
| 1290 | 1290 | ||
| 1291 | dprintk("NFSD: nfs4_share_conflict\n"); | 1291 | dprintk("NFSD: nfs4_share_conflict\n"); |
| 1292 | 1292 | ||
| @@ -1444,7 +1444,7 @@ static struct lock_manager_operations nfsd_lease_mng_ops = { | |||
| 1444 | }; | 1444 | }; |
| 1445 | 1445 | ||
| 1446 | 1446 | ||
| 1447 | int | 1447 | __be32 |
| 1448 | nfsd4_process_open1(struct nfsd4_open *open) | 1448 | nfsd4_process_open1(struct nfsd4_open *open) |
| 1449 | { | 1449 | { |
| 1450 | clientid_t *clientid = &open->op_clientid; | 1450 | clientid_t *clientid = &open->op_clientid; |
| @@ -1477,7 +1477,7 @@ nfsd4_process_open1(struct nfsd4_open *open) | |||
| 1477 | } | 1477 | } |
| 1478 | if (open->op_seqid == sop->so_seqid - 1) { | 1478 | if (open->op_seqid == sop->so_seqid - 1) { |
| 1479 | if (sop->so_replay.rp_buflen) | 1479 | if (sop->so_replay.rp_buflen) |
| 1480 | return NFSERR_REPLAY_ME; | 1480 | return nfserr_replay_me; |
| 1481 | /* The original OPEN failed so spectacularly | 1481 | /* The original OPEN failed so spectacularly |
| 1482 | * that we don't even have replay data saved! | 1482 | * that we don't even have replay data saved! |
| 1483 | * Therefore, we have no choice but to continue | 1483 | * Therefore, we have no choice but to continue |
| @@ -1501,7 +1501,7 @@ renew: | |||
| 1501 | return nfs_ok; | 1501 | return nfs_ok; |
| 1502 | } | 1502 | } |
| 1503 | 1503 | ||
| 1504 | static inline int | 1504 | static inline __be32 |
| 1505 | nfs4_check_delegmode(struct nfs4_delegation *dp, int flags) | 1505 | nfs4_check_delegmode(struct nfs4_delegation *dp, int flags) |
| 1506 | { | 1506 | { |
| 1507 | if ((flags & WR_STATE) && (dp->dl_type == NFS4_OPEN_DELEGATE_READ)) | 1507 | if ((flags & WR_STATE) && (dp->dl_type == NFS4_OPEN_DELEGATE_READ)) |
| @@ -1522,12 +1522,12 @@ find_delegation_file(struct nfs4_file *fp, stateid_t *stid) | |||
| 1522 | return NULL; | 1522 | return NULL; |
| 1523 | } | 1523 | } |
| 1524 | 1524 | ||
| 1525 | static int | 1525 | static __be32 |
| 1526 | nfs4_check_deleg(struct nfs4_file *fp, struct nfsd4_open *open, | 1526 | nfs4_check_deleg(struct nfs4_file *fp, struct nfsd4_open *open, |
| 1527 | struct nfs4_delegation **dp) | 1527 | struct nfs4_delegation **dp) |
| 1528 | { | 1528 | { |
| 1529 | int flags; | 1529 | int flags; |
| 1530 | int status = nfserr_bad_stateid; | 1530 | __be32 status = nfserr_bad_stateid; |
| 1531 | 1531 | ||
| 1532 | *dp = find_delegation_file(fp, &open->op_delegate_stateid); | 1532 | *dp = find_delegation_file(fp, &open->op_delegate_stateid); |
| 1533 | if (*dp == NULL) | 1533 | if (*dp == NULL) |
| @@ -1546,11 +1546,11 @@ out: | |||
| 1546 | return nfs_ok; | 1546 | return nfs_ok; |
| 1547 | } | 1547 | } |
| 1548 | 1548 | ||
| 1549 | static int | 1549 | static __be32 |
| 1550 | nfs4_check_open(struct nfs4_file *fp, struct nfsd4_open *open, struct nfs4_stateid **stpp) | 1550 | nfs4_check_open(struct nfs4_file *fp, struct nfsd4_open *open, struct nfs4_stateid **stpp) |
| 1551 | { | 1551 | { |
| 1552 | struct nfs4_stateid *local; | 1552 | struct nfs4_stateid *local; |
| 1553 | int status = nfserr_share_denied; | 1553 | __be32 status = nfserr_share_denied; |
| 1554 | struct nfs4_stateowner *sop = open->op_stateowner; | 1554 | struct nfs4_stateowner *sop = open->op_stateowner; |
| 1555 | 1555 | ||
| 1556 | list_for_each_entry(local, &fp->fi_stateids, st_perfile) { | 1556 | list_for_each_entry(local, &fp->fi_stateids, st_perfile) { |
| @@ -1575,7 +1575,7 @@ nfs4_alloc_stateid(void) | |||
| 1575 | return kmem_cache_alloc(stateid_slab, GFP_KERNEL); | 1575 | return kmem_cache_alloc(stateid_slab, GFP_KERNEL); |
| 1576 | } | 1576 | } |
| 1577 | 1577 | ||
| 1578 | static int | 1578 | static __be32 |
| 1579 | nfs4_new_open(struct svc_rqst *rqstp, struct nfs4_stateid **stpp, | 1579 | nfs4_new_open(struct svc_rqst *rqstp, struct nfs4_stateid **stpp, |
| 1580 | struct nfs4_delegation *dp, | 1580 | struct nfs4_delegation *dp, |
| 1581 | struct svc_fh *cur_fh, int flags) | 1581 | struct svc_fh *cur_fh, int flags) |
| @@ -1590,7 +1590,7 @@ nfs4_new_open(struct svc_rqst *rqstp, struct nfs4_stateid **stpp, | |||
| 1590 | get_file(dp->dl_vfs_file); | 1590 | get_file(dp->dl_vfs_file); |
| 1591 | stp->st_vfs_file = dp->dl_vfs_file; | 1591 | stp->st_vfs_file = dp->dl_vfs_file; |
| 1592 | } else { | 1592 | } else { |
| 1593 | int status; | 1593 | __be32 status; |
| 1594 | status = nfsd_open(rqstp, cur_fh, S_IFREG, flags, | 1594 | status = nfsd_open(rqstp, cur_fh, S_IFREG, flags, |
| 1595 | &stp->st_vfs_file); | 1595 | &stp->st_vfs_file); |
| 1596 | if (status) { | 1596 | if (status) { |
| @@ -1604,7 +1604,7 @@ nfs4_new_open(struct svc_rqst *rqstp, struct nfs4_stateid **stpp, | |||
| 1604 | return 0; | 1604 | return 0; |
| 1605 | } | 1605 | } |
| 1606 | 1606 | ||
| 1607 | static inline int | 1607 | static inline __be32 |
| 1608 | nfsd4_truncate(struct svc_rqst *rqstp, struct svc_fh *fh, | 1608 | nfsd4_truncate(struct svc_rqst *rqstp, struct svc_fh *fh, |
| 1609 | struct nfsd4_open *open) | 1609 | struct nfsd4_open *open) |
| 1610 | { | 1610 | { |
| @@ -1619,22 +1619,22 @@ nfsd4_truncate(struct svc_rqst *rqstp, struct svc_fh *fh, | |||
| 1619 | return nfsd_setattr(rqstp, fh, &iattr, 0, (time_t)0); | 1619 | return nfsd_setattr(rqstp, fh, &iattr, 0, (time_t)0); |
| 1620 | } | 1620 | } |
| 1621 | 1621 | ||
| 1622 | static int | 1622 | static __be32 |
| 1623 | nfs4_upgrade_open(struct svc_rqst *rqstp, struct svc_fh *cur_fh, struct nfs4_stateid *stp, struct nfsd4_open *open) | 1623 | nfs4_upgrade_open(struct svc_rqst *rqstp, struct svc_fh *cur_fh, struct nfs4_stateid *stp, struct nfsd4_open *open) |
| 1624 | { | 1624 | { |
| 1625 | struct file *filp = stp->st_vfs_file; | 1625 | struct file *filp = stp->st_vfs_file; |
| 1626 | struct inode *inode = filp->f_dentry->d_inode; | 1626 | struct inode *inode = filp->f_dentry->d_inode; |
| 1627 | unsigned int share_access, new_writer; | 1627 | unsigned int share_access, new_writer; |
| 1628 | int status; | 1628 | __be32 status; |
| 1629 | 1629 | ||
| 1630 | set_access(&share_access, stp->st_access_bmap); | 1630 | set_access(&share_access, stp->st_access_bmap); |
| 1631 | new_writer = (~share_access) & open->op_share_access | 1631 | new_writer = (~share_access) & open->op_share_access |
| 1632 | & NFS4_SHARE_ACCESS_WRITE; | 1632 | & NFS4_SHARE_ACCESS_WRITE; |
| 1633 | 1633 | ||
| 1634 | if (new_writer) { | 1634 | if (new_writer) { |
| 1635 | status = get_write_access(inode); | 1635 | int err = get_write_access(inode); |
| 1636 | if (status) | 1636 | if (err) |
| 1637 | return nfserrno(status); | 1637 | return nfserrno(err); |
| 1638 | } | 1638 | } |
| 1639 | status = nfsd4_truncate(rqstp, cur_fh, open); | 1639 | status = nfsd4_truncate(rqstp, cur_fh, open); |
| 1640 | if (status) { | 1640 | if (status) { |
| @@ -1738,14 +1738,14 @@ out: | |||
| 1738 | /* | 1738 | /* |
| 1739 | * called with nfs4_lock_state() held. | 1739 | * called with nfs4_lock_state() held. |
| 1740 | */ | 1740 | */ |
| 1741 | int | 1741 | __be32 |
| 1742 | nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open) | 1742 | nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open) |
| 1743 | { | 1743 | { |
| 1744 | struct nfs4_file *fp = NULL; | 1744 | struct nfs4_file *fp = NULL; |
| 1745 | struct inode *ino = current_fh->fh_dentry->d_inode; | 1745 | struct inode *ino = current_fh->fh_dentry->d_inode; |
| 1746 | struct nfs4_stateid *stp = NULL; | 1746 | struct nfs4_stateid *stp = NULL; |
| 1747 | struct nfs4_delegation *dp = NULL; | 1747 | struct nfs4_delegation *dp = NULL; |
| 1748 | int status; | 1748 | __be32 status; |
| 1749 | 1749 | ||
| 1750 | status = nfserr_inval; | 1750 | status = nfserr_inval; |
| 1751 | if (!access_valid(open->op_share_access) | 1751 | if (!access_valid(open->op_share_access) |
| @@ -1833,11 +1833,11 @@ static struct work_struct laundromat_work; | |||
| 1833 | static void laundromat_main(void *); | 1833 | static void laundromat_main(void *); |
| 1834 | static DECLARE_WORK(laundromat_work, laundromat_main, NULL); | 1834 | static DECLARE_WORK(laundromat_work, laundromat_main, NULL); |
| 1835 | 1835 | ||
| 1836 | int | 1836 | __be32 |
| 1837 | nfsd4_renew(clientid_t *clid) | 1837 | nfsd4_renew(clientid_t *clid) |
| 1838 | { | 1838 | { |
| 1839 | struct nfs4_client *clp; | 1839 | struct nfs4_client *clp; |
| 1840 | int status; | 1840 | __be32 status; |
| 1841 | 1841 | ||
| 1842 | nfs4_lock_state(); | 1842 | nfs4_lock_state(); |
| 1843 | dprintk("process_renew(%08x/%08x): starting\n", | 1843 | dprintk("process_renew(%08x/%08x): starting\n", |
| @@ -1996,9 +1996,9 @@ access_permit_write(unsigned long access_bmap) | |||
| 1996 | } | 1996 | } |
| 1997 | 1997 | ||
| 1998 | static | 1998 | static |
| 1999 | int nfs4_check_openmode(struct nfs4_stateid *stp, int flags) | 1999 | __be32 nfs4_check_openmode(struct nfs4_stateid *stp, int flags) |
| 2000 | { | 2000 | { |
| 2001 | int status = nfserr_openmode; | 2001 | __be32 status = nfserr_openmode; |
| 2002 | 2002 | ||
| 2003 | if ((flags & WR_STATE) && (!access_permit_write(stp->st_access_bmap))) | 2003 | if ((flags & WR_STATE) && (!access_permit_write(stp->st_access_bmap))) |
| 2004 | goto out; | 2004 | goto out; |
| @@ -2009,7 +2009,7 @@ out: | |||
| 2009 | return status; | 2009 | return status; |
| 2010 | } | 2010 | } |
| 2011 | 2011 | ||
| 2012 | static inline int | 2012 | static inline __be32 |
| 2013 | check_special_stateids(svc_fh *current_fh, stateid_t *stateid, int flags) | 2013 | check_special_stateids(svc_fh *current_fh, stateid_t *stateid, int flags) |
| 2014 | { | 2014 | { |
| 2015 | /* Trying to call delegreturn with a special stateid? Yuch: */ | 2015 | /* Trying to call delegreturn with a special stateid? Yuch: */ |
| @@ -2043,14 +2043,14 @@ io_during_grace_disallowed(struct inode *inode, int flags) | |||
| 2043 | /* | 2043 | /* |
| 2044 | * Checks for stateid operations | 2044 | * Checks for stateid operations |
| 2045 | */ | 2045 | */ |
| 2046 | int | 2046 | __be32 |
| 2047 | nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int flags, struct file **filpp) | 2047 | nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int flags, struct file **filpp) |
| 2048 | { | 2048 | { |
| 2049 | struct nfs4_stateid *stp = NULL; | 2049 | struct nfs4_stateid *stp = NULL; |
| 2050 | struct nfs4_delegation *dp = NULL; | 2050 | struct nfs4_delegation *dp = NULL; |
| 2051 | stateid_t *stidp; | 2051 | stateid_t *stidp; |
| 2052 | struct inode *ino = current_fh->fh_dentry->d_inode; | 2052 | struct inode *ino = current_fh->fh_dentry->d_inode; |
| 2053 | int status; | 2053 | __be32 status; |
| 2054 | 2054 | ||
| 2055 | dprintk("NFSD: preprocess_stateid_op: stateid = (%08x/%08x/%08x/%08x)\n", | 2055 | dprintk("NFSD: preprocess_stateid_op: stateid = (%08x/%08x/%08x/%08x)\n", |
| 2056 | stateid->si_boot, stateid->si_stateownerid, | 2056 | stateid->si_boot, stateid->si_stateownerid, |
| @@ -2125,7 +2125,7 @@ setlkflg (int type) | |||
| 2125 | /* | 2125 | /* |
| 2126 | * Checks for sequence id mutating operations. | 2126 | * Checks for sequence id mutating operations. |
| 2127 | */ | 2127 | */ |
| 2128 | static int | 2128 | static __be32 |
| 2129 | nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *stateid, int flags, struct nfs4_stateowner **sopp, struct nfs4_stateid **stpp, struct nfsd4_lock *lock) | 2129 | nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *stateid, int flags, struct nfs4_stateowner **sopp, struct nfs4_stateid **stpp, struct nfsd4_lock *lock) |
| 2130 | { | 2130 | { |
| 2131 | struct nfs4_stateid *stp; | 2131 | struct nfs4_stateid *stp; |
| @@ -2169,7 +2169,7 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei | |||
| 2169 | clientid_t *lockclid = &lock->v.new.clientid; | 2169 | clientid_t *lockclid = &lock->v.new.clientid; |
| 2170 | struct nfs4_client *clp = sop->so_client; | 2170 | struct nfs4_client *clp = sop->so_client; |
| 2171 | int lkflg = 0; | 2171 | int lkflg = 0; |
| 2172 | int status; | 2172 | __be32 status; |
| 2173 | 2173 | ||
| 2174 | lkflg = setlkflg(lock->lk_type); | 2174 | lkflg = setlkflg(lock->lk_type); |
| 2175 | 2175 | ||
| @@ -2233,7 +2233,7 @@ check_replay: | |||
| 2233 | if (seqid == sop->so_seqid - 1) { | 2233 | if (seqid == sop->so_seqid - 1) { |
| 2234 | dprintk("NFSD: preprocess_seqid_op: retransmission?\n"); | 2234 | dprintk("NFSD: preprocess_seqid_op: retransmission?\n"); |
| 2235 | /* indicate replay to calling function */ | 2235 | /* indicate replay to calling function */ |
| 2236 | return NFSERR_REPLAY_ME; | 2236 | return nfserr_replay_me; |
| 2237 | } | 2237 | } |
| 2238 | printk("NFSD: preprocess_seqid_op: bad seqid (expected %d, got %d)\n", | 2238 | printk("NFSD: preprocess_seqid_op: bad seqid (expected %d, got %d)\n", |
| 2239 | sop->so_seqid, seqid); | 2239 | sop->so_seqid, seqid); |
| @@ -2241,10 +2241,10 @@ check_replay: | |||
| 2241 | return nfserr_bad_seqid; | 2241 | return nfserr_bad_seqid; |
| 2242 | } | 2242 | } |
| 2243 | 2243 | ||
| 2244 | int | 2244 | __be32 |
| 2245 | nfsd4_open_confirm(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open_confirm *oc, struct nfs4_stateowner **replay_owner) | 2245 | nfsd4_open_confirm(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open_confirm *oc, struct nfs4_stateowner **replay_owner) |
| 2246 | { | 2246 | { |
| 2247 | int status; | 2247 | __be32 status; |
| 2248 | struct nfs4_stateowner *sop; | 2248 | struct nfs4_stateowner *sop; |
| 2249 | struct nfs4_stateid *stp; | 2249 | struct nfs4_stateid *stp; |
| 2250 | 2250 | ||
| @@ -2310,10 +2310,10 @@ reset_union_bmap_deny(unsigned long deny, unsigned long *bmap) | |||
| 2310 | } | 2310 | } |
| 2311 | } | 2311 | } |
| 2312 | 2312 | ||
| 2313 | int | 2313 | __be32 |
| 2314 | nfsd4_open_downgrade(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open_downgrade *od, struct nfs4_stateowner **replay_owner) | 2314 | nfsd4_open_downgrade(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open_downgrade *od, struct nfs4_stateowner **replay_owner) |
| 2315 | { | 2315 | { |
| 2316 | int status; | 2316 | __be32 status; |
| 2317 | struct nfs4_stateid *stp; | 2317 | struct nfs4_stateid *stp; |
| 2318 | unsigned int share_access; | 2318 | unsigned int share_access; |
| 2319 | 2319 | ||
| @@ -2365,10 +2365,10 @@ out: | |||
| 2365 | /* | 2365 | /* |
| 2366 | * nfs4_unlock_state() called after encode | 2366 | * nfs4_unlock_state() called after encode |
| 2367 | */ | 2367 | */ |
| 2368 | int | 2368 | __be32 |
| 2369 | nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_close *close, struct nfs4_stateowner **replay_owner) | 2369 | nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_close *close, struct nfs4_stateowner **replay_owner) |
| 2370 | { | 2370 | { |
| 2371 | int status; | 2371 | __be32 status; |
| 2372 | struct nfs4_stateid *stp; | 2372 | struct nfs4_stateid *stp; |
| 2373 | 2373 | ||
| 2374 | dprintk("NFSD: nfsd4_close on file %.*s\n", | 2374 | dprintk("NFSD: nfsd4_close on file %.*s\n", |
| @@ -2404,10 +2404,10 @@ out: | |||
| 2404 | return status; | 2404 | return status; |
| 2405 | } | 2405 | } |
| 2406 | 2406 | ||
| 2407 | int | 2407 | __be32 |
| 2408 | nfsd4_delegreturn(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_delegreturn *dr) | 2408 | nfsd4_delegreturn(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_delegreturn *dr) |
| 2409 | { | 2409 | { |
| 2410 | int status; | 2410 | __be32 status; |
| 2411 | 2411 | ||
| 2412 | if ((status = fh_verify(rqstp, current_fh, S_IFREG, 0))) | 2412 | if ((status = fh_verify(rqstp, current_fh, S_IFREG, 0))) |
| 2413 | goto out; | 2413 | goto out; |
| @@ -2635,7 +2635,7 @@ check_lock_length(u64 offset, u64 length) | |||
| 2635 | /* | 2635 | /* |
| 2636 | * LOCK operation | 2636 | * LOCK operation |
| 2637 | */ | 2637 | */ |
| 2638 | int | 2638 | __be32 |
| 2639 | nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock *lock, struct nfs4_stateowner **replay_owner) | 2639 | nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock *lock, struct nfs4_stateowner **replay_owner) |
| 2640 | { | 2640 | { |
| 2641 | struct nfs4_stateowner *open_sop = NULL; | 2641 | struct nfs4_stateowner *open_sop = NULL; |
| @@ -2644,8 +2644,9 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock | |||
| 2644 | struct file *filp; | 2644 | struct file *filp; |
| 2645 | struct file_lock file_lock; | 2645 | struct file_lock file_lock; |
| 2646 | struct file_lock conflock; | 2646 | struct file_lock conflock; |
| 2647 | int status = 0; | 2647 | __be32 status = 0; |
| 2648 | unsigned int strhashval; | 2648 | unsigned int strhashval; |
| 2649 | int err; | ||
| 2649 | 2650 | ||
| 2650 | dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n", | 2651 | dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n", |
| 2651 | (long long) lock->lk_offset, | 2652 | (long long) lock->lk_offset, |
| @@ -2758,13 +2759,14 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock | |||
| 2758 | * locks_copy_lock: */ | 2759 | * locks_copy_lock: */ |
| 2759 | conflock.fl_ops = NULL; | 2760 | conflock.fl_ops = NULL; |
| 2760 | conflock.fl_lmops = NULL; | 2761 | conflock.fl_lmops = NULL; |
| 2761 | status = posix_lock_file_conf(filp, &file_lock, &conflock); | 2762 | err = posix_lock_file_conf(filp, &file_lock, &conflock); |
| 2762 | dprintk("NFSD: nfsd4_lock: posix_lock_file_conf status %d\n",status); | 2763 | dprintk("NFSD: nfsd4_lock: posix_lock_file_conf status %d\n",status); |
| 2763 | switch (-status) { | 2764 | switch (-err) { |
| 2764 | case 0: /* success! */ | 2765 | case 0: /* success! */ |
| 2765 | update_stateid(&lock_stp->st_stateid); | 2766 | update_stateid(&lock_stp->st_stateid); |
| 2766 | memcpy(&lock->lk_resp_stateid, &lock_stp->st_stateid, | 2767 | memcpy(&lock->lk_resp_stateid, &lock_stp->st_stateid, |
| 2767 | sizeof(stateid_t)); | 2768 | sizeof(stateid_t)); |
| 2769 | status = 0; | ||
| 2768 | break; | 2770 | break; |
| 2769 | case (EAGAIN): /* conflock holds conflicting lock */ | 2771 | case (EAGAIN): /* conflock holds conflicting lock */ |
| 2770 | status = nfserr_denied; | 2772 | status = nfserr_denied; |
| @@ -2775,7 +2777,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock | |||
| 2775 | status = nfserr_deadlock; | 2777 | status = nfserr_deadlock; |
| 2776 | break; | 2778 | break; |
| 2777 | default: | 2779 | default: |
| 2778 | dprintk("NFSD: nfsd4_lock: posix_lock_file_conf() failed! status %d\n",status); | 2780 | dprintk("NFSD: nfsd4_lock: posix_lock_file_conf() failed! status %d\n",err); |
| 2779 | status = nfserr_resource; | 2781 | status = nfserr_resource; |
| 2780 | break; | 2782 | break; |
| 2781 | } | 2783 | } |
| @@ -2793,14 +2795,14 @@ out: | |||
| 2793 | /* | 2795 | /* |
| 2794 | * LOCKT operation | 2796 | * LOCKT operation |
| 2795 | */ | 2797 | */ |
| 2796 | int | 2798 | __be32 |
| 2797 | nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lockt *lockt) | 2799 | nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lockt *lockt) |
| 2798 | { | 2800 | { |
| 2799 | struct inode *inode; | 2801 | struct inode *inode; |
| 2800 | struct file file; | 2802 | struct file file; |
| 2801 | struct file_lock file_lock; | 2803 | struct file_lock file_lock; |
| 2802 | struct file_lock conflock; | 2804 | struct file_lock conflock; |
| 2803 | int status; | 2805 | __be32 status; |
| 2804 | 2806 | ||
| 2805 | if (nfs4_in_grace()) | 2807 | if (nfs4_in_grace()) |
| 2806 | return nfserr_grace; | 2808 | return nfserr_grace; |
| @@ -2873,13 +2875,14 @@ out: | |||
| 2873 | return status; | 2875 | return status; |
| 2874 | } | 2876 | } |
| 2875 | 2877 | ||
| 2876 | int | 2878 | __be32 |
| 2877 | nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_locku *locku, struct nfs4_stateowner **replay_owner) | 2879 | nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_locku *locku, struct nfs4_stateowner **replay_owner) |
| 2878 | { | 2880 | { |
| 2879 | struct nfs4_stateid *stp; | 2881 | struct nfs4_stateid *stp; |
| 2880 | struct file *filp = NULL; | 2882 | struct file *filp = NULL; |
| 2881 | struct file_lock file_lock; | 2883 | struct file_lock file_lock; |
| 2882 | int status; | 2884 | __be32 status; |
| 2885 | int err; | ||
| 2883 | 2886 | ||
| 2884 | dprintk("NFSD: nfsd4_locku: start=%Ld length=%Ld\n", | 2887 | dprintk("NFSD: nfsd4_locku: start=%Ld length=%Ld\n", |
| 2885 | (long long) locku->lu_offset, | 2888 | (long long) locku->lu_offset, |
| @@ -2917,8 +2920,8 @@ nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock | |||
| 2917 | /* | 2920 | /* |
| 2918 | * Try to unlock the file in the VFS. | 2921 | * Try to unlock the file in the VFS. |
| 2919 | */ | 2922 | */ |
| 2920 | status = posix_lock_file(filp, &file_lock); | 2923 | err = posix_lock_file(filp, &file_lock); |
| 2921 | if (status) { | 2924 | if (err) { |
| 2922 | dprintk("NFSD: nfs4_locku: posix_lock_file failed!\n"); | 2925 | dprintk("NFSD: nfs4_locku: posix_lock_file failed!\n"); |
| 2923 | goto out_nfserr; | 2926 | goto out_nfserr; |
| 2924 | } | 2927 | } |
| @@ -2937,7 +2940,7 @@ out: | |||
| 2937 | return status; | 2940 | return status; |
| 2938 | 2941 | ||
| 2939 | out_nfserr: | 2942 | out_nfserr: |
| 2940 | status = nfserrno(status); | 2943 | status = nfserrno(err); |
| 2941 | goto out; | 2944 | goto out; |
| 2942 | } | 2945 | } |
| 2943 | 2946 | ||
| @@ -2965,7 +2968,7 @@ out: | |||
| 2965 | return status; | 2968 | return status; |
| 2966 | } | 2969 | } |
| 2967 | 2970 | ||
| 2968 | int | 2971 | __be32 |
| 2969 | nfsd4_release_lockowner(struct svc_rqst *rqstp, struct nfsd4_release_lockowner *rlockowner) | 2972 | nfsd4_release_lockowner(struct svc_rqst *rqstp, struct nfsd4_release_lockowner *rlockowner) |
| 2970 | { | 2973 | { |
| 2971 | clientid_t *clid = &rlockowner->rl_clientid; | 2974 | clientid_t *clid = &rlockowner->rl_clientid; |
| @@ -2974,7 +2977,7 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, struct nfsd4_release_lockowner * | |||
| 2974 | struct xdr_netobj *owner = &rlockowner->rl_owner; | 2977 | struct xdr_netobj *owner = &rlockowner->rl_owner; |
| 2975 | struct list_head matches; | 2978 | struct list_head matches; |
| 2976 | int i; | 2979 | int i; |
| 2977 | int status; | 2980 | __be32 status; |
| 2978 | 2981 | ||
| 2979 | dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n", | 2982 | dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n", |
| 2980 | clid->cl_boot, clid->cl_id); | 2983 | clid->cl_boot, clid->cl_id); |
| @@ -3111,7 +3114,7 @@ nfs4_find_reclaim_client(clientid_t *clid) | |||
| 3111 | /* | 3114 | /* |
| 3112 | * Called from OPEN. Look for clientid in reclaim list. | 3115 | * Called from OPEN. Look for clientid in reclaim list. |
| 3113 | */ | 3116 | */ |
| 3114 | int | 3117 | __be32 |
| 3115 | nfs4_check_open_reclaim(clientid_t *clid) | 3118 | nfs4_check_open_reclaim(clientid_t *clid) |
| 3116 | { | 3119 | { |
| 3117 | return nfs4_find_reclaim_client(clid) ? nfs_ok : nfserr_reclaim_bad; | 3120 | return nfs4_find_reclaim_client(clid) ? nfs_ok : nfserr_reclaim_bad; |
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 41fc241b729a..f3f239db04bb 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
| @@ -68,8 +68,8 @@ | |||
| 68 | #define NFS4_REFERRAL_FSID_MAJOR 0x8000000ULL | 68 | #define NFS4_REFERRAL_FSID_MAJOR 0x8000000ULL |
| 69 | #define NFS4_REFERRAL_FSID_MINOR 0x8000000ULL | 69 | #define NFS4_REFERRAL_FSID_MINOR 0x8000000ULL |
| 70 | 70 | ||
| 71 | static int | 71 | static __be32 |
| 72 | check_filename(char *str, int len, int err) | 72 | check_filename(char *str, int len, __be32 err) |
| 73 | { | 73 | { |
| 74 | int i; | 74 | int i; |
| 75 | 75 | ||
| @@ -94,8 +94,8 @@ check_filename(char *str, int len, int err) | |||
| 94 | * consistent with the style used in NFSv2/v3... | 94 | * consistent with the style used in NFSv2/v3... |
| 95 | */ | 95 | */ |
| 96 | #define DECODE_HEAD \ | 96 | #define DECODE_HEAD \ |
| 97 | u32 *p; \ | 97 | __be32 *p; \ |
| 98 | int status | 98 | __be32 status |
| 99 | #define DECODE_TAIL \ | 99 | #define DECODE_TAIL \ |
| 100 | status = 0; \ | 100 | status = 0; \ |
| 101 | out: \ | 101 | out: \ |
| @@ -144,13 +144,13 @@ xdr_error: \ | |||
| 144 | } \ | 144 | } \ |
| 145 | } while (0) | 145 | } while (0) |
| 146 | 146 | ||
| 147 | static u32 *read_buf(struct nfsd4_compoundargs *argp, int nbytes) | 147 | static __be32 *read_buf(struct nfsd4_compoundargs *argp, int nbytes) |
| 148 | { | 148 | { |
| 149 | /* We want more bytes than seem to be available. | 149 | /* We want more bytes than seem to be available. |
| 150 | * Maybe we need a new page, maybe we have just run out | 150 | * Maybe we need a new page, maybe we have just run out |
| 151 | */ | 151 | */ |
| 152 | int avail = (char*)argp->end - (char*)argp->p; | 152 | int avail = (char*)argp->end - (char*)argp->p; |
| 153 | u32 *p; | 153 | __be32 *p; |
| 154 | if (avail + argp->pagelen < nbytes) | 154 | if (avail + argp->pagelen < nbytes) |
| 155 | return NULL; | 155 | return NULL; |
| 156 | if (avail + PAGE_SIZE < nbytes) /* need more than a page !! */ | 156 | if (avail + PAGE_SIZE < nbytes) /* need more than a page !! */ |
| @@ -197,7 +197,7 @@ defer_free(struct nfsd4_compoundargs *argp, | |||
| 197 | return 0; | 197 | return 0; |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | static char *savemem(struct nfsd4_compoundargs *argp, u32 *p, int nbytes) | 200 | static char *savemem(struct nfsd4_compoundargs *argp, __be32 *p, int nbytes) |
| 201 | { | 201 | { |
| 202 | void *new = NULL; | 202 | void *new = NULL; |
| 203 | if (p == argp->tmp) { | 203 | if (p == argp->tmp) { |
| @@ -217,7 +217,7 @@ static char *savemem(struct nfsd4_compoundargs *argp, u32 *p, int nbytes) | |||
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | 219 | ||
| 220 | static int | 220 | static __be32 |
| 221 | nfsd4_decode_bitmap(struct nfsd4_compoundargs *argp, u32 *bmval) | 221 | nfsd4_decode_bitmap(struct nfsd4_compoundargs *argp, u32 *bmval) |
| 222 | { | 222 | { |
| 223 | u32 bmlen; | 223 | u32 bmlen; |
| @@ -240,13 +240,14 @@ nfsd4_decode_bitmap(struct nfsd4_compoundargs *argp, u32 *bmval) | |||
| 240 | DECODE_TAIL; | 240 | DECODE_TAIL; |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | static int | 243 | static __be32 |
| 244 | nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *iattr, | 244 | nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *iattr, |
| 245 | struct nfs4_acl **acl) | 245 | struct nfs4_acl **acl) |
| 246 | { | 246 | { |
| 247 | int expected_len, len = 0; | 247 | int expected_len, len = 0; |
| 248 | u32 dummy32; | 248 | u32 dummy32; |
| 249 | char *buf; | 249 | char *buf; |
| 250 | int host_err; | ||
| 250 | 251 | ||
| 251 | DECODE_HEAD; | 252 | DECODE_HEAD; |
| 252 | iattr->ia_valid = 0; | 253 | iattr->ia_valid = 0; |
| @@ -280,7 +281,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *ia | |||
| 280 | 281 | ||
| 281 | *acl = nfs4_acl_new(); | 282 | *acl = nfs4_acl_new(); |
| 282 | if (*acl == NULL) { | 283 | if (*acl == NULL) { |
| 283 | status = -ENOMEM; | 284 | host_err = -ENOMEM; |
| 284 | goto out_nfserr; | 285 | goto out_nfserr; |
| 285 | } | 286 | } |
| 286 | defer_free(argp, (void (*)(const void *))nfs4_acl_free, *acl); | 287 | defer_free(argp, (void (*)(const void *))nfs4_acl_free, *acl); |
| @@ -295,20 +296,20 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *ia | |||
| 295 | len += XDR_QUADLEN(dummy32) << 2; | 296 | len += XDR_QUADLEN(dummy32) << 2; |
| 296 | READMEM(buf, dummy32); | 297 | READMEM(buf, dummy32); |
| 297 | ace.whotype = nfs4_acl_get_whotype(buf, dummy32); | 298 | ace.whotype = nfs4_acl_get_whotype(buf, dummy32); |
| 298 | status = 0; | 299 | host_err = 0; |
| 299 | if (ace.whotype != NFS4_ACL_WHO_NAMED) | 300 | if (ace.whotype != NFS4_ACL_WHO_NAMED) |
| 300 | ace.who = 0; | 301 | ace.who = 0; |
| 301 | else if (ace.flag & NFS4_ACE_IDENTIFIER_GROUP) | 302 | else if (ace.flag & NFS4_ACE_IDENTIFIER_GROUP) |
| 302 | status = nfsd_map_name_to_gid(argp->rqstp, | 303 | host_err = nfsd_map_name_to_gid(argp->rqstp, |
| 303 | buf, dummy32, &ace.who); | 304 | buf, dummy32, &ace.who); |
| 304 | else | 305 | else |
| 305 | status = nfsd_map_name_to_uid(argp->rqstp, | 306 | host_err = nfsd_map_name_to_uid(argp->rqstp, |
| 306 | buf, dummy32, &ace.who); | 307 | buf, dummy32, &ace.who); |
| 307 | if (status) | 308 | if (host_err) |
| 308 | goto out_nfserr; | 309 | goto out_nfserr; |
| 309 | status = nfs4_acl_add_ace(*acl, ace.type, ace.flag, | 310 | host_err = nfs4_acl_add_ace(*acl, ace.type, ace.flag, |
| 310 | ace.access_mask, ace.whotype, ace.who); | 311 | ace.access_mask, ace.whotype, ace.who); |
| 311 | if (status) | 312 | if (host_err) |
| 312 | goto out_nfserr; | 313 | goto out_nfserr; |
| 313 | } | 314 | } |
| 314 | } else | 315 | } else |
| @@ -327,7 +328,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *ia | |||
| 327 | READ_BUF(dummy32); | 328 | READ_BUF(dummy32); |
| 328 | len += (XDR_QUADLEN(dummy32) << 2); | 329 | len += (XDR_QUADLEN(dummy32) << 2); |
| 329 | READMEM(buf, dummy32); | 330 | READMEM(buf, dummy32); |
| 330 | if ((status = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid))) | 331 | if ((host_err = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid))) |
| 331 | goto out_nfserr; | 332 | goto out_nfserr; |
| 332 | iattr->ia_valid |= ATTR_UID; | 333 | iattr->ia_valid |= ATTR_UID; |
| 333 | } | 334 | } |
| @@ -338,7 +339,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *ia | |||
| 338 | READ_BUF(dummy32); | 339 | READ_BUF(dummy32); |
| 339 | len += (XDR_QUADLEN(dummy32) << 2); | 340 | len += (XDR_QUADLEN(dummy32) << 2); |
| 340 | READMEM(buf, dummy32); | 341 | READMEM(buf, dummy32); |
| 341 | if ((status = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid))) | 342 | if ((host_err = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid))) |
| 342 | goto out_nfserr; | 343 | goto out_nfserr; |
| 343 | iattr->ia_valid |= ATTR_GID; | 344 | iattr->ia_valid |= ATTR_GID; |
| 344 | } | 345 | } |
| @@ -414,11 +415,11 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *ia | |||
| 414 | DECODE_TAIL; | 415 | DECODE_TAIL; |
| 415 | 416 | ||
| 416 | out_nfserr: | 417 | out_nfserr: |
| 417 | status = nfserrno(status); | 418 | status = nfserrno(host_err); |
| 418 | goto out; | 419 | goto out; |
| 419 | } | 420 | } |
| 420 | 421 | ||
| 421 | static int | 422 | static __be32 |
| 422 | nfsd4_decode_access(struct nfsd4_compoundargs *argp, struct nfsd4_access *access) | 423 | nfsd4_decode_access(struct nfsd4_compoundargs *argp, struct nfsd4_access *access) |
| 423 | { | 424 | { |
| 424 | DECODE_HEAD; | 425 | DECODE_HEAD; |
| @@ -429,7 +430,7 @@ nfsd4_decode_access(struct nfsd4_compoundargs *argp, struct nfsd4_access *access | |||
| 429 | DECODE_TAIL; | 430 | DECODE_TAIL; |
| 430 | } | 431 | } |
| 431 | 432 | ||
| 432 | static int | 433 | static __be32 |
| 433 | nfsd4_decode_close(struct nfsd4_compoundargs *argp, struct nfsd4_close *close) | 434 | nfsd4_decode_close(struct nfsd4_compoundargs *argp, struct nfsd4_close *close) |
| 434 | { | 435 | { |
| 435 | DECODE_HEAD; | 436 | DECODE_HEAD; |
| @@ -444,7 +445,7 @@ nfsd4_decode_close(struct nfsd4_compoundargs *argp, struct nfsd4_close *close) | |||
| 444 | } | 445 | } |
| 445 | 446 | ||
| 446 | 447 | ||
| 447 | static int | 448 | static __be32 |
| 448 | nfsd4_decode_commit(struct nfsd4_compoundargs *argp, struct nfsd4_commit *commit) | 449 | nfsd4_decode_commit(struct nfsd4_compoundargs *argp, struct nfsd4_commit *commit) |
| 449 | { | 450 | { |
| 450 | DECODE_HEAD; | 451 | DECODE_HEAD; |
| @@ -456,7 +457,7 @@ nfsd4_decode_commit(struct nfsd4_compoundargs *argp, struct nfsd4_commit *commit | |||
| 456 | DECODE_TAIL; | 457 | DECODE_TAIL; |
| 457 | } | 458 | } |
| 458 | 459 | ||
| 459 | static int | 460 | static __be32 |
| 460 | nfsd4_decode_create(struct nfsd4_compoundargs *argp, struct nfsd4_create *create) | 461 | nfsd4_decode_create(struct nfsd4_compoundargs *argp, struct nfsd4_create *create) |
| 461 | { | 462 | { |
| 462 | DECODE_HEAD; | 463 | DECODE_HEAD; |
| @@ -496,7 +497,7 @@ nfsd4_decode_create(struct nfsd4_compoundargs *argp, struct nfsd4_create *create | |||
| 496 | DECODE_TAIL; | 497 | DECODE_TAIL; |
| 497 | } | 498 | } |
| 498 | 499 | ||
| 499 | static inline int | 500 | static inline __be32 |
| 500 | nfsd4_decode_delegreturn(struct nfsd4_compoundargs *argp, struct nfsd4_delegreturn *dr) | 501 | nfsd4_decode_delegreturn(struct nfsd4_compoundargs *argp, struct nfsd4_delegreturn *dr) |
| 501 | { | 502 | { |
| 502 | DECODE_HEAD; | 503 | DECODE_HEAD; |
| @@ -508,13 +509,13 @@ nfsd4_decode_delegreturn(struct nfsd4_compoundargs *argp, struct nfsd4_delegretu | |||
| 508 | DECODE_TAIL; | 509 | DECODE_TAIL; |
| 509 | } | 510 | } |
| 510 | 511 | ||
| 511 | static inline int | 512 | static inline __be32 |
| 512 | nfsd4_decode_getattr(struct nfsd4_compoundargs *argp, struct nfsd4_getattr *getattr) | 513 | nfsd4_decode_getattr(struct nfsd4_compoundargs *argp, struct nfsd4_getattr *getattr) |
| 513 | { | 514 | { |
| 514 | return nfsd4_decode_bitmap(argp, getattr->ga_bmval); | 515 | return nfsd4_decode_bitmap(argp, getattr->ga_bmval); |
| 515 | } | 516 | } |
| 516 | 517 | ||
| 517 | static int | 518 | static __be32 |
| 518 | nfsd4_decode_link(struct nfsd4_compoundargs *argp, struct nfsd4_link *link) | 519 | nfsd4_decode_link(struct nfsd4_compoundargs *argp, struct nfsd4_link *link) |
| 519 | { | 520 | { |
| 520 | DECODE_HEAD; | 521 | DECODE_HEAD; |
| @@ -529,7 +530,7 @@ nfsd4_decode_link(struct nfsd4_compoundargs *argp, struct nfsd4_link *link) | |||
| 529 | DECODE_TAIL; | 530 | DECODE_TAIL; |
| 530 | } | 531 | } |
| 531 | 532 | ||
| 532 | static int | 533 | static __be32 |
| 533 | nfsd4_decode_lock(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock) | 534 | nfsd4_decode_lock(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock) |
| 534 | { | 535 | { |
| 535 | DECODE_HEAD; | 536 | DECODE_HEAD; |
| @@ -568,7 +569,7 @@ nfsd4_decode_lock(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock) | |||
| 568 | DECODE_TAIL; | 569 | DECODE_TAIL; |
| 569 | } | 570 | } |
| 570 | 571 | ||
| 571 | static int | 572 | static __be32 |
| 572 | nfsd4_decode_lockt(struct nfsd4_compoundargs *argp, struct nfsd4_lockt *lockt) | 573 | nfsd4_decode_lockt(struct nfsd4_compoundargs *argp, struct nfsd4_lockt *lockt) |
| 573 | { | 574 | { |
| 574 | DECODE_HEAD; | 575 | DECODE_HEAD; |
| @@ -587,7 +588,7 @@ nfsd4_decode_lockt(struct nfsd4_compoundargs *argp, struct nfsd4_lockt *lockt) | |||
| 587 | DECODE_TAIL; | 588 | DECODE_TAIL; |
| 588 | } | 589 | } |
| 589 | 590 | ||
| 590 | static int | 591 | static __be32 |
| 591 | nfsd4_decode_locku(struct nfsd4_compoundargs *argp, struct nfsd4_locku *locku) | 592 | nfsd4_decode_locku(struct nfsd4_compoundargs *argp, struct nfsd4_locku *locku) |
| 592 | { | 593 | { |
| 593 | DECODE_HEAD; | 594 | DECODE_HEAD; |
| @@ -606,7 +607,7 @@ nfsd4_decode_locku(struct nfsd4_compoundargs *argp, struct nfsd4_locku *locku) | |||
| 606 | DECODE_TAIL; | 607 | DECODE_TAIL; |
| 607 | } | 608 | } |
| 608 | 609 | ||
| 609 | static int | 610 | static __be32 |
| 610 | nfsd4_decode_lookup(struct nfsd4_compoundargs *argp, struct nfsd4_lookup *lookup) | 611 | nfsd4_decode_lookup(struct nfsd4_compoundargs *argp, struct nfsd4_lookup *lookup) |
| 611 | { | 612 | { |
| 612 | DECODE_HEAD; | 613 | DECODE_HEAD; |
| @@ -621,7 +622,7 @@ nfsd4_decode_lookup(struct nfsd4_compoundargs *argp, struct nfsd4_lookup *lookup | |||
| 621 | DECODE_TAIL; | 622 | DECODE_TAIL; |
| 622 | } | 623 | } |
| 623 | 624 | ||
| 624 | static int | 625 | static __be32 |
| 625 | nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open) | 626 | nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open) |
| 626 | { | 627 | { |
| 627 | DECODE_HEAD; | 628 | DECODE_HEAD; |
| @@ -699,7 +700,7 @@ nfsd4_decode_open(struct nfsd4_compoundargs *argp, struct nfsd4_open *open) | |||
| 699 | DECODE_TAIL; | 700 | DECODE_TAIL; |
| 700 | } | 701 | } |
| 701 | 702 | ||
| 702 | static int | 703 | static __be32 |
| 703 | nfsd4_decode_open_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_open_confirm *open_conf) | 704 | nfsd4_decode_open_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_open_confirm *open_conf) |
| 704 | { | 705 | { |
| 705 | DECODE_HEAD; | 706 | DECODE_HEAD; |
| @@ -713,7 +714,7 @@ nfsd4_decode_open_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_open_con | |||
| 713 | DECODE_TAIL; | 714 | DECODE_TAIL; |
| 714 | } | 715 | } |
| 715 | 716 | ||
| 716 | static int | 717 | static __be32 |
| 717 | nfsd4_decode_open_downgrade(struct nfsd4_compoundargs *argp, struct nfsd4_open_downgrade *open_down) | 718 | nfsd4_decode_open_downgrade(struct nfsd4_compoundargs *argp, struct nfsd4_open_downgrade *open_down) |
| 718 | { | 719 | { |
| 719 | DECODE_HEAD; | 720 | DECODE_HEAD; |
| @@ -729,7 +730,7 @@ nfsd4_decode_open_downgrade(struct nfsd4_compoundargs *argp, struct nfsd4_open_d | |||
| 729 | DECODE_TAIL; | 730 | DECODE_TAIL; |
| 730 | } | 731 | } |
| 731 | 732 | ||
| 732 | static int | 733 | static __be32 |
| 733 | nfsd4_decode_putfh(struct nfsd4_compoundargs *argp, struct nfsd4_putfh *putfh) | 734 | nfsd4_decode_putfh(struct nfsd4_compoundargs *argp, struct nfsd4_putfh *putfh) |
| 734 | { | 735 | { |
| 735 | DECODE_HEAD; | 736 | DECODE_HEAD; |
| @@ -744,7 +745,7 @@ nfsd4_decode_putfh(struct nfsd4_compoundargs *argp, struct nfsd4_putfh *putfh) | |||
| 744 | DECODE_TAIL; | 745 | DECODE_TAIL; |
| 745 | } | 746 | } |
| 746 | 747 | ||
| 747 | static int | 748 | static __be32 |
| 748 | nfsd4_decode_read(struct nfsd4_compoundargs *argp, struct nfsd4_read *read) | 749 | nfsd4_decode_read(struct nfsd4_compoundargs *argp, struct nfsd4_read *read) |
| 749 | { | 750 | { |
| 750 | DECODE_HEAD; | 751 | DECODE_HEAD; |
| @@ -758,7 +759,7 @@ nfsd4_decode_read(struct nfsd4_compoundargs *argp, struct nfsd4_read *read) | |||
| 758 | DECODE_TAIL; | 759 | DECODE_TAIL; |
| 759 | } | 760 | } |
| 760 | 761 | ||
| 761 | static int | 762 | static __be32 |
| 762 | nfsd4_decode_readdir(struct nfsd4_compoundargs *argp, struct nfsd4_readdir *readdir) | 763 | nfsd4_decode_readdir(struct nfsd4_compoundargs *argp, struct nfsd4_readdir *readdir) |
| 763 | { | 764 | { |
| 764 | DECODE_HEAD; | 765 | DECODE_HEAD; |
| @@ -774,7 +775,7 @@ nfsd4_decode_readdir(struct nfsd4_compoundargs *argp, struct nfsd4_readdir *read | |||
| 774 | DECODE_TAIL; | 775 | DECODE_TAIL; |
| 775 | } | 776 | } |
| 776 | 777 | ||
| 777 | static int | 778 | static __be32 |
| 778 | nfsd4_decode_remove(struct nfsd4_compoundargs *argp, struct nfsd4_remove *remove) | 779 | nfsd4_decode_remove(struct nfsd4_compoundargs *argp, struct nfsd4_remove *remove) |
| 779 | { | 780 | { |
| 780 | DECODE_HEAD; | 781 | DECODE_HEAD; |
| @@ -789,7 +790,7 @@ nfsd4_decode_remove(struct nfsd4_compoundargs *argp, struct nfsd4_remove *remove | |||
| 789 | DECODE_TAIL; | 790 | DECODE_TAIL; |
| 790 | } | 791 | } |
| 791 | 792 | ||
| 792 | static int | 793 | static __be32 |
| 793 | nfsd4_decode_rename(struct nfsd4_compoundargs *argp, struct nfsd4_rename *rename) | 794 | nfsd4_decode_rename(struct nfsd4_compoundargs *argp, struct nfsd4_rename *rename) |
| 794 | { | 795 | { |
| 795 | DECODE_HEAD; | 796 | DECODE_HEAD; |
| @@ -809,7 +810,7 @@ nfsd4_decode_rename(struct nfsd4_compoundargs *argp, struct nfsd4_rename *rename | |||
| 809 | DECODE_TAIL; | 810 | DECODE_TAIL; |
| 810 | } | 811 | } |
| 811 | 812 | ||
| 812 | static int | 813 | static __be32 |
| 813 | nfsd4_decode_renew(struct nfsd4_compoundargs *argp, clientid_t *clientid) | 814 | nfsd4_decode_renew(struct nfsd4_compoundargs *argp, clientid_t *clientid) |
| 814 | { | 815 | { |
| 815 | DECODE_HEAD; | 816 | DECODE_HEAD; |
| @@ -820,7 +821,7 @@ nfsd4_decode_renew(struct nfsd4_compoundargs *argp, clientid_t *clientid) | |||
| 820 | DECODE_TAIL; | 821 | DECODE_TAIL; |
| 821 | } | 822 | } |
| 822 | 823 | ||
| 823 | static int | 824 | static __be32 |
| 824 | nfsd4_decode_setattr(struct nfsd4_compoundargs *argp, struct nfsd4_setattr *setattr) | 825 | nfsd4_decode_setattr(struct nfsd4_compoundargs *argp, struct nfsd4_setattr *setattr) |
| 825 | { | 826 | { |
| 826 | DECODE_HEAD; | 827 | DECODE_HEAD; |
| @@ -834,7 +835,7 @@ nfsd4_decode_setattr(struct nfsd4_compoundargs *argp, struct nfsd4_setattr *seta | |||
| 834 | DECODE_TAIL; | 835 | DECODE_TAIL; |
| 835 | } | 836 | } |
| 836 | 837 | ||
| 837 | static int | 838 | static __be32 |
| 838 | nfsd4_decode_setclientid(struct nfsd4_compoundargs *argp, struct nfsd4_setclientid *setclientid) | 839 | nfsd4_decode_setclientid(struct nfsd4_compoundargs *argp, struct nfsd4_setclientid *setclientid) |
| 839 | { | 840 | { |
| 840 | DECODE_HEAD; | 841 | DECODE_HEAD; |
| @@ -859,7 +860,7 @@ nfsd4_decode_setclientid(struct nfsd4_compoundargs *argp, struct nfsd4_setclient | |||
| 859 | DECODE_TAIL; | 860 | DECODE_TAIL; |
| 860 | } | 861 | } |
| 861 | 862 | ||
| 862 | static int | 863 | static __be32 |
| 863 | nfsd4_decode_setclientid_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_setclientid_confirm *scd_c) | 864 | nfsd4_decode_setclientid_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_setclientid_confirm *scd_c) |
| 864 | { | 865 | { |
| 865 | DECODE_HEAD; | 866 | DECODE_HEAD; |
| @@ -872,7 +873,7 @@ nfsd4_decode_setclientid_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_s | |||
| 872 | } | 873 | } |
| 873 | 874 | ||
| 874 | /* Also used for NVERIFY */ | 875 | /* Also used for NVERIFY */ |
| 875 | static int | 876 | static __be32 |
| 876 | nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify) | 877 | nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify) |
| 877 | { | 878 | { |
| 878 | #if 0 | 879 | #if 0 |
| @@ -908,7 +909,7 @@ nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify | |||
| 908 | DECODE_TAIL; | 909 | DECODE_TAIL; |
| 909 | } | 910 | } |
| 910 | 911 | ||
| 911 | static int | 912 | static __be32 |
| 912 | nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write) | 913 | nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write) |
| 913 | { | 914 | { |
| 914 | int avail; | 915 | int avail; |
| @@ -951,15 +952,15 @@ nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write) | |||
| 951 | argp->pagelen -= len; | 952 | argp->pagelen -= len; |
| 952 | } | 953 | } |
| 953 | } | 954 | } |
| 954 | argp->end = (u32*) (argp->rqstp->rq_vec[v].iov_base + argp->rqstp->rq_vec[v].iov_len); | 955 | argp->end = (__be32*) (argp->rqstp->rq_vec[v].iov_base + argp->rqstp->rq_vec[v].iov_len); |
| 955 | argp->p = (u32*) (argp->rqstp->rq_vec[v].iov_base + (XDR_QUADLEN(len) << 2)); | 956 | argp->p = (__be32*) (argp->rqstp->rq_vec[v].iov_base + (XDR_QUADLEN(len) << 2)); |
| 956 | argp->rqstp->rq_vec[v].iov_len = len; | 957 | argp->rqstp->rq_vec[v].iov_len = len; |
| 957 | write->wr_vlen = v+1; | 958 | write->wr_vlen = v+1; |
| 958 | 959 | ||
| 959 | DECODE_TAIL; | 960 | DECODE_TAIL; |
| 960 | } | 961 | } |
| 961 | 962 | ||
| 962 | static int | 963 | static __be32 |
| 963 | nfsd4_decode_release_lockowner(struct nfsd4_compoundargs *argp, struct nfsd4_release_lockowner *rlockowner) | 964 | nfsd4_decode_release_lockowner(struct nfsd4_compoundargs *argp, struct nfsd4_release_lockowner *rlockowner) |
| 964 | { | 965 | { |
| 965 | DECODE_HEAD; | 966 | DECODE_HEAD; |
| @@ -973,7 +974,7 @@ nfsd4_decode_release_lockowner(struct nfsd4_compoundargs *argp, struct nfsd4_rel | |||
| 973 | DECODE_TAIL; | 974 | DECODE_TAIL; |
| 974 | } | 975 | } |
| 975 | 976 | ||
| 976 | static int | 977 | static __be32 |
| 977 | nfsd4_decode_compound(struct nfsd4_compoundargs *argp) | 978 | nfsd4_decode_compound(struct nfsd4_compoundargs *argp) |
| 978 | { | 979 | { |
| 979 | DECODE_HEAD; | 980 | DECODE_HEAD; |
| @@ -1179,7 +1180,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) | |||
| 1179 | * task to translate them into Linux-specific versions which are more | 1180 | * task to translate them into Linux-specific versions which are more |
| 1180 | * consistent with the style used in NFSv2/v3... | 1181 | * consistent with the style used in NFSv2/v3... |
| 1181 | */ | 1182 | */ |
| 1182 | #define ENCODE_HEAD u32 *p | 1183 | #define ENCODE_HEAD __be32 *p |
| 1183 | 1184 | ||
| 1184 | #define WRITE32(n) *p++ = htonl(n) | 1185 | #define WRITE32(n) *p++ = htonl(n) |
| 1185 | #define WRITE64(n) do { \ | 1186 | #define WRITE64(n) do { \ |
| @@ -1209,8 +1210,8 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) | |||
| 1209 | * Header routine to setup seqid operation replay cache | 1210 | * Header routine to setup seqid operation replay cache |
| 1210 | */ | 1211 | */ |
| 1211 | #define ENCODE_SEQID_OP_HEAD \ | 1212 | #define ENCODE_SEQID_OP_HEAD \ |
| 1212 | u32 *p; \ | 1213 | __be32 *p; \ |
| 1213 | u32 *save; \ | 1214 | __be32 *save; \ |
| 1214 | \ | 1215 | \ |
| 1215 | save = resp->p; | 1216 | save = resp->p; |
| 1216 | 1217 | ||
| @@ -1234,11 +1235,11 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) | |||
| 1234 | /* Encode as an array of strings the string given with components | 1235 | /* Encode as an array of strings the string given with components |
| 1235 | * seperated @sep. | 1236 | * seperated @sep. |
| 1236 | */ | 1237 | */ |
| 1237 | static int nfsd4_encode_components(char sep, char *components, | 1238 | static __be32 nfsd4_encode_components(char sep, char *components, |
| 1238 | u32 **pp, int *buflen) | 1239 | __be32 **pp, int *buflen) |
| 1239 | { | 1240 | { |
| 1240 | u32 *p = *pp; | 1241 | __be32 *p = *pp; |
| 1241 | u32 *countp = p; | 1242 | __be32 *countp = p; |
| 1242 | int strlen, count=0; | 1243 | int strlen, count=0; |
| 1243 | char *str, *end; | 1244 | char *str, *end; |
| 1244 | 1245 | ||
| @@ -1271,11 +1272,11 @@ static int nfsd4_encode_components(char sep, char *components, | |||
| 1271 | /* | 1272 | /* |
| 1272 | * encode a location element of a fs_locations structure | 1273 | * encode a location element of a fs_locations structure |
| 1273 | */ | 1274 | */ |
| 1274 | static int nfsd4_encode_fs_location4(struct nfsd4_fs_location *location, | 1275 | static __be32 nfsd4_encode_fs_location4(struct nfsd4_fs_location *location, |
| 1275 | u32 **pp, int *buflen) | 1276 | __be32 **pp, int *buflen) |
| 1276 | { | 1277 | { |
| 1277 | int status; | 1278 | __be32 status; |
| 1278 | u32 *p = *pp; | 1279 | __be32 *p = *pp; |
| 1279 | 1280 | ||
| 1280 | status = nfsd4_encode_components(':', location->hosts, &p, buflen); | 1281 | status = nfsd4_encode_components(':', location->hosts, &p, buflen); |
| 1281 | if (status) | 1282 | if (status) |
| @@ -1292,16 +1293,15 @@ static int nfsd4_encode_fs_location4(struct nfsd4_fs_location *location, | |||
| 1292 | * Returned string is safe to use as long as the caller holds a reference | 1293 | * Returned string is safe to use as long as the caller holds a reference |
| 1293 | * to @exp. | 1294 | * to @exp. |
| 1294 | */ | 1295 | */ |
| 1295 | static char *nfsd4_path(struct svc_rqst *rqstp, struct svc_export *exp) | 1296 | static char *nfsd4_path(struct svc_rqst *rqstp, struct svc_export *exp, __be32 *stat) |
| 1296 | { | 1297 | { |
| 1297 | struct svc_fh tmp_fh; | 1298 | struct svc_fh tmp_fh; |
| 1298 | char *path, *rootpath; | 1299 | char *path, *rootpath; |
| 1299 | int stat; | ||
| 1300 | 1300 | ||
| 1301 | fh_init(&tmp_fh, NFS4_FHSIZE); | 1301 | fh_init(&tmp_fh, NFS4_FHSIZE); |
| 1302 | stat = exp_pseudoroot(rqstp->rq_client, &tmp_fh, &rqstp->rq_chandle); | 1302 | *stat = exp_pseudoroot(rqstp->rq_client, &tmp_fh, &rqstp->rq_chandle); |
| 1303 | if (stat) | 1303 | if (*stat) |
| 1304 | return ERR_PTR(stat); | 1304 | return NULL; |
| 1305 | rootpath = tmp_fh.fh_export->ex_path; | 1305 | rootpath = tmp_fh.fh_export->ex_path; |
| 1306 | 1306 | ||
| 1307 | path = exp->ex_path; | 1307 | path = exp->ex_path; |
| @@ -1309,7 +1309,8 @@ static char *nfsd4_path(struct svc_rqst *rqstp, struct svc_export *exp) | |||
| 1309 | if (strncmp(path, rootpath, strlen(rootpath))) { | 1309 | if (strncmp(path, rootpath, strlen(rootpath))) { |
| 1310 | printk("nfsd: fs_locations failed;" | 1310 | printk("nfsd: fs_locations failed;" |
| 1311 | "%s is not contained in %s\n", path, rootpath); | 1311 | "%s is not contained in %s\n", path, rootpath); |
| 1312 | return ERR_PTR(-EOPNOTSUPP); | 1312 | *stat = nfserr_notsupp; |
| 1313 | return NULL; | ||
| 1313 | } | 1314 | } |
| 1314 | 1315 | ||
| 1315 | return path + strlen(rootpath); | 1316 | return path + strlen(rootpath); |
| @@ -1318,17 +1319,18 @@ static char *nfsd4_path(struct svc_rqst *rqstp, struct svc_export *exp) | |||
| 1318 | /* | 1319 | /* |
| 1319 | * encode a fs_locations structure | 1320 | * encode a fs_locations structure |
| 1320 | */ | 1321 | */ |
| 1321 | static int nfsd4_encode_fs_locations(struct svc_rqst *rqstp, | 1322 | static __be32 nfsd4_encode_fs_locations(struct svc_rqst *rqstp, |
| 1322 | struct svc_export *exp, | 1323 | struct svc_export *exp, |
| 1323 | u32 **pp, int *buflen) | 1324 | __be32 **pp, int *buflen) |
| 1324 | { | 1325 | { |
| 1325 | int status, i; | 1326 | __be32 status; |
| 1326 | u32 *p = *pp; | 1327 | int i; |
| 1328 | __be32 *p = *pp; | ||
| 1327 | struct nfsd4_fs_locations *fslocs = &exp->ex_fslocs; | 1329 | struct nfsd4_fs_locations *fslocs = &exp->ex_fslocs; |
| 1328 | char *root = nfsd4_path(rqstp, exp); | 1330 | char *root = nfsd4_path(rqstp, exp, &status); |
| 1329 | 1331 | ||
| 1330 | if (IS_ERR(root)) | 1332 | if (status) |
| 1331 | return PTR_ERR(root); | 1333 | return status; |
| 1332 | status = nfsd4_encode_components('/', root, &p, buflen); | 1334 | status = nfsd4_encode_components('/', root, &p, buflen); |
| 1333 | if (status) | 1335 | if (status) |
| 1334 | return status; | 1336 | return status; |
| @@ -1352,9 +1354,9 @@ static u32 nfs4_ftypes[16] = { | |||
| 1352 | NF4SOCK, NF4BAD, NF4LNK, NF4BAD, | 1354 | NF4SOCK, NF4BAD, NF4LNK, NF4BAD, |
| 1353 | }; | 1355 | }; |
| 1354 | 1356 | ||
| 1355 | static int | 1357 | static __be32 |
| 1356 | nfsd4_encode_name(struct svc_rqst *rqstp, int whotype, uid_t id, int group, | 1358 | nfsd4_encode_name(struct svc_rqst *rqstp, int whotype, uid_t id, int group, |
| 1357 | u32 **p, int *buflen) | 1359 | __be32 **p, int *buflen) |
| 1358 | { | 1360 | { |
| 1359 | int status; | 1361 | int status; |
| 1360 | 1362 | ||
| @@ -1374,21 +1376,21 @@ nfsd4_encode_name(struct svc_rqst *rqstp, int whotype, uid_t id, int group, | |||
| 1374 | return 0; | 1376 | return 0; |
| 1375 | } | 1377 | } |
| 1376 | 1378 | ||
| 1377 | static inline int | 1379 | static inline __be32 |
| 1378 | nfsd4_encode_user(struct svc_rqst *rqstp, uid_t uid, u32 **p, int *buflen) | 1380 | nfsd4_encode_user(struct svc_rqst *rqstp, uid_t uid, __be32 **p, int *buflen) |
| 1379 | { | 1381 | { |
| 1380 | return nfsd4_encode_name(rqstp, NFS4_ACL_WHO_NAMED, uid, 0, p, buflen); | 1382 | return nfsd4_encode_name(rqstp, NFS4_ACL_WHO_NAMED, uid, 0, p, buflen); |
| 1381 | } | 1383 | } |
| 1382 | 1384 | ||
| 1383 | static inline int | 1385 | static inline __be32 |
| 1384 | nfsd4_encode_group(struct svc_rqst *rqstp, uid_t gid, u32 **p, int *buflen) | 1386 | nfsd4_encode_group(struct svc_rqst *rqstp, uid_t gid, __be32 **p, int *buflen) |
| 1385 | { | 1387 | { |
| 1386 | return nfsd4_encode_name(rqstp, NFS4_ACL_WHO_NAMED, gid, 1, p, buflen); | 1388 | return nfsd4_encode_name(rqstp, NFS4_ACL_WHO_NAMED, gid, 1, p, buflen); |
| 1387 | } | 1389 | } |
| 1388 | 1390 | ||
| 1389 | static inline int | 1391 | static inline __be32 |
| 1390 | nfsd4_encode_aclname(struct svc_rqst *rqstp, int whotype, uid_t id, int group, | 1392 | nfsd4_encode_aclname(struct svc_rqst *rqstp, int whotype, uid_t id, int group, |
| 1391 | u32 **p, int *buflen) | 1393 | __be32 **p, int *buflen) |
| 1392 | { | 1394 | { |
| 1393 | return nfsd4_encode_name(rqstp, whotype, id, group, p, buflen); | 1395 | return nfsd4_encode_name(rqstp, whotype, id, group, p, buflen); |
| 1394 | } | 1396 | } |
| @@ -1397,7 +1399,7 @@ nfsd4_encode_aclname(struct svc_rqst *rqstp, int whotype, uid_t id, int group, | |||
| 1397 | FATTR4_WORD0_RDATTR_ERROR) | 1399 | FATTR4_WORD0_RDATTR_ERROR) |
| 1398 | #define WORD1_ABSENT_FS_ATTRS FATTR4_WORD1_MOUNTED_ON_FILEID | 1400 | #define WORD1_ABSENT_FS_ATTRS FATTR4_WORD1_MOUNTED_ON_FILEID |
| 1399 | 1401 | ||
| 1400 | static int fattr_handle_absent_fs(u32 *bmval0, u32 *bmval1, u32 *rdattr_err) | 1402 | static __be32 fattr_handle_absent_fs(u32 *bmval0, u32 *bmval1, u32 *rdattr_err) |
| 1401 | { | 1403 | { |
| 1402 | /* As per referral draft: */ | 1404 | /* As per referral draft: */ |
| 1403 | if (*bmval0 & ~WORD0_ABSENT_FS_ATTRS || | 1405 | if (*bmval0 & ~WORD0_ABSENT_FS_ATTRS || |
| @@ -1420,9 +1422,9 @@ static int fattr_handle_absent_fs(u32 *bmval0, u32 *bmval1, u32 *rdattr_err) | |||
| 1420 | * @countp is the buffer size in _words_; upon successful return this becomes | 1422 | * @countp is the buffer size in _words_; upon successful return this becomes |
| 1421 | * replaced with the number of words written. | 1423 | * replaced with the number of words written. |
| 1422 | */ | 1424 | */ |
| 1423 | int | 1425 | __be32 |
| 1424 | nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, | 1426 | nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, |
| 1425 | struct dentry *dentry, u32 *buffer, int *countp, u32 *bmval, | 1427 | struct dentry *dentry, __be32 *buffer, int *countp, u32 *bmval, |
| 1426 | struct svc_rqst *rqstp) | 1428 | struct svc_rqst *rqstp) |
| 1427 | { | 1429 | { |
| 1428 | u32 bmval0 = bmval[0]; | 1430 | u32 bmval0 = bmval[0]; |
| @@ -1431,12 +1433,13 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, | |||
| 1431 | struct svc_fh tempfh; | 1433 | struct svc_fh tempfh; |
| 1432 | struct kstatfs statfs; | 1434 | struct kstatfs statfs; |
| 1433 | int buflen = *countp << 2; | 1435 | int buflen = *countp << 2; |
| 1434 | u32 *attrlenp; | 1436 | __be32 *attrlenp; |
| 1435 | u32 dummy; | 1437 | u32 dummy; |
| 1436 | u64 dummy64; | 1438 | u64 dummy64; |
| 1437 | u32 rdattr_err = 0; | 1439 | u32 rdattr_err = 0; |
| 1438 | u32 *p = buffer; | 1440 | __be32 *p = buffer; |
| 1439 | int status; | 1441 | __be32 status; |
| 1442 | int err; | ||
| 1440 | int aclsupport = 0; | 1443 | int aclsupport = 0; |
| 1441 | struct nfs4_acl *acl = NULL; | 1444 | struct nfs4_acl *acl = NULL; |
| 1442 | 1445 | ||
| @@ -1450,14 +1453,14 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, | |||
| 1450 | goto out; | 1453 | goto out; |
| 1451 | } | 1454 | } |
| 1452 | 1455 | ||
| 1453 | status = vfs_getattr(exp->ex_mnt, dentry, &stat); | 1456 | err = vfs_getattr(exp->ex_mnt, dentry, &stat); |
| 1454 | if (status) | 1457 | if (err) |
| 1455 | goto out_nfserr; | 1458 | goto out_nfserr; |
| 1456 | if ((bmval0 & (FATTR4_WORD0_FILES_FREE | FATTR4_WORD0_FILES_TOTAL)) || | 1459 | if ((bmval0 & (FATTR4_WORD0_FILES_FREE | FATTR4_WORD0_FILES_TOTAL)) || |
| 1457 | (bmval1 & (FATTR4_WORD1_SPACE_AVAIL | FATTR4_WORD1_SPACE_FREE | | 1460 | (bmval1 & (FATTR4_WORD1_SPACE_AVAIL | FATTR4_WORD1_SPACE_FREE | |
| 1458 | FATTR4_WORD1_SPACE_TOTAL))) { | 1461 | FATTR4_WORD1_SPACE_TOTAL))) { |
| 1459 | status = vfs_statfs(dentry, &statfs); | 1462 | err = vfs_statfs(dentry, &statfs); |
| 1460 | if (status) | 1463 | if (err) |
| 1461 | goto out_nfserr; | 1464 | goto out_nfserr; |
| 1462 | } | 1465 | } |
| 1463 | if ((bmval0 & (FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FSID)) && !fhp) { | 1466 | if ((bmval0 & (FATTR4_WORD0_FILEHANDLE | FATTR4_WORD0_FSID)) && !fhp) { |
| @@ -1469,15 +1472,15 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, | |||
| 1469 | } | 1472 | } |
| 1470 | if (bmval0 & (FATTR4_WORD0_ACL | FATTR4_WORD0_ACLSUPPORT | 1473 | if (bmval0 & (FATTR4_WORD0_ACL | FATTR4_WORD0_ACLSUPPORT |
| 1471 | | FATTR4_WORD0_SUPPORTED_ATTRS)) { | 1474 | | FATTR4_WORD0_SUPPORTED_ATTRS)) { |
| 1472 | status = nfsd4_get_nfs4_acl(rqstp, dentry, &acl); | 1475 | err = nfsd4_get_nfs4_acl(rqstp, dentry, &acl); |
| 1473 | aclsupport = (status == 0); | 1476 | aclsupport = (err == 0); |
| 1474 | if (bmval0 & FATTR4_WORD0_ACL) { | 1477 | if (bmval0 & FATTR4_WORD0_ACL) { |
| 1475 | if (status == -EOPNOTSUPP) | 1478 | if (err == -EOPNOTSUPP) |
| 1476 | bmval0 &= ~FATTR4_WORD0_ACL; | 1479 | bmval0 &= ~FATTR4_WORD0_ACL; |
| 1477 | else if (status == -EINVAL) { | 1480 | else if (err == -EINVAL) { |
| 1478 | status = nfserr_attrnotsupp; | 1481 | status = nfserr_attrnotsupp; |
| 1479 | goto out; | 1482 | goto out; |
| 1480 | } else if (status != 0) | 1483 | } else if (err != 0) |
| 1481 | goto out_nfserr; | 1484 | goto out_nfserr; |
| 1482 | } | 1485 | } |
| 1483 | } | 1486 | } |
| @@ -1817,7 +1820,7 @@ out: | |||
| 1817 | fh_put(&tempfh); | 1820 | fh_put(&tempfh); |
| 1818 | return status; | 1821 | return status; |
| 1819 | out_nfserr: | 1822 | out_nfserr: |
| 1820 | status = nfserrno(status); | 1823 | status = nfserrno(err); |
| 1821 | goto out; | 1824 | goto out; |
| 1822 | out_resource: | 1825 | out_resource: |
| 1823 | *countp = 0; | 1826 | *countp = 0; |
| @@ -1828,13 +1831,13 @@ out_serverfault: | |||
| 1828 | goto out; | 1831 | goto out; |
| 1829 | } | 1832 | } |
| 1830 | 1833 | ||
| 1831 | static int | 1834 | static __be32 |
| 1832 | nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, | 1835 | nfsd4_encode_dirent_fattr(struct nfsd4_readdir *cd, |
| 1833 | const char *name, int namlen, u32 *p, int *buflen) | 1836 | const char *name, int namlen, __be32 *p, int *buflen) |
| 1834 | { | 1837 | { |
| 1835 | struct svc_export *exp = cd->rd_fhp->fh_export; | 1838 | struct svc_export *exp = cd->rd_fhp->fh_export; |
| 1836 | struct dentry *dentry; | 1839 | struct dentry *dentry; |
| 1837 | int nfserr; | 1840 | __be32 nfserr; |
| 1838 | 1841 | ||
| 1839 | dentry = lookup_one_len(name, cd->rd_fhp->fh_dentry, namlen); | 1842 | dentry = lookup_one_len(name, cd->rd_fhp->fh_dentry, namlen); |
| 1840 | if (IS_ERR(dentry)) | 1843 | if (IS_ERR(dentry)) |
| @@ -1863,10 +1866,10 @@ out_put: | |||
| 1863 | return nfserr; | 1866 | return nfserr; |
| 1864 | } | 1867 | } |
| 1865 | 1868 | ||
| 1866 | static u32 * | 1869 | static __be32 * |
| 1867 | nfsd4_encode_rdattr_error(u32 *p, int buflen, int nfserr) | 1870 | nfsd4_encode_rdattr_error(__be32 *p, int buflen, __be32 nfserr) |
| 1868 | { | 1871 | { |
| 1869 | u32 *attrlenp; | 1872 | __be32 *attrlenp; |
| 1870 | 1873 | ||
| 1871 | if (buflen < 6) | 1874 | if (buflen < 6) |
| 1872 | return NULL; | 1875 | return NULL; |
| @@ -1886,8 +1889,8 @@ nfsd4_encode_dirent(struct readdir_cd *ccd, const char *name, int namlen, | |||
| 1886 | { | 1889 | { |
| 1887 | struct nfsd4_readdir *cd = container_of(ccd, struct nfsd4_readdir, common); | 1890 | struct nfsd4_readdir *cd = container_of(ccd, struct nfsd4_readdir, common); |
| 1888 | int buflen; | 1891 | int buflen; |
| 1889 | u32 *p = cd->buffer; | 1892 | __be32 *p = cd->buffer; |
| 1890 | int nfserr = nfserr_toosmall; | 1893 | __be32 nfserr = nfserr_toosmall; |
| 1891 | 1894 | ||
| 1892 | /* In nfsv4, "." and ".." never make it onto the wire.. */ | 1895 | /* In nfsv4, "." and ".." never make it onto the wire.. */ |
| 1893 | if (name && isdotent(name, namlen)) { | 1896 | if (name && isdotent(name, namlen)) { |
| @@ -1943,7 +1946,7 @@ fail: | |||
| 1943 | } | 1946 | } |
| 1944 | 1947 | ||
| 1945 | static void | 1948 | static void |
| 1946 | nfsd4_encode_access(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_access *access) | 1949 | nfsd4_encode_access(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_access *access) |
| 1947 | { | 1950 | { |
| 1948 | ENCODE_HEAD; | 1951 | ENCODE_HEAD; |
| 1949 | 1952 | ||
| @@ -1956,7 +1959,7 @@ nfsd4_encode_access(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_acc | |||
| 1956 | } | 1959 | } |
| 1957 | 1960 | ||
| 1958 | static void | 1961 | static void |
| 1959 | nfsd4_encode_close(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_close *close) | 1962 | nfsd4_encode_close(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_close *close) |
| 1960 | { | 1963 | { |
| 1961 | ENCODE_SEQID_OP_HEAD; | 1964 | ENCODE_SEQID_OP_HEAD; |
| 1962 | 1965 | ||
| @@ -1971,7 +1974,7 @@ nfsd4_encode_close(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_clos | |||
| 1971 | 1974 | ||
| 1972 | 1975 | ||
| 1973 | static void | 1976 | static void |
| 1974 | nfsd4_encode_commit(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_commit *commit) | 1977 | nfsd4_encode_commit(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_commit *commit) |
| 1975 | { | 1978 | { |
| 1976 | ENCODE_HEAD; | 1979 | ENCODE_HEAD; |
| 1977 | 1980 | ||
| @@ -1983,7 +1986,7 @@ nfsd4_encode_commit(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_com | |||
| 1983 | } | 1986 | } |
| 1984 | 1987 | ||
| 1985 | static void | 1988 | static void |
| 1986 | nfsd4_encode_create(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_create *create) | 1989 | nfsd4_encode_create(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_create *create) |
| 1987 | { | 1990 | { |
| 1988 | ENCODE_HEAD; | 1991 | ENCODE_HEAD; |
| 1989 | 1992 | ||
| @@ -1997,8 +2000,8 @@ nfsd4_encode_create(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_cre | |||
| 1997 | } | 2000 | } |
| 1998 | } | 2001 | } |
| 1999 | 2002 | ||
| 2000 | static int | 2003 | static __be32 |
| 2001 | nfsd4_encode_getattr(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_getattr *getattr) | 2004 | nfsd4_encode_getattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_getattr *getattr) |
| 2002 | { | 2005 | { |
| 2003 | struct svc_fh *fhp = getattr->ga_fhp; | 2006 | struct svc_fh *fhp = getattr->ga_fhp; |
| 2004 | int buflen; | 2007 | int buflen; |
| @@ -2016,7 +2019,7 @@ nfsd4_encode_getattr(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_ge | |||
| 2016 | } | 2019 | } |
| 2017 | 2020 | ||
| 2018 | static void | 2021 | static void |
| 2019 | nfsd4_encode_getfh(struct nfsd4_compoundres *resp, int nfserr, struct svc_fh *fhp) | 2022 | nfsd4_encode_getfh(struct nfsd4_compoundres *resp, __be32 nfserr, struct svc_fh *fhp) |
| 2020 | { | 2023 | { |
| 2021 | unsigned int len; | 2024 | unsigned int len; |
| 2022 | ENCODE_HEAD; | 2025 | ENCODE_HEAD; |
| @@ -2056,7 +2059,7 @@ nfsd4_encode_lock_denied(struct nfsd4_compoundres *resp, struct nfsd4_lock_denie | |||
| 2056 | } | 2059 | } |
| 2057 | 2060 | ||
| 2058 | static void | 2061 | static void |
| 2059 | nfsd4_encode_lock(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_lock *lock) | 2062 | nfsd4_encode_lock(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_lock *lock) |
| 2060 | { | 2063 | { |
| 2061 | ENCODE_SEQID_OP_HEAD; | 2064 | ENCODE_SEQID_OP_HEAD; |
| 2062 | 2065 | ||
| @@ -2072,14 +2075,14 @@ nfsd4_encode_lock(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_lock | |||
| 2072 | } | 2075 | } |
| 2073 | 2076 | ||
| 2074 | static void | 2077 | static void |
| 2075 | nfsd4_encode_lockt(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_lockt *lockt) | 2078 | nfsd4_encode_lockt(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_lockt *lockt) |
| 2076 | { | 2079 | { |
| 2077 | if (nfserr == nfserr_denied) | 2080 | if (nfserr == nfserr_denied) |
| 2078 | nfsd4_encode_lock_denied(resp, &lockt->lt_denied); | 2081 | nfsd4_encode_lock_denied(resp, &lockt->lt_denied); |
| 2079 | } | 2082 | } |
| 2080 | 2083 | ||
| 2081 | static void | 2084 | static void |
| 2082 | nfsd4_encode_locku(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_locku *locku) | 2085 | nfsd4_encode_locku(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_locku *locku) |
| 2083 | { | 2086 | { |
| 2084 | ENCODE_SEQID_OP_HEAD; | 2087 | ENCODE_SEQID_OP_HEAD; |
| 2085 | 2088 | ||
| @@ -2095,7 +2098,7 @@ nfsd4_encode_locku(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_lock | |||
| 2095 | 2098 | ||
| 2096 | 2099 | ||
| 2097 | static void | 2100 | static void |
| 2098 | nfsd4_encode_link(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_link *link) | 2101 | nfsd4_encode_link(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_link *link) |
| 2099 | { | 2102 | { |
| 2100 | ENCODE_HEAD; | 2103 | ENCODE_HEAD; |
| 2101 | 2104 | ||
| @@ -2108,7 +2111,7 @@ nfsd4_encode_link(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_link | |||
| 2108 | 2111 | ||
| 2109 | 2112 | ||
| 2110 | static void | 2113 | static void |
| 2111 | nfsd4_encode_open(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_open *open) | 2114 | nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open *open) |
| 2112 | { | 2115 | { |
| 2113 | ENCODE_SEQID_OP_HEAD; | 2116 | ENCODE_SEQID_OP_HEAD; |
| 2114 | 2117 | ||
| @@ -2173,7 +2176,7 @@ out: | |||
| 2173 | } | 2176 | } |
| 2174 | 2177 | ||
| 2175 | static void | 2178 | static void |
| 2176 | nfsd4_encode_open_confirm(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_open_confirm *oc) | 2179 | nfsd4_encode_open_confirm(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open_confirm *oc) |
| 2177 | { | 2180 | { |
| 2178 | ENCODE_SEQID_OP_HEAD; | 2181 | ENCODE_SEQID_OP_HEAD; |
| 2179 | 2182 | ||
| @@ -2188,7 +2191,7 @@ nfsd4_encode_open_confirm(struct nfsd4_compoundres *resp, int nfserr, struct nfs | |||
| 2188 | } | 2191 | } |
| 2189 | 2192 | ||
| 2190 | static void | 2193 | static void |
| 2191 | nfsd4_encode_open_downgrade(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_open_downgrade *od) | 2194 | nfsd4_encode_open_downgrade(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open_downgrade *od) |
| 2192 | { | 2195 | { |
| 2193 | ENCODE_SEQID_OP_HEAD; | 2196 | ENCODE_SEQID_OP_HEAD; |
| 2194 | 2197 | ||
| @@ -2202,8 +2205,8 @@ nfsd4_encode_open_downgrade(struct nfsd4_compoundres *resp, int nfserr, struct n | |||
| 2202 | ENCODE_SEQID_OP_TAIL(od->od_stateowner); | 2205 | ENCODE_SEQID_OP_TAIL(od->od_stateowner); |
| 2203 | } | 2206 | } |
| 2204 | 2207 | ||
| 2205 | static int | 2208 | static __be32 |
| 2206 | nfsd4_encode_read(struct nfsd4_compoundres *resp, int nfserr, | 2209 | nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, |
| 2207 | struct nfsd4_read *read) | 2210 | struct nfsd4_read *read) |
| 2208 | { | 2211 | { |
| 2209 | u32 eof; | 2212 | u32 eof; |
| @@ -2267,8 +2270,8 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, int nfserr, | |||
| 2267 | return 0; | 2270 | return 0; |
| 2268 | } | 2271 | } |
| 2269 | 2272 | ||
| 2270 | static int | 2273 | static __be32 |
| 2271 | nfsd4_encode_readlink(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_readlink *readlink) | 2274 | nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_readlink *readlink) |
| 2272 | { | 2275 | { |
| 2273 | int maxcount; | 2276 | int maxcount; |
| 2274 | char *page; | 2277 | char *page; |
| @@ -2315,12 +2318,12 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_r | |||
| 2315 | return 0; | 2318 | return 0; |
| 2316 | } | 2319 | } |
| 2317 | 2320 | ||
| 2318 | static int | 2321 | static __be32 |
| 2319 | nfsd4_encode_readdir(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_readdir *readdir) | 2322 | nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_readdir *readdir) |
| 2320 | { | 2323 | { |
| 2321 | int maxcount; | 2324 | int maxcount; |
| 2322 | loff_t offset; | 2325 | loff_t offset; |
| 2323 | u32 *page, *savep, *tailbase; | 2326 | __be32 *page, *savep, *tailbase; |
| 2324 | ENCODE_HEAD; | 2327 | ENCODE_HEAD; |
| 2325 | 2328 | ||
| 2326 | if (nfserr) | 2329 | if (nfserr) |
| @@ -2395,7 +2398,7 @@ err_no_verf: | |||
| 2395 | } | 2398 | } |
| 2396 | 2399 | ||
| 2397 | static void | 2400 | static void |
| 2398 | nfsd4_encode_remove(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_remove *remove) | 2401 | nfsd4_encode_remove(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_remove *remove) |
| 2399 | { | 2402 | { |
| 2400 | ENCODE_HEAD; | 2403 | ENCODE_HEAD; |
| 2401 | 2404 | ||
| @@ -2407,7 +2410,7 @@ nfsd4_encode_remove(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_rem | |||
| 2407 | } | 2410 | } |
| 2408 | 2411 | ||
| 2409 | static void | 2412 | static void |
| 2410 | nfsd4_encode_rename(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_rename *rename) | 2413 | nfsd4_encode_rename(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_rename *rename) |
| 2411 | { | 2414 | { |
| 2412 | ENCODE_HEAD; | 2415 | ENCODE_HEAD; |
| 2413 | 2416 | ||
| @@ -2424,7 +2427,7 @@ nfsd4_encode_rename(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_ren | |||
| 2424 | * regardless of the error status. | 2427 | * regardless of the error status. |
| 2425 | */ | 2428 | */ |
| 2426 | static void | 2429 | static void |
| 2427 | nfsd4_encode_setattr(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_setattr *setattr) | 2430 | nfsd4_encode_setattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_setattr *setattr) |
| 2428 | { | 2431 | { |
| 2429 | ENCODE_HEAD; | 2432 | ENCODE_HEAD; |
| 2430 | 2433 | ||
| @@ -2443,7 +2446,7 @@ nfsd4_encode_setattr(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_se | |||
| 2443 | } | 2446 | } |
| 2444 | 2447 | ||
| 2445 | static void | 2448 | static void |
| 2446 | nfsd4_encode_setclientid(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_setclientid *scd) | 2449 | nfsd4_encode_setclientid(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_setclientid *scd) |
| 2447 | { | 2450 | { |
| 2448 | ENCODE_HEAD; | 2451 | ENCODE_HEAD; |
| 2449 | 2452 | ||
| @@ -2462,7 +2465,7 @@ nfsd4_encode_setclientid(struct nfsd4_compoundres *resp, int nfserr, struct nfsd | |||
| 2462 | } | 2465 | } |
| 2463 | 2466 | ||
| 2464 | static void | 2467 | static void |
| 2465 | nfsd4_encode_write(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_write *write) | 2468 | nfsd4_encode_write(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_write *write) |
| 2466 | { | 2469 | { |
| 2467 | ENCODE_HEAD; | 2470 | ENCODE_HEAD; |
| 2468 | 2471 | ||
| @@ -2478,7 +2481,7 @@ nfsd4_encode_write(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_writ | |||
| 2478 | void | 2481 | void |
| 2479 | nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op) | 2482 | nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op) |
| 2480 | { | 2483 | { |
| 2481 | u32 *statp; | 2484 | __be32 *statp; |
| 2482 | ENCODE_HEAD; | 2485 | ENCODE_HEAD; |
| 2483 | 2486 | ||
| 2484 | RESERVE_SPACE(8); | 2487 | RESERVE_SPACE(8); |
| @@ -2616,7 +2619,7 @@ nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op) | |||
| 2616 | */ | 2619 | */ |
| 2617 | 2620 | ||
| 2618 | int | 2621 | int |
| 2619 | nfs4svc_encode_voidres(struct svc_rqst *rqstp, u32 *p, void *dummy) | 2622 | nfs4svc_encode_voidres(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
| 2620 | { | 2623 | { |
| 2621 | return xdr_ressize_check(rqstp, p); | 2624 | return xdr_ressize_check(rqstp, p); |
| 2622 | } | 2625 | } |
| @@ -2638,9 +2641,9 @@ void nfsd4_release_compoundargs(struct nfsd4_compoundargs *args) | |||
| 2638 | } | 2641 | } |
| 2639 | 2642 | ||
| 2640 | int | 2643 | int |
| 2641 | nfs4svc_decode_compoundargs(struct svc_rqst *rqstp, u32 *p, struct nfsd4_compoundargs *args) | 2644 | nfs4svc_decode_compoundargs(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compoundargs *args) |
| 2642 | { | 2645 | { |
| 2643 | int status; | 2646 | __be32 status; |
| 2644 | 2647 | ||
| 2645 | args->p = p; | 2648 | args->p = p; |
| 2646 | args->end = rqstp->rq_arg.head[0].iov_base + rqstp->rq_arg.head[0].iov_len; | 2649 | args->end = rqstp->rq_arg.head[0].iov_base + rqstp->rq_arg.head[0].iov_len; |
| @@ -2659,7 +2662,7 @@ nfs4svc_decode_compoundargs(struct svc_rqst *rqstp, u32 *p, struct nfsd4_compoun | |||
| 2659 | } | 2662 | } |
| 2660 | 2663 | ||
| 2661 | int | 2664 | int |
| 2662 | nfs4svc_encode_compoundres(struct svc_rqst *rqstp, u32 *p, struct nfsd4_compoundres *resp) | 2665 | nfs4svc_encode_compoundres(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_compoundres *resp) |
| 2663 | { | 2666 | { |
| 2664 | /* | 2667 | /* |
| 2665 | * All that remains is to write the tag and operation count... | 2668 | * All that remains is to write the tag and operation count... |
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index fdf7cf3dfadc..6100bbe27432 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | */ | 29 | */ |
| 30 | #define CACHESIZE 1024 | 30 | #define CACHESIZE 1024 |
| 31 | #define HASHSIZE 64 | 31 | #define HASHSIZE 64 |
| 32 | #define REQHASH(xid) ((((xid) >> 24) ^ (xid)) & (HASHSIZE-1)) | 32 | #define REQHASH(xid) (((((__force __u32)xid) >> 24) ^ ((__force __u32)xid)) & (HASHSIZE-1)) |
| 33 | 33 | ||
| 34 | static struct hlist_head * hash_list; | 34 | static struct hlist_head * hash_list; |
| 35 | static struct list_head lru_head; | 35 | static struct list_head lru_head; |
| @@ -127,8 +127,8 @@ nfsd_cache_lookup(struct svc_rqst *rqstp, int type) | |||
| 127 | struct hlist_node *hn; | 127 | struct hlist_node *hn; |
| 128 | struct hlist_head *rh; | 128 | struct hlist_head *rh; |
| 129 | struct svc_cacherep *rp; | 129 | struct svc_cacherep *rp; |
| 130 | u32 xid = rqstp->rq_xid, | 130 | __be32 xid = rqstp->rq_xid; |
| 131 | proto = rqstp->rq_prot, | 131 | u32 proto = rqstp->rq_prot, |
| 132 | vers = rqstp->rq_vers, | 132 | vers = rqstp->rq_vers, |
| 133 | proc = rqstp->rq_proc; | 133 | proc = rqstp->rq_proc; |
| 134 | unsigned long age; | 134 | unsigned long age; |
| @@ -258,7 +258,7 @@ found_entry: | |||
| 258 | * In this case, nfsd_cache_update is called with statp == NULL. | 258 | * In this case, nfsd_cache_update is called with statp == NULL. |
| 259 | */ | 259 | */ |
| 260 | void | 260 | void |
| 261 | nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, u32 *statp) | 261 | nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp) |
| 262 | { | 262 | { |
| 263 | struct svc_cacherep *rp; | 263 | struct svc_cacherep *rp; |
| 264 | struct kvec *resv = &rqstp->rq_res.head[0], *cachv; | 264 | struct kvec *resv = &rqstp->rq_res.head[0], *cachv; |
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 501d83884530..727ab3bd450d 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c | |||
| @@ -76,7 +76,7 @@ static int nfsd_acceptable(void *expv, struct dentry *dentry) | |||
| 76 | * comment in the NFSv3 spec says this is incorrect (implementation notes for | 76 | * comment in the NFSv3 spec says this is incorrect (implementation notes for |
| 77 | * the write call). | 77 | * the write call). |
| 78 | */ | 78 | */ |
| 79 | static inline int | 79 | static inline __be32 |
| 80 | nfsd_mode_check(struct svc_rqst *rqstp, umode_t mode, int type) | 80 | nfsd_mode_check(struct svc_rqst *rqstp, umode_t mode, int type) |
| 81 | { | 81 | { |
| 82 | /* Type can be negative when creating hardlinks - not to a dir */ | 82 | /* Type can be negative when creating hardlinks - not to a dir */ |
| @@ -110,13 +110,13 @@ nfsd_mode_check(struct svc_rqst *rqstp, umode_t mode, int type) | |||
| 110 | * This is only called at the start of an nfsproc call, so fhp points to | 110 | * This is only called at the start of an nfsproc call, so fhp points to |
| 111 | * a svc_fh which is all 0 except for the over-the-wire file handle. | 111 | * a svc_fh which is all 0 except for the over-the-wire file handle. |
| 112 | */ | 112 | */ |
| 113 | u32 | 113 | __be32 |
| 114 | fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) | 114 | fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) |
| 115 | { | 115 | { |
| 116 | struct knfsd_fh *fh = &fhp->fh_handle; | 116 | struct knfsd_fh *fh = &fhp->fh_handle; |
| 117 | struct svc_export *exp = NULL; | 117 | struct svc_export *exp = NULL; |
| 118 | struct dentry *dentry; | 118 | struct dentry *dentry; |
| 119 | u32 error = 0; | 119 | __be32 error = 0; |
| 120 | 120 | ||
| 121 | dprintk("nfsd: fh_verify(%s)\n", SVCFH_fmt(fhp)); | 121 | dprintk("nfsd: fh_verify(%s)\n", SVCFH_fmt(fhp)); |
| 122 | 122 | ||
| @@ -315,7 +315,7 @@ static inline void _fh_update_old(struct dentry *dentry, | |||
| 315 | fh->ofh_dirino = 0; | 315 | fh->ofh_dirino = 0; |
| 316 | } | 316 | } |
| 317 | 317 | ||
| 318 | int | 318 | __be32 |
| 319 | fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, struct svc_fh *ref_fh) | 319 | fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, struct svc_fh *ref_fh) |
| 320 | { | 320 | { |
| 321 | /* ref_fh is a reference file handle. | 321 | /* ref_fh is a reference file handle. |
| @@ -451,7 +451,7 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, st | |||
| 451 | * Update file handle information after changing a dentry. | 451 | * Update file handle information after changing a dentry. |
| 452 | * This is only called by nfsd_create, nfsd_create_v3 and nfsd_proc_create | 452 | * This is only called by nfsd_create, nfsd_create_v3 and nfsd_proc_create |
| 453 | */ | 453 | */ |
| 454 | int | 454 | __be32 |
| 455 | fh_update(struct svc_fh *fhp) | 455 | fh_update(struct svc_fh *fhp) |
| 456 | { | 456 | { |
| 457 | struct dentry *dentry; | 457 | struct dentry *dentry; |
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 9ee1dab5d44a..ec983b777680 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c | |||
| @@ -30,22 +30,22 @@ typedef struct svc_buf svc_buf; | |||
| 30 | #define NFSDDBG_FACILITY NFSDDBG_PROC | 30 | #define NFSDDBG_FACILITY NFSDDBG_PROC |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | static int | 33 | static __be32 |
| 34 | nfsd_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | 34 | nfsd_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) |
| 35 | { | 35 | { |
| 36 | return nfs_ok; | 36 | return nfs_ok; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | static int | 39 | static __be32 |
| 40 | nfsd_return_attrs(int err, struct nfsd_attrstat *resp) | 40 | nfsd_return_attrs(__be32 err, struct nfsd_attrstat *resp) |
| 41 | { | 41 | { |
| 42 | if (err) return err; | 42 | if (err) return err; |
| 43 | return nfserrno(vfs_getattr(resp->fh.fh_export->ex_mnt, | 43 | return nfserrno(vfs_getattr(resp->fh.fh_export->ex_mnt, |
| 44 | resp->fh.fh_dentry, | 44 | resp->fh.fh_dentry, |
| 45 | &resp->stat)); | 45 | &resp->stat)); |
| 46 | } | 46 | } |
| 47 | static int | 47 | static __be32 |
| 48 | nfsd_return_dirop(int err, struct nfsd_diropres *resp) | 48 | nfsd_return_dirop(__be32 err, struct nfsd_diropres *resp) |
| 49 | { | 49 | { |
| 50 | if (err) return err; | 50 | if (err) return err; |
| 51 | return nfserrno(vfs_getattr(resp->fh.fh_export->ex_mnt, | 51 | return nfserrno(vfs_getattr(resp->fh.fh_export->ex_mnt, |
| @@ -56,11 +56,11 @@ nfsd_return_dirop(int err, struct nfsd_diropres *resp) | |||
| 56 | * Get a file's attributes | 56 | * Get a file's attributes |
| 57 | * N.B. After this call resp->fh needs an fh_put | 57 | * N.B. After this call resp->fh needs an fh_put |
| 58 | */ | 58 | */ |
| 59 | static int | 59 | static __be32 |
| 60 | nfsd_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, | 60 | nfsd_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, |
| 61 | struct nfsd_attrstat *resp) | 61 | struct nfsd_attrstat *resp) |
| 62 | { | 62 | { |
| 63 | int nfserr; | 63 | __be32 nfserr; |
| 64 | dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); | 64 | dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); |
| 65 | 65 | ||
| 66 | fh_copy(&resp->fh, &argp->fh); | 66 | fh_copy(&resp->fh, &argp->fh); |
| @@ -72,11 +72,11 @@ nfsd_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, | |||
| 72 | * Set a file's attributes | 72 | * Set a file's attributes |
| 73 | * N.B. After this call resp->fh needs an fh_put | 73 | * N.B. After this call resp->fh needs an fh_put |
| 74 | */ | 74 | */ |
| 75 | static int | 75 | static __be32 |
| 76 | nfsd_proc_setattr(struct svc_rqst *rqstp, struct nfsd_sattrargs *argp, | 76 | nfsd_proc_setattr(struct svc_rqst *rqstp, struct nfsd_sattrargs *argp, |
| 77 | struct nfsd_attrstat *resp) | 77 | struct nfsd_attrstat *resp) |
| 78 | { | 78 | { |
| 79 | int nfserr; | 79 | __be32 nfserr; |
| 80 | dprintk("nfsd: SETATTR %s, valid=%x, size=%ld\n", | 80 | dprintk("nfsd: SETATTR %s, valid=%x, size=%ld\n", |
| 81 | SVCFH_fmt(&argp->fh), | 81 | SVCFH_fmt(&argp->fh), |
| 82 | argp->attrs.ia_valid, (long) argp->attrs.ia_size); | 82 | argp->attrs.ia_valid, (long) argp->attrs.ia_size); |
| @@ -92,11 +92,11 @@ nfsd_proc_setattr(struct svc_rqst *rqstp, struct nfsd_sattrargs *argp, | |||
| 92 | * doesn't exist yet. | 92 | * doesn't exist yet. |
| 93 | * N.B. After this call resp->fh needs an fh_put | 93 | * N.B. After this call resp->fh needs an fh_put |
| 94 | */ | 94 | */ |
| 95 | static int | 95 | static __be32 |
| 96 | nfsd_proc_lookup(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | 96 | nfsd_proc_lookup(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, |
| 97 | struct nfsd_diropres *resp) | 97 | struct nfsd_diropres *resp) |
| 98 | { | 98 | { |
| 99 | int nfserr; | 99 | __be32 nfserr; |
| 100 | 100 | ||
| 101 | dprintk("nfsd: LOOKUP %s %.*s\n", | 101 | dprintk("nfsd: LOOKUP %s %.*s\n", |
| 102 | SVCFH_fmt(&argp->fh), argp->len, argp->name); | 102 | SVCFH_fmt(&argp->fh), argp->len, argp->name); |
| @@ -112,11 +112,11 @@ nfsd_proc_lookup(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | |||
| 112 | /* | 112 | /* |
| 113 | * Read a symlink. | 113 | * Read a symlink. |
| 114 | */ | 114 | */ |
| 115 | static int | 115 | static __be32 |
| 116 | nfsd_proc_readlink(struct svc_rqst *rqstp, struct nfsd_readlinkargs *argp, | 116 | nfsd_proc_readlink(struct svc_rqst *rqstp, struct nfsd_readlinkargs *argp, |
| 117 | struct nfsd_readlinkres *resp) | 117 | struct nfsd_readlinkres *resp) |
| 118 | { | 118 | { |
| 119 | int nfserr; | 119 | __be32 nfserr; |
| 120 | 120 | ||
| 121 | dprintk("nfsd: READLINK %s\n", SVCFH_fmt(&argp->fh)); | 121 | dprintk("nfsd: READLINK %s\n", SVCFH_fmt(&argp->fh)); |
| 122 | 122 | ||
| @@ -132,11 +132,11 @@ nfsd_proc_readlink(struct svc_rqst *rqstp, struct nfsd_readlinkargs *argp, | |||
| 132 | * Read a portion of a file. | 132 | * Read a portion of a file. |
| 133 | * N.B. After this call resp->fh needs an fh_put | 133 | * N.B. After this call resp->fh needs an fh_put |
| 134 | */ | 134 | */ |
| 135 | static int | 135 | static __be32 |
| 136 | nfsd_proc_read(struct svc_rqst *rqstp, struct nfsd_readargs *argp, | 136 | nfsd_proc_read(struct svc_rqst *rqstp, struct nfsd_readargs *argp, |
| 137 | struct nfsd_readres *resp) | 137 | struct nfsd_readres *resp) |
| 138 | { | 138 | { |
| 139 | int nfserr; | 139 | __be32 nfserr; |
| 140 | 140 | ||
| 141 | dprintk("nfsd: READ %s %d bytes at %d\n", | 141 | dprintk("nfsd: READ %s %d bytes at %d\n", |
| 142 | SVCFH_fmt(&argp->fh), | 142 | SVCFH_fmt(&argp->fh), |
| @@ -172,11 +172,11 @@ nfsd_proc_read(struct svc_rqst *rqstp, struct nfsd_readargs *argp, | |||
| 172 | * Write data to a file | 172 | * Write data to a file |
| 173 | * N.B. After this call resp->fh needs an fh_put | 173 | * N.B. After this call resp->fh needs an fh_put |
| 174 | */ | 174 | */ |
| 175 | static int | 175 | static __be32 |
| 176 | nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp, | 176 | nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp, |
| 177 | struct nfsd_attrstat *resp) | 177 | struct nfsd_attrstat *resp) |
| 178 | { | 178 | { |
| 179 | int nfserr; | 179 | __be32 nfserr; |
| 180 | int stable = 1; | 180 | int stable = 1; |
| 181 | 181 | ||
| 182 | dprintk("nfsd: WRITE %s %d bytes at %d\n", | 182 | dprintk("nfsd: WRITE %s %d bytes at %d\n", |
| @@ -197,7 +197,7 @@ nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp, | |||
| 197 | * and the actual create() call in compliance with VFS protocols. | 197 | * and the actual create() call in compliance with VFS protocols. |
| 198 | * N.B. After this call _both_ argp->fh and resp->fh need an fh_put | 198 | * N.B. After this call _both_ argp->fh and resp->fh need an fh_put |
| 199 | */ | 199 | */ |
| 200 | static int | 200 | static __be32 |
| 201 | nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | 201 | nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, |
| 202 | struct nfsd_diropres *resp) | 202 | struct nfsd_diropres *resp) |
| 203 | { | 203 | { |
| @@ -206,7 +206,8 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | |||
| 206 | struct iattr *attr = &argp->attrs; | 206 | struct iattr *attr = &argp->attrs; |
| 207 | struct inode *inode; | 207 | struct inode *inode; |
| 208 | struct dentry *dchild; | 208 | struct dentry *dchild; |
| 209 | int nfserr, type, mode; | 209 | int type, mode; |
| 210 | __be32 nfserr; | ||
| 210 | dev_t rdev = 0, wanted = new_decode_dev(attr->ia_size); | 211 | dev_t rdev = 0, wanted = new_decode_dev(attr->ia_size); |
| 211 | 212 | ||
| 212 | dprintk("nfsd: CREATE %s %.*s\n", | 213 | dprintk("nfsd: CREATE %s %.*s\n", |
| @@ -348,11 +349,11 @@ done: | |||
| 348 | return nfsd_return_dirop(nfserr, resp); | 349 | return nfsd_return_dirop(nfserr, resp); |
| 349 | } | 350 | } |
| 350 | 351 | ||
| 351 | static int | 352 | static __be32 |
| 352 | nfsd_proc_remove(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | 353 | nfsd_proc_remove(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, |
| 353 | void *resp) | 354 | void *resp) |
| 354 | { | 355 | { |
| 355 | int nfserr; | 356 | __be32 nfserr; |
| 356 | 357 | ||
| 357 | dprintk("nfsd: REMOVE %s %.*s\n", SVCFH_fmt(&argp->fh), | 358 | dprintk("nfsd: REMOVE %s %.*s\n", SVCFH_fmt(&argp->fh), |
| 358 | argp->len, argp->name); | 359 | argp->len, argp->name); |
| @@ -363,11 +364,11 @@ nfsd_proc_remove(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | |||
| 363 | return nfserr; | 364 | return nfserr; |
| 364 | } | 365 | } |
| 365 | 366 | ||
| 366 | static int | 367 | static __be32 |
| 367 | nfsd_proc_rename(struct svc_rqst *rqstp, struct nfsd_renameargs *argp, | 368 | nfsd_proc_rename(struct svc_rqst *rqstp, struct nfsd_renameargs *argp, |
| 368 | void *resp) | 369 | void *resp) |
| 369 | { | 370 | { |
| 370 | int nfserr; | 371 | __be32 nfserr; |
| 371 | 372 | ||
| 372 | dprintk("nfsd: RENAME %s %.*s -> \n", | 373 | dprintk("nfsd: RENAME %s %.*s -> \n", |
| 373 | SVCFH_fmt(&argp->ffh), argp->flen, argp->fname); | 374 | SVCFH_fmt(&argp->ffh), argp->flen, argp->fname); |
| @@ -381,11 +382,11 @@ nfsd_proc_rename(struct svc_rqst *rqstp, struct nfsd_renameargs *argp, | |||
| 381 | return nfserr; | 382 | return nfserr; |
| 382 | } | 383 | } |
| 383 | 384 | ||
| 384 | static int | 385 | static __be32 |
| 385 | nfsd_proc_link(struct svc_rqst *rqstp, struct nfsd_linkargs *argp, | 386 | nfsd_proc_link(struct svc_rqst *rqstp, struct nfsd_linkargs *argp, |
| 386 | void *resp) | 387 | void *resp) |
| 387 | { | 388 | { |
| 388 | int nfserr; | 389 | __be32 nfserr; |
| 389 | 390 | ||
| 390 | dprintk("nfsd: LINK %s ->\n", | 391 | dprintk("nfsd: LINK %s ->\n", |
| 391 | SVCFH_fmt(&argp->ffh)); | 392 | SVCFH_fmt(&argp->ffh)); |
| @@ -401,12 +402,12 @@ nfsd_proc_link(struct svc_rqst *rqstp, struct nfsd_linkargs *argp, | |||
| 401 | return nfserr; | 402 | return nfserr; |
| 402 | } | 403 | } |
| 403 | 404 | ||
| 404 | static int | 405 | static __be32 |
| 405 | nfsd_proc_symlink(struct svc_rqst *rqstp, struct nfsd_symlinkargs *argp, | 406 | nfsd_proc_symlink(struct svc_rqst *rqstp, struct nfsd_symlinkargs *argp, |
| 406 | void *resp) | 407 | void *resp) |
| 407 | { | 408 | { |
| 408 | struct svc_fh newfh; | 409 | struct svc_fh newfh; |
| 409 | int nfserr; | 410 | __be32 nfserr; |
| 410 | 411 | ||
| 411 | dprintk("nfsd: SYMLINK %s %.*s -> %.*s\n", | 412 | dprintk("nfsd: SYMLINK %s %.*s -> %.*s\n", |
| 412 | SVCFH_fmt(&argp->ffh), argp->flen, argp->fname, | 413 | SVCFH_fmt(&argp->ffh), argp->flen, argp->fname, |
| @@ -430,11 +431,11 @@ nfsd_proc_symlink(struct svc_rqst *rqstp, struct nfsd_symlinkargs *argp, | |||
| 430 | * Make directory. This operation is not idempotent. | 431 | * Make directory. This operation is not idempotent. |
| 431 | * N.B. After this call resp->fh needs an fh_put | 432 | * N.B. After this call resp->fh needs an fh_put |
| 432 | */ | 433 | */ |
| 433 | static int | 434 | static __be32 |
| 434 | nfsd_proc_mkdir(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | 435 | nfsd_proc_mkdir(struct svc_rqst *rqstp, struct nfsd_createargs *argp, |
| 435 | struct nfsd_diropres *resp) | 436 | struct nfsd_diropres *resp) |
| 436 | { | 437 | { |
| 437 | int nfserr; | 438 | __be32 nfserr; |
| 438 | 439 | ||
| 439 | dprintk("nfsd: MKDIR %s %.*s\n", SVCFH_fmt(&argp->fh), argp->len, argp->name); | 440 | dprintk("nfsd: MKDIR %s %.*s\n", SVCFH_fmt(&argp->fh), argp->len, argp->name); |
| 440 | 441 | ||
| @@ -454,11 +455,11 @@ nfsd_proc_mkdir(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | |||
| 454 | /* | 455 | /* |
| 455 | * Remove a directory | 456 | * Remove a directory |
| 456 | */ | 457 | */ |
| 457 | static int | 458 | static __be32 |
| 458 | nfsd_proc_rmdir(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | 459 | nfsd_proc_rmdir(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, |
| 459 | void *resp) | 460 | void *resp) |
| 460 | { | 461 | { |
| 461 | int nfserr; | 462 | __be32 nfserr; |
| 462 | 463 | ||
| 463 | dprintk("nfsd: RMDIR %s %.*s\n", SVCFH_fmt(&argp->fh), argp->len, argp->name); | 464 | dprintk("nfsd: RMDIR %s %.*s\n", SVCFH_fmt(&argp->fh), argp->len, argp->name); |
| 464 | 465 | ||
| @@ -470,11 +471,12 @@ nfsd_proc_rmdir(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | |||
| 470 | /* | 471 | /* |
| 471 | * Read a portion of a directory. | 472 | * Read a portion of a directory. |
| 472 | */ | 473 | */ |
| 473 | static int | 474 | static __be32 |
| 474 | nfsd_proc_readdir(struct svc_rqst *rqstp, struct nfsd_readdirargs *argp, | 475 | nfsd_proc_readdir(struct svc_rqst *rqstp, struct nfsd_readdirargs *argp, |
| 475 | struct nfsd_readdirres *resp) | 476 | struct nfsd_readdirres *resp) |
| 476 | { | 477 | { |
| 477 | int nfserr, count; | 478 | int count; |
| 479 | __be32 nfserr; | ||
| 478 | loff_t offset; | 480 | loff_t offset; |
| 479 | 481 | ||
| 480 | dprintk("nfsd: READDIR %s %d bytes at %d\n", | 482 | dprintk("nfsd: READDIR %s %d bytes at %d\n", |
| @@ -509,11 +511,11 @@ nfsd_proc_readdir(struct svc_rqst *rqstp, struct nfsd_readdirargs *argp, | |||
| 509 | /* | 511 | /* |
| 510 | * Get file system info | 512 | * Get file system info |
| 511 | */ | 513 | */ |
| 512 | static int | 514 | static __be32 |
| 513 | nfsd_proc_statfs(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | 515 | nfsd_proc_statfs(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, |
| 514 | struct nfsd_statfsres *resp) | 516 | struct nfsd_statfsres *resp) |
| 515 | { | 517 | { |
| 516 | int nfserr; | 518 | __be32 nfserr; |
| 517 | 519 | ||
| 518 | dprintk("nfsd: STATFS %s\n", SVCFH_fmt(&argp->fh)); | 520 | dprintk("nfsd: STATFS %s\n", SVCFH_fmt(&argp->fh)); |
| 519 | 521 | ||
| @@ -579,11 +581,11 @@ struct svc_version nfsd_version2 = { | |||
| 579 | /* | 581 | /* |
| 580 | * Map errnos to NFS errnos. | 582 | * Map errnos to NFS errnos. |
| 581 | */ | 583 | */ |
| 582 | int | 584 | __be32 |
| 583 | nfserrno (int errno) | 585 | nfserrno (int errno) |
| 584 | { | 586 | { |
| 585 | static struct { | 587 | static struct { |
| 586 | int nfserr; | 588 | __be32 nfserr; |
| 587 | int syserr; | 589 | int syserr; |
| 588 | } nfs_errtbl[] = { | 590 | } nfs_errtbl[] = { |
| 589 | { nfs_ok, 0 }, | 591 | { nfs_ok, 0 }, |
| @@ -615,11 +617,10 @@ nfserrno (int errno) | |||
| 615 | { nfserr_badname, -ESRCH }, | 617 | { nfserr_badname, -ESRCH }, |
| 616 | { nfserr_io, -ETXTBSY }, | 618 | { nfserr_io, -ETXTBSY }, |
| 617 | { nfserr_notsupp, -EOPNOTSUPP }, | 619 | { nfserr_notsupp, -EOPNOTSUPP }, |
| 618 | { -1, -EIO } | ||
| 619 | }; | 620 | }; |
| 620 | int i; | 621 | int i; |
| 621 | 622 | ||
| 622 | for (i = 0; nfs_errtbl[i].nfserr != -1; i++) { | 623 | for (i = 0; i < ARRAY_SIZE(nfs_errtbl); i++) { |
| 623 | if (nfs_errtbl[i].syserr == errno) | 624 | if (nfs_errtbl[i].syserr == errno) |
| 624 | return nfs_errtbl[i].nfserr; | 625 | return nfs_errtbl[i].nfserr; |
| 625 | } | 626 | } |
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 013b38996e64..0aaccb03bf76 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
| @@ -491,12 +491,12 @@ out: | |||
| 491 | } | 491 | } |
| 492 | 492 | ||
| 493 | int | 493 | int |
| 494 | nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp) | 494 | nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) |
| 495 | { | 495 | { |
| 496 | struct svc_procedure *proc; | 496 | struct svc_procedure *proc; |
| 497 | kxdrproc_t xdr; | 497 | kxdrproc_t xdr; |
| 498 | u32 nfserr; | 498 | __be32 nfserr; |
| 499 | u32 *nfserrp; | 499 | __be32 *nfserrp; |
| 500 | 500 | ||
| 501 | dprintk("nfsd_dispatch: vers %d proc %d\n", | 501 | dprintk("nfsd_dispatch: vers %d proc %d\n", |
| 502 | rqstp->rq_vers, rqstp->rq_proc); | 502 | rqstp->rq_vers, rqstp->rq_proc); |
| @@ -515,7 +515,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp) | |||
| 515 | 515 | ||
| 516 | /* Decode arguments */ | 516 | /* Decode arguments */ |
| 517 | xdr = proc->pc_decode; | 517 | xdr = proc->pc_decode; |
| 518 | if (xdr && !xdr(rqstp, (u32*)rqstp->rq_arg.head[0].iov_base, | 518 | if (xdr && !xdr(rqstp, (__be32*)rqstp->rq_arg.head[0].iov_base, |
| 519 | rqstp->rq_argp)) { | 519 | rqstp->rq_argp)) { |
| 520 | dprintk("nfsd: failed to decode arguments!\n"); | 520 | dprintk("nfsd: failed to decode arguments!\n"); |
| 521 | nfsd_cache_update(rqstp, RC_NOCACHE, NULL); | 521 | nfsd_cache_update(rqstp, RC_NOCACHE, NULL); |
| @@ -528,7 +528,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp) | |||
| 528 | */ | 528 | */ |
| 529 | nfserrp = rqstp->rq_res.head[0].iov_base | 529 | nfserrp = rqstp->rq_res.head[0].iov_base |
| 530 | + rqstp->rq_res.head[0].iov_len; | 530 | + rqstp->rq_res.head[0].iov_len; |
| 531 | rqstp->rq_res.head[0].iov_len += sizeof(u32); | 531 | rqstp->rq_res.head[0].iov_len += sizeof(__be32); |
| 532 | 532 | ||
| 533 | /* Now call the procedure handler, and encode NFS status. */ | 533 | /* Now call the procedure handler, and encode NFS status. */ |
| 534 | nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp); | 534 | nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp); |
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c index 1135c0d14557..56ebb1443e0e 100644 --- a/fs/nfsd/nfsxdr.c +++ b/fs/nfsd/nfsxdr.c | |||
| @@ -37,8 +37,8 @@ static u32 nfs_ftypes[] = { | |||
| 37 | /* | 37 | /* |
| 38 | * XDR functions for basic NFS types | 38 | * XDR functions for basic NFS types |
| 39 | */ | 39 | */ |
| 40 | static u32 * | 40 | static __be32 * |
| 41 | decode_fh(u32 *p, struct svc_fh *fhp) | 41 | decode_fh(__be32 *p, struct svc_fh *fhp) |
| 42 | { | 42 | { |
| 43 | fh_init(fhp, NFS_FHSIZE); | 43 | fh_init(fhp, NFS_FHSIZE); |
| 44 | memcpy(&fhp->fh_handle.fh_base, p, NFS_FHSIZE); | 44 | memcpy(&fhp->fh_handle.fh_base, p, NFS_FHSIZE); |
| @@ -50,13 +50,13 @@ decode_fh(u32 *p, struct svc_fh *fhp) | |||
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | /* Helper function for NFSv2 ACL code */ | 52 | /* Helper function for NFSv2 ACL code */ |
| 53 | u32 *nfs2svc_decode_fh(u32 *p, struct svc_fh *fhp) | 53 | __be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp) |
| 54 | { | 54 | { |
| 55 | return decode_fh(p, fhp); | 55 | return decode_fh(p, fhp); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | static inline u32 * | 58 | static inline __be32 * |
| 59 | encode_fh(u32 *p, struct svc_fh *fhp) | 59 | encode_fh(__be32 *p, struct svc_fh *fhp) |
| 60 | { | 60 | { |
| 61 | memcpy(p, &fhp->fh_handle.fh_base, NFS_FHSIZE); | 61 | memcpy(p, &fhp->fh_handle.fh_base, NFS_FHSIZE); |
| 62 | return p + (NFS_FHSIZE>> 2); | 62 | return p + (NFS_FHSIZE>> 2); |
| @@ -66,8 +66,8 @@ encode_fh(u32 *p, struct svc_fh *fhp) | |||
| 66 | * Decode a file name and make sure that the path contains | 66 | * Decode a file name and make sure that the path contains |
| 67 | * no slashes or null bytes. | 67 | * no slashes or null bytes. |
| 68 | */ | 68 | */ |
| 69 | static inline u32 * | 69 | static inline __be32 * |
| 70 | decode_filename(u32 *p, char **namp, int *lenp) | 70 | decode_filename(__be32 *p, char **namp, int *lenp) |
| 71 | { | 71 | { |
| 72 | char *name; | 72 | char *name; |
| 73 | int i; | 73 | int i; |
| @@ -82,8 +82,8 @@ decode_filename(u32 *p, char **namp, int *lenp) | |||
| 82 | return p; | 82 | return p; |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | static inline u32 * | 85 | static inline __be32 * |
| 86 | decode_pathname(u32 *p, char **namp, int *lenp) | 86 | decode_pathname(__be32 *p, char **namp, int *lenp) |
| 87 | { | 87 | { |
| 88 | char *name; | 88 | char *name; |
| 89 | int i; | 89 | int i; |
| @@ -98,8 +98,8 @@ decode_pathname(u32 *p, char **namp, int *lenp) | |||
| 98 | return p; | 98 | return p; |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | static inline u32 * | 101 | static inline __be32 * |
| 102 | decode_sattr(u32 *p, struct iattr *iap) | 102 | decode_sattr(__be32 *p, struct iattr *iap) |
| 103 | { | 103 | { |
| 104 | u32 tmp, tmp1; | 104 | u32 tmp, tmp1; |
| 105 | 105 | ||
| @@ -151,8 +151,8 @@ decode_sattr(u32 *p, struct iattr *iap) | |||
| 151 | return p; | 151 | return p; |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | static u32 * | 154 | static __be32 * |
| 155 | encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp, | 155 | encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, |
| 156 | struct kstat *stat) | 156 | struct kstat *stat) |
| 157 | { | 157 | { |
| 158 | struct dentry *dentry = fhp->fh_dentry; | 158 | struct dentry *dentry = fhp->fh_dentry; |
| @@ -195,7 +195,7 @@ encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp, | |||
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | /* Helper function for NFSv2 ACL code */ | 197 | /* Helper function for NFSv2 ACL code */ |
| 198 | u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | 198 | __be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp) |
| 199 | { | 199 | { |
| 200 | struct kstat stat; | 200 | struct kstat stat; |
| 201 | vfs_getattr(fhp->fh_export->ex_mnt, fhp->fh_dentry, &stat); | 201 | vfs_getattr(fhp->fh_export->ex_mnt, fhp->fh_dentry, &stat); |
| @@ -206,13 +206,13 @@ u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp) | |||
| 206 | * XDR decode functions | 206 | * XDR decode functions |
| 207 | */ | 207 | */ |
| 208 | int | 208 | int |
| 209 | nfssvc_decode_void(struct svc_rqst *rqstp, u32 *p, void *dummy) | 209 | nfssvc_decode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
| 210 | { | 210 | { |
| 211 | return xdr_argsize_check(rqstp, p); | 211 | return xdr_argsize_check(rqstp, p); |
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | int | 214 | int |
| 215 | nfssvc_decode_fhandle(struct svc_rqst *rqstp, u32 *p, struct nfsd_fhandle *args) | 215 | nfssvc_decode_fhandle(struct svc_rqst *rqstp, __be32 *p, struct nfsd_fhandle *args) |
| 216 | { | 216 | { |
| 217 | if (!(p = decode_fh(p, &args->fh))) | 217 | if (!(p = decode_fh(p, &args->fh))) |
| 218 | return 0; | 218 | return 0; |
| @@ -220,7 +220,7 @@ nfssvc_decode_fhandle(struct svc_rqst *rqstp, u32 *p, struct nfsd_fhandle *args) | |||
| 220 | } | 220 | } |
| 221 | 221 | ||
| 222 | int | 222 | int |
| 223 | nfssvc_decode_sattrargs(struct svc_rqst *rqstp, u32 *p, | 223 | nfssvc_decode_sattrargs(struct svc_rqst *rqstp, __be32 *p, |
| 224 | struct nfsd_sattrargs *args) | 224 | struct nfsd_sattrargs *args) |
| 225 | { | 225 | { |
| 226 | if (!(p = decode_fh(p, &args->fh)) | 226 | if (!(p = decode_fh(p, &args->fh)) |
| @@ -231,7 +231,7 @@ nfssvc_decode_sattrargs(struct svc_rqst *rqstp, u32 *p, | |||
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | int | 233 | int |
| 234 | nfssvc_decode_diropargs(struct svc_rqst *rqstp, u32 *p, | 234 | nfssvc_decode_diropargs(struct svc_rqst *rqstp, __be32 *p, |
| 235 | struct nfsd_diropargs *args) | 235 | struct nfsd_diropargs *args) |
| 236 | { | 236 | { |
| 237 | if (!(p = decode_fh(p, &args->fh)) | 237 | if (!(p = decode_fh(p, &args->fh)) |
| @@ -242,7 +242,7 @@ nfssvc_decode_diropargs(struct svc_rqst *rqstp, u32 *p, | |||
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | int | 244 | int |
| 245 | nfssvc_decode_readargs(struct svc_rqst *rqstp, u32 *p, | 245 | nfssvc_decode_readargs(struct svc_rqst *rqstp, __be32 *p, |
| 246 | struct nfsd_readargs *args) | 246 | struct nfsd_readargs *args) |
| 247 | { | 247 | { |
| 248 | unsigned int len; | 248 | unsigned int len; |
| @@ -273,7 +273,7 @@ nfssvc_decode_readargs(struct svc_rqst *rqstp, u32 *p, | |||
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | int | 275 | int |
| 276 | nfssvc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, | 276 | nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, |
| 277 | struct nfsd_writeargs *args) | 277 | struct nfsd_writeargs *args) |
| 278 | { | 278 | { |
| 279 | unsigned int len; | 279 | unsigned int len; |
| @@ -303,7 +303,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, | |||
| 303 | } | 303 | } |
| 304 | 304 | ||
| 305 | int | 305 | int |
| 306 | nfssvc_decode_createargs(struct svc_rqst *rqstp, u32 *p, | 306 | nfssvc_decode_createargs(struct svc_rqst *rqstp, __be32 *p, |
| 307 | struct nfsd_createargs *args) | 307 | struct nfsd_createargs *args) |
| 308 | { | 308 | { |
| 309 | if (!(p = decode_fh(p, &args->fh)) | 309 | if (!(p = decode_fh(p, &args->fh)) |
| @@ -315,7 +315,7 @@ nfssvc_decode_createargs(struct svc_rqst *rqstp, u32 *p, | |||
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | int | 317 | int |
| 318 | nfssvc_decode_renameargs(struct svc_rqst *rqstp, u32 *p, | 318 | nfssvc_decode_renameargs(struct svc_rqst *rqstp, __be32 *p, |
| 319 | struct nfsd_renameargs *args) | 319 | struct nfsd_renameargs *args) |
| 320 | { | 320 | { |
| 321 | if (!(p = decode_fh(p, &args->ffh)) | 321 | if (!(p = decode_fh(p, &args->ffh)) |
| @@ -328,7 +328,7 @@ nfssvc_decode_renameargs(struct svc_rqst *rqstp, u32 *p, | |||
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | int | 330 | int |
| 331 | nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, struct nfsd_readlinkargs *args) | 331 | nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p, struct nfsd_readlinkargs *args) |
| 332 | { | 332 | { |
| 333 | if (!(p = decode_fh(p, &args->fh))) | 333 | if (!(p = decode_fh(p, &args->fh))) |
| 334 | return 0; | 334 | return 0; |
| @@ -338,7 +338,7 @@ nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, struct nfsd_readlinka | |||
| 338 | } | 338 | } |
| 339 | 339 | ||
| 340 | int | 340 | int |
| 341 | nfssvc_decode_linkargs(struct svc_rqst *rqstp, u32 *p, | 341 | nfssvc_decode_linkargs(struct svc_rqst *rqstp, __be32 *p, |
| 342 | struct nfsd_linkargs *args) | 342 | struct nfsd_linkargs *args) |
| 343 | { | 343 | { |
| 344 | if (!(p = decode_fh(p, &args->ffh)) | 344 | if (!(p = decode_fh(p, &args->ffh)) |
| @@ -350,7 +350,7 @@ nfssvc_decode_linkargs(struct svc_rqst *rqstp, u32 *p, | |||
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | int | 352 | int |
| 353 | nfssvc_decode_symlinkargs(struct svc_rqst *rqstp, u32 *p, | 353 | nfssvc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p, |
| 354 | struct nfsd_symlinkargs *args) | 354 | struct nfsd_symlinkargs *args) |
| 355 | { | 355 | { |
| 356 | if (!(p = decode_fh(p, &args->ffh)) | 356 | if (!(p = decode_fh(p, &args->ffh)) |
| @@ -363,7 +363,7 @@ nfssvc_decode_symlinkargs(struct svc_rqst *rqstp, u32 *p, | |||
| 363 | } | 363 | } |
| 364 | 364 | ||
| 365 | int | 365 | int |
| 366 | nfssvc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p, | 366 | nfssvc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p, |
| 367 | struct nfsd_readdirargs *args) | 367 | struct nfsd_readdirargs *args) |
| 368 | { | 368 | { |
| 369 | if (!(p = decode_fh(p, &args->fh))) | 369 | if (!(p = decode_fh(p, &args->fh))) |
| @@ -382,13 +382,13 @@ nfssvc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p, | |||
| 382 | * XDR encode functions | 382 | * XDR encode functions |
| 383 | */ | 383 | */ |
| 384 | int | 384 | int |
| 385 | nfssvc_encode_void(struct svc_rqst *rqstp, u32 *p, void *dummy) | 385 | nfssvc_encode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy) |
| 386 | { | 386 | { |
| 387 | return xdr_ressize_check(rqstp, p); | 387 | return xdr_ressize_check(rqstp, p); |
| 388 | } | 388 | } |
| 389 | 389 | ||
| 390 | int | 390 | int |
| 391 | nfssvc_encode_attrstat(struct svc_rqst *rqstp, u32 *p, | 391 | nfssvc_encode_attrstat(struct svc_rqst *rqstp, __be32 *p, |
| 392 | struct nfsd_attrstat *resp) | 392 | struct nfsd_attrstat *resp) |
| 393 | { | 393 | { |
| 394 | p = encode_fattr(rqstp, p, &resp->fh, &resp->stat); | 394 | p = encode_fattr(rqstp, p, &resp->fh, &resp->stat); |
| @@ -396,7 +396,7 @@ nfssvc_encode_attrstat(struct svc_rqst *rqstp, u32 *p, | |||
| 396 | } | 396 | } |
| 397 | 397 | ||
| 398 | int | 398 | int |
| 399 | nfssvc_encode_diropres(struct svc_rqst *rqstp, u32 *p, | 399 | nfssvc_encode_diropres(struct svc_rqst *rqstp, __be32 *p, |
| 400 | struct nfsd_diropres *resp) | 400 | struct nfsd_diropres *resp) |
| 401 | { | 401 | { |
| 402 | p = encode_fh(p, &resp->fh); | 402 | p = encode_fh(p, &resp->fh); |
| @@ -405,7 +405,7 @@ nfssvc_encode_diropres(struct svc_rqst *rqstp, u32 *p, | |||
| 405 | } | 405 | } |
| 406 | 406 | ||
| 407 | int | 407 | int |
| 408 | nfssvc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p, | 408 | nfssvc_encode_readlinkres(struct svc_rqst *rqstp, __be32 *p, |
| 409 | struct nfsd_readlinkres *resp) | 409 | struct nfsd_readlinkres *resp) |
| 410 | { | 410 | { |
| 411 | *p++ = htonl(resp->len); | 411 | *p++ = htonl(resp->len); |
| @@ -421,7 +421,7 @@ nfssvc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p, | |||
| 421 | } | 421 | } |
| 422 | 422 | ||
| 423 | int | 423 | int |
| 424 | nfssvc_encode_readres(struct svc_rqst *rqstp, u32 *p, | 424 | nfssvc_encode_readres(struct svc_rqst *rqstp, __be32 *p, |
| 425 | struct nfsd_readres *resp) | 425 | struct nfsd_readres *resp) |
| 426 | { | 426 | { |
| 427 | p = encode_fattr(rqstp, p, &resp->fh, &resp->stat); | 427 | p = encode_fattr(rqstp, p, &resp->fh, &resp->stat); |
| @@ -440,7 +440,7 @@ nfssvc_encode_readres(struct svc_rqst *rqstp, u32 *p, | |||
| 440 | } | 440 | } |
| 441 | 441 | ||
| 442 | int | 442 | int |
| 443 | nfssvc_encode_readdirres(struct svc_rqst *rqstp, u32 *p, | 443 | nfssvc_encode_readdirres(struct svc_rqst *rqstp, __be32 *p, |
| 444 | struct nfsd_readdirres *resp) | 444 | struct nfsd_readdirres *resp) |
| 445 | { | 445 | { |
| 446 | xdr_ressize_check(rqstp, p); | 446 | xdr_ressize_check(rqstp, p); |
| @@ -453,7 +453,7 @@ nfssvc_encode_readdirres(struct svc_rqst *rqstp, u32 *p, | |||
| 453 | } | 453 | } |
| 454 | 454 | ||
| 455 | int | 455 | int |
| 456 | nfssvc_encode_statfsres(struct svc_rqst *rqstp, u32 *p, | 456 | nfssvc_encode_statfsres(struct svc_rqst *rqstp, __be32 *p, |
| 457 | struct nfsd_statfsres *resp) | 457 | struct nfsd_statfsres *resp) |
| 458 | { | 458 | { |
| 459 | struct kstatfs *stat = &resp->stats; | 459 | struct kstatfs *stat = &resp->stats; |
| @@ -471,7 +471,7 @@ nfssvc_encode_entry(struct readdir_cd *ccd, const char *name, | |||
| 471 | int namlen, loff_t offset, ino_t ino, unsigned int d_type) | 471 | int namlen, loff_t offset, ino_t ino, unsigned int d_type) |
| 472 | { | 472 | { |
| 473 | struct nfsd_readdirres *cd = container_of(ccd, struct nfsd_readdirres, common); | 473 | struct nfsd_readdirres *cd = container_of(ccd, struct nfsd_readdirres, common); |
| 474 | u32 *p = cd->buffer; | 474 | __be32 *p = cd->buffer; |
| 475 | int buflen, slen; | 475 | int buflen, slen; |
| 476 | 476 | ||
| 477 | /* | 477 | /* |
| @@ -497,7 +497,7 @@ nfssvc_encode_entry(struct readdir_cd *ccd, const char *name, | |||
| 497 | *p++ = htonl((u32) ino); /* file id */ | 497 | *p++ = htonl((u32) ino); /* file id */ |
| 498 | p = xdr_encode_array(p, name, namlen);/* name length & name */ | 498 | p = xdr_encode_array(p, name, namlen);/* name length & name */ |
| 499 | cd->offset = p; /* remember pointer */ | 499 | cd->offset = p; /* remember pointer */ |
| 500 | *p++ = ~(u32) 0; /* offset of next entry */ | 500 | *p++ = htonl(~0U); /* offset of next entry */ |
| 501 | 501 | ||
| 502 | cd->buflen = buflen; | 502 | cd->buflen = buflen; |
| 503 | cd->buffer = p; | 503 | cd->buffer = p; |
| @@ -509,7 +509,7 @@ nfssvc_encode_entry(struct readdir_cd *ccd, const char *name, | |||
| 509 | * XDR release functions | 509 | * XDR release functions |
| 510 | */ | 510 | */ |
| 511 | int | 511 | int |
| 512 | nfssvc_release_fhandle(struct svc_rqst *rqstp, u32 *p, | 512 | nfssvc_release_fhandle(struct svc_rqst *rqstp, __be32 *p, |
| 513 | struct nfsd_fhandle *resp) | 513 | struct nfsd_fhandle *resp) |
| 514 | { | 514 | { |
| 515 | fh_put(&resp->fh); | 515 | fh_put(&resp->fh); |
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 1141bd29e4e3..f21e917bb8ed 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
| @@ -110,7 +110,7 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, | |||
| 110 | struct dentry *dentry = *dpp; | 110 | struct dentry *dentry = *dpp; |
| 111 | struct vfsmount *mnt = mntget(exp->ex_mnt); | 111 | struct vfsmount *mnt = mntget(exp->ex_mnt); |
| 112 | struct dentry *mounts = dget(dentry); | 112 | struct dentry *mounts = dget(dentry); |
| 113 | int err = nfs_ok; | 113 | int err = 0; |
| 114 | 114 | ||
| 115 | while (follow_down(&mnt,&mounts)&&d_mountpoint(mounts)); | 115 | while (follow_down(&mnt,&mounts)&&d_mountpoint(mounts)); |
| 116 | 116 | ||
| @@ -148,14 +148,15 @@ out: | |||
| 148 | * clients and is explicitly disallowed for NFSv3 | 148 | * clients and is explicitly disallowed for NFSv3 |
| 149 | * NeilBrown <neilb@cse.unsw.edu.au> | 149 | * NeilBrown <neilb@cse.unsw.edu.au> |
| 150 | */ | 150 | */ |
| 151 | int | 151 | __be32 |
| 152 | nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name, | 152 | nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name, |
| 153 | int len, struct svc_fh *resfh) | 153 | int len, struct svc_fh *resfh) |
| 154 | { | 154 | { |
| 155 | struct svc_export *exp; | 155 | struct svc_export *exp; |
| 156 | struct dentry *dparent; | 156 | struct dentry *dparent; |
| 157 | struct dentry *dentry; | 157 | struct dentry *dentry; |
| 158 | int err; | 158 | __be32 err; |
| 159 | int host_err; | ||
| 159 | 160 | ||
| 160 | dprintk("nfsd: nfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(fhp), len,name); | 161 | dprintk("nfsd: nfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(fhp), len,name); |
| 161 | 162 | ||
| @@ -193,7 +194,7 @@ nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name, | |||
| 193 | exp2 = exp_parent(exp->ex_client, mnt, dentry, | 194 | exp2 = exp_parent(exp->ex_client, mnt, dentry, |
| 194 | &rqstp->rq_chandle); | 195 | &rqstp->rq_chandle); |
| 195 | if (IS_ERR(exp2)) { | 196 | if (IS_ERR(exp2)) { |
| 196 | err = PTR_ERR(exp2); | 197 | host_err = PTR_ERR(exp2); |
| 197 | dput(dentry); | 198 | dput(dentry); |
| 198 | mntput(mnt); | 199 | mntput(mnt); |
| 199 | goto out_nfserr; | 200 | goto out_nfserr; |
| @@ -210,14 +211,14 @@ nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name, | |||
| 210 | } else { | 211 | } else { |
| 211 | fh_lock(fhp); | 212 | fh_lock(fhp); |
| 212 | dentry = lookup_one_len(name, dparent, len); | 213 | dentry = lookup_one_len(name, dparent, len); |
| 213 | err = PTR_ERR(dentry); | 214 | host_err = PTR_ERR(dentry); |
| 214 | if (IS_ERR(dentry)) | 215 | if (IS_ERR(dentry)) |
| 215 | goto out_nfserr; | 216 | goto out_nfserr; |
| 216 | /* | 217 | /* |
| 217 | * check if we have crossed a mount point ... | 218 | * check if we have crossed a mount point ... |
| 218 | */ | 219 | */ |
| 219 | if (d_mountpoint(dentry)) { | 220 | if (d_mountpoint(dentry)) { |
| 220 | if ((err = nfsd_cross_mnt(rqstp, &dentry, &exp))) { | 221 | if ((host_err = nfsd_cross_mnt(rqstp, &dentry, &exp))) { |
| 221 | dput(dentry); | 222 | dput(dentry); |
| 222 | goto out_nfserr; | 223 | goto out_nfserr; |
| 223 | } | 224 | } |
| @@ -236,7 +237,7 @@ out: | |||
| 236 | return err; | 237 | return err; |
| 237 | 238 | ||
| 238 | out_nfserr: | 239 | out_nfserr: |
| 239 | err = nfserrno(err); | 240 | err = nfserrno(host_err); |
| 240 | goto out; | 241 | goto out; |
| 241 | } | 242 | } |
| 242 | 243 | ||
| @@ -244,7 +245,7 @@ out_nfserr: | |||
| 244 | * Set various file attributes. | 245 | * Set various file attributes. |
| 245 | * N.B. After this call fhp needs an fh_put | 246 | * N.B. After this call fhp needs an fh_put |
| 246 | */ | 247 | */ |
| 247 | int | 248 | __be32 |
| 248 | nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, | 249 | nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, |
| 249 | int check_guard, time_t guardtime) | 250 | int check_guard, time_t guardtime) |
| 250 | { | 251 | { |
| @@ -253,7 +254,8 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, | |||
| 253 | int accmode = MAY_SATTR; | 254 | int accmode = MAY_SATTR; |
| 254 | int ftype = 0; | 255 | int ftype = 0; |
| 255 | int imode; | 256 | int imode; |
| 256 | int err; | 257 | __be32 err; |
| 258 | int host_err; | ||
| 257 | int size_change = 0; | 259 | int size_change = 0; |
| 258 | 260 | ||
| 259 | if (iap->ia_valid & (ATTR_ATIME | ATTR_MTIME | ATTR_SIZE)) | 261 | if (iap->ia_valid & (ATTR_ATIME | ATTR_MTIME | ATTR_SIZE)) |
| @@ -319,19 +321,19 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, | |||
| 319 | * If we are changing the size of the file, then | 321 | * If we are changing the size of the file, then |
| 320 | * we need to break all leases. | 322 | * we need to break all leases. |
| 321 | */ | 323 | */ |
| 322 | err = break_lease(inode, FMODE_WRITE | O_NONBLOCK); | 324 | host_err = break_lease(inode, FMODE_WRITE | O_NONBLOCK); |
| 323 | if (err == -EWOULDBLOCK) | 325 | if (host_err == -EWOULDBLOCK) |
| 324 | err = -ETIMEDOUT; | 326 | host_err = -ETIMEDOUT; |
| 325 | if (err) /* ENOMEM or EWOULDBLOCK */ | 327 | if (host_err) /* ENOMEM or EWOULDBLOCK */ |
| 326 | goto out_nfserr; | 328 | goto out_nfserr; |
| 327 | 329 | ||
| 328 | err = get_write_access(inode); | 330 | host_err = get_write_access(inode); |
| 329 | if (err) | 331 | if (host_err) |
| 330 | goto out_nfserr; | 332 | goto out_nfserr; |
| 331 | 333 | ||
| 332 | size_change = 1; | 334 | size_change = 1; |
| 333 | err = locks_verify_truncate(inode, NULL, iap->ia_size); | 335 | host_err = locks_verify_truncate(inode, NULL, iap->ia_size); |
| 334 | if (err) { | 336 | if (host_err) { |
| 335 | put_write_access(inode); | 337 | put_write_access(inode); |
| 336 | goto out_nfserr; | 338 | goto out_nfserr; |
| 337 | } | 339 | } |
| @@ -357,8 +359,8 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, | |||
| 357 | err = nfserr_notsync; | 359 | err = nfserr_notsync; |
| 358 | if (!check_guard || guardtime == inode->i_ctime.tv_sec) { | 360 | if (!check_guard || guardtime == inode->i_ctime.tv_sec) { |
| 359 | fh_lock(fhp); | 361 | fh_lock(fhp); |
| 360 | err = notify_change(dentry, iap); | 362 | host_err = notify_change(dentry, iap); |
| 361 | err = nfserrno(err); | 363 | err = nfserrno(host_err); |
| 362 | fh_unlock(fhp); | 364 | fh_unlock(fhp); |
| 363 | } | 365 | } |
| 364 | if (size_change) | 366 | if (size_change) |
| @@ -370,7 +372,7 @@ out: | |||
| 370 | return err; | 372 | return err; |
| 371 | 373 | ||
| 372 | out_nfserr: | 374 | out_nfserr: |
| 373 | err = nfserrno(err); | 375 | err = nfserrno(host_err); |
| 374 | goto out; | 376 | goto out; |
| 375 | } | 377 | } |
| 376 | 378 | ||
| @@ -420,11 +422,12 @@ out: | |||
| 420 | return error; | 422 | return error; |
| 421 | } | 423 | } |
| 422 | 424 | ||
| 423 | int | 425 | __be32 |
| 424 | nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp, | 426 | nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp, |
| 425 | struct nfs4_acl *acl) | 427 | struct nfs4_acl *acl) |
| 426 | { | 428 | { |
| 427 | int error; | 429 | __be32 error; |
| 430 | int host_error; | ||
| 428 | struct dentry *dentry; | 431 | struct dentry *dentry; |
| 429 | struct inode *inode; | 432 | struct inode *inode; |
| 430 | struct posix_acl *pacl = NULL, *dpacl = NULL; | 433 | struct posix_acl *pacl = NULL, *dpacl = NULL; |
| @@ -440,20 +443,20 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 440 | if (S_ISDIR(inode->i_mode)) | 443 | if (S_ISDIR(inode->i_mode)) |
| 441 | flags = NFS4_ACL_DIR; | 444 | flags = NFS4_ACL_DIR; |
| 442 | 445 | ||
| 443 | error = nfs4_acl_nfsv4_to_posix(acl, &pacl, &dpacl, flags); | 446 | host_error = nfs4_acl_nfsv4_to_posix(acl, &pacl, &dpacl, flags); |
| 444 | if (error == -EINVAL) { | 447 | if (host_error == -EINVAL) { |
| 445 | error = nfserr_attrnotsupp; | 448 | error = nfserr_attrnotsupp; |
| 446 | goto out; | 449 | goto out; |
| 447 | } else if (error < 0) | 450 | } else if (host_error < 0) |
| 448 | goto out_nfserr; | 451 | goto out_nfserr; |
| 449 | 452 | ||
| 450 | error = set_nfsv4_acl_one(dentry, pacl, POSIX_ACL_XATTR_ACCESS); | 453 | host_error = set_nfsv4_acl_one(dentry, pacl, POSIX_ACL_XATTR_ACCESS); |
| 451 | if (error < 0) | 454 | if (host_error < 0) |
| 452 | goto out_nfserr; | 455 | goto out_nfserr; |
| 453 | 456 | ||
| 454 | if (S_ISDIR(inode->i_mode)) { | 457 | if (S_ISDIR(inode->i_mode)) { |
| 455 | error = set_nfsv4_acl_one(dentry, dpacl, POSIX_ACL_XATTR_DEFAULT); | 458 | host_error = set_nfsv4_acl_one(dentry, dpacl, POSIX_ACL_XATTR_DEFAULT); |
| 456 | if (error < 0) | 459 | if (host_error < 0) |
| 457 | goto out_nfserr; | 460 | goto out_nfserr; |
| 458 | } | 461 | } |
| 459 | 462 | ||
| @@ -464,7 +467,7 @@ out: | |||
| 464 | posix_acl_release(dpacl); | 467 | posix_acl_release(dpacl); |
| 465 | return (error); | 468 | return (error); |
| 466 | out_nfserr: | 469 | out_nfserr: |
| 467 | error = nfserrno(error); | 470 | error = nfserrno(host_error); |
| 468 | goto out; | 471 | goto out; |
| 469 | } | 472 | } |
| 470 | 473 | ||
| @@ -571,14 +574,14 @@ static struct accessmap nfs3_anyaccess[] = { | |||
| 571 | { 0, 0 } | 574 | { 0, 0 } |
| 572 | }; | 575 | }; |
| 573 | 576 | ||
| 574 | int | 577 | __be32 |
| 575 | nfsd_access(struct svc_rqst *rqstp, struct svc_fh *fhp, u32 *access, u32 *supported) | 578 | nfsd_access(struct svc_rqst *rqstp, struct svc_fh *fhp, u32 *access, u32 *supported) |
| 576 | { | 579 | { |
| 577 | struct accessmap *map; | 580 | struct accessmap *map; |
| 578 | struct svc_export *export; | 581 | struct svc_export *export; |
| 579 | struct dentry *dentry; | 582 | struct dentry *dentry; |
| 580 | u32 query, result = 0, sresult = 0; | 583 | u32 query, result = 0, sresult = 0; |
| 581 | unsigned int error; | 584 | __be32 error; |
| 582 | 585 | ||
| 583 | error = fh_verify(rqstp, fhp, 0, MAY_NOP); | 586 | error = fh_verify(rqstp, fhp, 0, MAY_NOP); |
| 584 | if (error) | 587 | if (error) |
| @@ -598,7 +601,7 @@ nfsd_access(struct svc_rqst *rqstp, struct svc_fh *fhp, u32 *access, u32 *suppor | |||
| 598 | query = *access; | 601 | query = *access; |
| 599 | for (; map->access; map++) { | 602 | for (; map->access; map++) { |
| 600 | if (map->access & query) { | 603 | if (map->access & query) { |
| 601 | unsigned int err2; | 604 | __be32 err2; |
| 602 | 605 | ||
| 603 | sresult |= map->access; | 606 | sresult |= map->access; |
| 604 | 607 | ||
| @@ -637,13 +640,15 @@ nfsd_access(struct svc_rqst *rqstp, struct svc_fh *fhp, u32 *access, u32 *suppor | |||
| 637 | * The access argument indicates the type of open (read/write/lock) | 640 | * The access argument indicates the type of open (read/write/lock) |
| 638 | * N.B. After this call fhp needs an fh_put | 641 | * N.B. After this call fhp needs an fh_put |
| 639 | */ | 642 | */ |
| 640 | int | 643 | __be32 |
| 641 | nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | 644 | nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, |
| 642 | int access, struct file **filp) | 645 | int access, struct file **filp) |
| 643 | { | 646 | { |
| 644 | struct dentry *dentry; | 647 | struct dentry *dentry; |
| 645 | struct inode *inode; | 648 | struct inode *inode; |
| 646 | int flags = O_RDONLY|O_LARGEFILE, err; | 649 | int flags = O_RDONLY|O_LARGEFILE; |
| 650 | __be32 err; | ||
| 651 | int host_err; | ||
| 647 | 652 | ||
| 648 | /* | 653 | /* |
| 649 | * If we get here, then the client has already done an "open", | 654 | * If we get here, then the client has already done an "open", |
| @@ -673,10 +678,10 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | |||
| 673 | * Check to see if there are any leases on this file. | 678 | * Check to see if there are any leases on this file. |
| 674 | * This may block while leases are broken. | 679 | * This may block while leases are broken. |
| 675 | */ | 680 | */ |
| 676 | err = break_lease(inode, O_NONBLOCK | ((access & MAY_WRITE) ? FMODE_WRITE : 0)); | 681 | host_err = break_lease(inode, O_NONBLOCK | ((access & MAY_WRITE) ? FMODE_WRITE : 0)); |
| 677 | if (err == -EWOULDBLOCK) | 682 | if (host_err == -EWOULDBLOCK) |
| 678 | err = -ETIMEDOUT; | 683 | host_err = -ETIMEDOUT; |
| 679 | if (err) /* NOMEM or WOULDBLOCK */ | 684 | if (host_err) /* NOMEM or WOULDBLOCK */ |
| 680 | goto out_nfserr; | 685 | goto out_nfserr; |
| 681 | 686 | ||
| 682 | if (access & MAY_WRITE) { | 687 | if (access & MAY_WRITE) { |
| @@ -689,10 +694,9 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | |||
| 689 | } | 694 | } |
| 690 | *filp = dentry_open(dget(dentry), mntget(fhp->fh_export->ex_mnt), flags); | 695 | *filp = dentry_open(dget(dentry), mntget(fhp->fh_export->ex_mnt), flags); |
| 691 | if (IS_ERR(*filp)) | 696 | if (IS_ERR(*filp)) |
| 692 | err = PTR_ERR(*filp); | 697 | host_err = PTR_ERR(*filp); |
| 693 | out_nfserr: | 698 | out_nfserr: |
| 694 | if (err) | 699 | err = nfserrno(host_err); |
| 695 | err = nfserrno(err); | ||
| 696 | out: | 700 | out: |
| 697 | return err; | 701 | return err; |
| 698 | } | 702 | } |
| @@ -830,14 +834,15 @@ nfsd_read_actor(read_descriptor_t *desc, struct page *page, unsigned long offset | |||
| 830 | return size; | 834 | return size; |
| 831 | } | 835 | } |
| 832 | 836 | ||
| 833 | static int | 837 | static __be32 |
| 834 | nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | 838 | nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, |
| 835 | loff_t offset, struct kvec *vec, int vlen, unsigned long *count) | 839 | loff_t offset, struct kvec *vec, int vlen, unsigned long *count) |
| 836 | { | 840 | { |
| 837 | struct inode *inode; | 841 | struct inode *inode; |
| 838 | struct raparms *ra; | 842 | struct raparms *ra; |
| 839 | mm_segment_t oldfs; | 843 | mm_segment_t oldfs; |
| 840 | int err; | 844 | __be32 err; |
| 845 | int host_err; | ||
| 841 | 846 | ||
| 842 | err = nfserr_perm; | 847 | err = nfserr_perm; |
| 843 | inode = file->f_dentry->d_inode; | 848 | inode = file->f_dentry->d_inode; |
| @@ -855,12 +860,12 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
| 855 | 860 | ||
| 856 | if (file->f_op->sendfile && rqstp->rq_sendfile_ok) { | 861 | if (file->f_op->sendfile && rqstp->rq_sendfile_ok) { |
| 857 | rqstp->rq_resused = 1; | 862 | rqstp->rq_resused = 1; |
| 858 | err = file->f_op->sendfile(file, &offset, *count, | 863 | host_err = file->f_op->sendfile(file, &offset, *count, |
| 859 | nfsd_read_actor, rqstp); | 864 | nfsd_read_actor, rqstp); |
| 860 | } else { | 865 | } else { |
| 861 | oldfs = get_fs(); | 866 | oldfs = get_fs(); |
| 862 | set_fs(KERNEL_DS); | 867 | set_fs(KERNEL_DS); |
| 863 | err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset); | 868 | host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset); |
| 864 | set_fs(oldfs); | 869 | set_fs(oldfs); |
| 865 | } | 870 | } |
| 866 | 871 | ||
| @@ -874,13 +879,13 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
| 874 | spin_unlock(&rab->pb_lock); | 879 | spin_unlock(&rab->pb_lock); |
| 875 | } | 880 | } |
| 876 | 881 | ||
| 877 | if (err >= 0) { | 882 | if (host_err >= 0) { |
| 878 | nfsdstats.io_read += err; | 883 | nfsdstats.io_read += host_err; |
| 879 | *count = err; | 884 | *count = host_err; |
| 880 | err = 0; | 885 | err = 0; |
| 881 | fsnotify_access(file->f_dentry); | 886 | fsnotify_access(file->f_dentry); |
| 882 | } else | 887 | } else |
| 883 | err = nfserrno(err); | 888 | err = nfserrno(host_err); |
| 884 | out: | 889 | out: |
| 885 | return err; | 890 | return err; |
| 886 | } | 891 | } |
| @@ -895,7 +900,7 @@ static void kill_suid(struct dentry *dentry) | |||
| 895 | mutex_unlock(&dentry->d_inode->i_mutex); | 900 | mutex_unlock(&dentry->d_inode->i_mutex); |
| 896 | } | 901 | } |
| 897 | 902 | ||
| 898 | static int | 903 | static __be32 |
| 899 | nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | 904 | nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, |
| 900 | loff_t offset, struct kvec *vec, int vlen, | 905 | loff_t offset, struct kvec *vec, int vlen, |
| 901 | unsigned long cnt, int *stablep) | 906 | unsigned long cnt, int *stablep) |
| @@ -904,7 +909,8 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
| 904 | struct dentry *dentry; | 909 | struct dentry *dentry; |
| 905 | struct inode *inode; | 910 | struct inode *inode; |
| 906 | mm_segment_t oldfs; | 911 | mm_segment_t oldfs; |
| 907 | int err = 0; | 912 | __be32 err = 0; |
| 913 | int host_err; | ||
| 908 | int stable = *stablep; | 914 | int stable = *stablep; |
| 909 | 915 | ||
| 910 | #ifdef MSNFS | 916 | #ifdef MSNFS |
| @@ -940,18 +946,18 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
| 940 | 946 | ||
| 941 | /* Write the data. */ | 947 | /* Write the data. */ |
| 942 | oldfs = get_fs(); set_fs(KERNEL_DS); | 948 | oldfs = get_fs(); set_fs(KERNEL_DS); |
| 943 | err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset); | 949 | host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset); |
| 944 | set_fs(oldfs); | 950 | set_fs(oldfs); |
| 945 | if (err >= 0) { | 951 | if (host_err >= 0) { |
| 946 | nfsdstats.io_write += cnt; | 952 | nfsdstats.io_write += cnt; |
| 947 | fsnotify_modify(file->f_dentry); | 953 | fsnotify_modify(file->f_dentry); |
| 948 | } | 954 | } |
| 949 | 955 | ||
| 950 | /* clear setuid/setgid flag after write */ | 956 | /* clear setuid/setgid flag after write */ |
| 951 | if (err >= 0 && (inode->i_mode & (S_ISUID | S_ISGID))) | 957 | if (host_err >= 0 && (inode->i_mode & (S_ISUID | S_ISGID))) |
| 952 | kill_suid(dentry); | 958 | kill_suid(dentry); |
| 953 | 959 | ||
| 954 | if (err >= 0 && stable) { | 960 | if (host_err >= 0 && stable) { |
| 955 | static ino_t last_ino; | 961 | static ino_t last_ino; |
| 956 | static dev_t last_dev; | 962 | static dev_t last_dev; |
| 957 | 963 | ||
| @@ -977,7 +983,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
| 977 | 983 | ||
| 978 | if (inode->i_state & I_DIRTY) { | 984 | if (inode->i_state & I_DIRTY) { |
| 979 | dprintk("nfsd: write sync %d\n", current->pid); | 985 | dprintk("nfsd: write sync %d\n", current->pid); |
| 980 | err=nfsd_sync(file); | 986 | host_err=nfsd_sync(file); |
| 981 | } | 987 | } |
| 982 | #if 0 | 988 | #if 0 |
| 983 | wake_up(&inode->i_wait); | 989 | wake_up(&inode->i_wait); |
| @@ -987,11 +993,11 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | |||
| 987 | last_dev = inode->i_sb->s_dev; | 993 | last_dev = inode->i_sb->s_dev; |
| 988 | } | 994 | } |
| 989 | 995 | ||
| 990 | dprintk("nfsd: write complete err=%d\n", err); | 996 | dprintk("nfsd: write complete host_err=%d\n", host_err); |
| 991 | if (err >= 0) | 997 | if (host_err >= 0) |
| 992 | err = 0; | 998 | err = 0; |
| 993 | else | 999 | else |
| 994 | err = nfserrno(err); | 1000 | err = nfserrno(host_err); |
| 995 | out: | 1001 | out: |
| 996 | return err; | 1002 | return err; |
| 997 | } | 1003 | } |
| @@ -1001,12 +1007,12 @@ out: | |||
| 1001 | * on entry. On return, *count contains the number of bytes actually read. | 1007 | * on entry. On return, *count contains the number of bytes actually read. |
| 1002 | * N.B. After this call fhp needs an fh_put | 1008 | * N.B. After this call fhp needs an fh_put |
| 1003 | */ | 1009 | */ |
| 1004 | int | 1010 | __be32 |
| 1005 | nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | 1011 | nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, |
| 1006 | loff_t offset, struct kvec *vec, int vlen, | 1012 | loff_t offset, struct kvec *vec, int vlen, |
| 1007 | unsigned long *count) | 1013 | unsigned long *count) |
| 1008 | { | 1014 | { |
| 1009 | int err; | 1015 | __be32 err; |
| 1010 | 1016 | ||
| 1011 | if (file) { | 1017 | if (file) { |
| 1012 | err = nfsd_permission(fhp->fh_export, fhp->fh_dentry, | 1018 | err = nfsd_permission(fhp->fh_export, fhp->fh_dentry, |
| @@ -1030,12 +1036,12 @@ out: | |||
| 1030 | * The stable flag requests synchronous writes. | 1036 | * The stable flag requests synchronous writes. |
| 1031 | * N.B. After this call fhp needs an fh_put | 1037 | * N.B. After this call fhp needs an fh_put |
| 1032 | */ | 1038 | */ |
| 1033 | int | 1039 | __be32 |
| 1034 | nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, | 1040 | nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, |
| 1035 | loff_t offset, struct kvec *vec, int vlen, unsigned long cnt, | 1041 | loff_t offset, struct kvec *vec, int vlen, unsigned long cnt, |
| 1036 | int *stablep) | 1042 | int *stablep) |
| 1037 | { | 1043 | { |
| 1038 | int err = 0; | 1044 | __be32 err = 0; |
| 1039 | 1045 | ||
| 1040 | if (file) { | 1046 | if (file) { |
| 1041 | err = nfsd_permission(fhp->fh_export, fhp->fh_dentry, | 1047 | err = nfsd_permission(fhp->fh_export, fhp->fh_dentry, |
| @@ -1067,12 +1073,12 @@ out: | |||
| 1067 | * Unfortunately we cannot lock the file to make sure we return full WCC | 1073 | * Unfortunately we cannot lock the file to make sure we return full WCC |
| 1068 | * data to the client, as locking happens lower down in the filesystem. | 1074 | * data to the client, as locking happens lower down in the filesystem. |
| 1069 | */ | 1075 | */ |
| 1070 | int | 1076 | __be32 |
| 1071 | nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, | 1077 | nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, |
| 1072 | loff_t offset, unsigned long count) | 1078 | loff_t offset, unsigned long count) |
| 1073 | { | 1079 | { |
| 1074 | struct file *file; | 1080 | struct file *file; |
| 1075 | int err; | 1081 | __be32 err; |
| 1076 | 1082 | ||
| 1077 | if ((u64)count > ~(u64)offset) | 1083 | if ((u64)count > ~(u64)offset) |
| 1078 | return nfserr_inval; | 1084 | return nfserr_inval; |
| @@ -1100,14 +1106,15 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1100 | * | 1106 | * |
| 1101 | * N.B. Every call to nfsd_create needs an fh_put for _both_ fhp and resfhp | 1107 | * N.B. Every call to nfsd_create needs an fh_put for _both_ fhp and resfhp |
| 1102 | */ | 1108 | */ |
| 1103 | int | 1109 | __be32 |
| 1104 | nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, | 1110 | nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, |
| 1105 | char *fname, int flen, struct iattr *iap, | 1111 | char *fname, int flen, struct iattr *iap, |
| 1106 | int type, dev_t rdev, struct svc_fh *resfhp) | 1112 | int type, dev_t rdev, struct svc_fh *resfhp) |
| 1107 | { | 1113 | { |
| 1108 | struct dentry *dentry, *dchild = NULL; | 1114 | struct dentry *dentry, *dchild = NULL; |
| 1109 | struct inode *dirp; | 1115 | struct inode *dirp; |
| 1110 | int err; | 1116 | __be32 err; |
| 1117 | int host_err; | ||
| 1111 | 1118 | ||
| 1112 | err = nfserr_perm; | 1119 | err = nfserr_perm; |
| 1113 | if (!flen) | 1120 | if (!flen) |
| @@ -1134,7 +1141,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1134 | /* called from nfsd_proc_mkdir, or possibly nfsd3_proc_create */ | 1141 | /* called from nfsd_proc_mkdir, or possibly nfsd3_proc_create */ |
| 1135 | fh_lock_nested(fhp, I_MUTEX_PARENT); | 1142 | fh_lock_nested(fhp, I_MUTEX_PARENT); |
| 1136 | dchild = lookup_one_len(fname, dentry, flen); | 1143 | dchild = lookup_one_len(fname, dentry, flen); |
| 1137 | err = PTR_ERR(dchild); | 1144 | host_err = PTR_ERR(dchild); |
| 1138 | if (IS_ERR(dchild)) | 1145 | if (IS_ERR(dchild)) |
| 1139 | goto out_nfserr; | 1146 | goto out_nfserr; |
| 1140 | err = fh_compose(resfhp, fhp->fh_export, dchild, fhp); | 1147 | err = fh_compose(resfhp, fhp->fh_export, dchild, fhp); |
| @@ -1173,22 +1180,22 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1173 | err = nfserr_perm; | 1180 | err = nfserr_perm; |
| 1174 | switch (type) { | 1181 | switch (type) { |
| 1175 | case S_IFREG: | 1182 | case S_IFREG: |
| 1176 | err = vfs_create(dirp, dchild, iap->ia_mode, NULL); | 1183 | host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL); |
| 1177 | break; | 1184 | break; |
| 1178 | case S_IFDIR: | 1185 | case S_IFDIR: |
| 1179 | err = vfs_mkdir(dirp, dchild, iap->ia_mode); | 1186 | host_err = vfs_mkdir(dirp, dchild, iap->ia_mode); |
| 1180 | break; | 1187 | break; |
| 1181 | case S_IFCHR: | 1188 | case S_IFCHR: |
| 1182 | case S_IFBLK: | 1189 | case S_IFBLK: |
| 1183 | case S_IFIFO: | 1190 | case S_IFIFO: |
| 1184 | case S_IFSOCK: | 1191 | case S_IFSOCK: |
| 1185 | err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev); | 1192 | host_err = vfs_mknod(dirp, dchild, iap->ia_mode, rdev); |
| 1186 | break; | 1193 | break; |
| 1187 | default: | 1194 | default: |
| 1188 | printk("nfsd: bad file type %o in nfsd_create\n", type); | 1195 | printk("nfsd: bad file type %o in nfsd_create\n", type); |
| 1189 | err = -EINVAL; | 1196 | host_err = -EINVAL; |
| 1190 | } | 1197 | } |
| 1191 | if (err < 0) | 1198 | if (host_err < 0) |
| 1192 | goto out_nfserr; | 1199 | goto out_nfserr; |
| 1193 | 1200 | ||
| 1194 | if (EX_ISSYNC(fhp->fh_export)) { | 1201 | if (EX_ISSYNC(fhp->fh_export)) { |
| @@ -1203,7 +1210,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1203 | * directories via NFS. | 1210 | * directories via NFS. |
| 1204 | */ | 1211 | */ |
| 1205 | if ((iap->ia_valid &= ~(ATTR_UID|ATTR_GID|ATTR_MODE)) != 0) { | 1212 | if ((iap->ia_valid &= ~(ATTR_UID|ATTR_GID|ATTR_MODE)) != 0) { |
| 1206 | int err2 = nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0); | 1213 | __be32 err2 = nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0); |
| 1207 | if (err2) | 1214 | if (err2) |
| 1208 | err = err2; | 1215 | err = err2; |
| 1209 | } | 1216 | } |
| @@ -1218,7 +1225,7 @@ out: | |||
| 1218 | return err; | 1225 | return err; |
| 1219 | 1226 | ||
| 1220 | out_nfserr: | 1227 | out_nfserr: |
| 1221 | err = nfserrno(err); | 1228 | err = nfserrno(host_err); |
| 1222 | goto out; | 1229 | goto out; |
| 1223 | } | 1230 | } |
| 1224 | 1231 | ||
| @@ -1226,7 +1233,7 @@ out_nfserr: | |||
| 1226 | /* | 1233 | /* |
| 1227 | * NFSv3 version of nfsd_create | 1234 | * NFSv3 version of nfsd_create |
| 1228 | */ | 1235 | */ |
| 1229 | int | 1236 | __be32 |
| 1230 | nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, | 1237 | nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, |
| 1231 | char *fname, int flen, struct iattr *iap, | 1238 | char *fname, int flen, struct iattr *iap, |
| 1232 | struct svc_fh *resfhp, int createmode, u32 *verifier, | 1239 | struct svc_fh *resfhp, int createmode, u32 *verifier, |
| @@ -1234,7 +1241,8 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1234 | { | 1241 | { |
| 1235 | struct dentry *dentry, *dchild = NULL; | 1242 | struct dentry *dentry, *dchild = NULL; |
| 1236 | struct inode *dirp; | 1243 | struct inode *dirp; |
| 1237 | int err; | 1244 | __be32 err; |
| 1245 | int host_err; | ||
| 1238 | __u32 v_mtime=0, v_atime=0; | 1246 | __u32 v_mtime=0, v_atime=0; |
| 1239 | int v_mode=0; | 1247 | int v_mode=0; |
| 1240 | 1248 | ||
| @@ -1264,7 +1272,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1264 | * Compose the response file handle. | 1272 | * Compose the response file handle. |
| 1265 | */ | 1273 | */ |
| 1266 | dchild = lookup_one_len(fname, dentry, flen); | 1274 | dchild = lookup_one_len(fname, dentry, flen); |
| 1267 | err = PTR_ERR(dchild); | 1275 | host_err = PTR_ERR(dchild); |
| 1268 | if (IS_ERR(dchild)) | 1276 | if (IS_ERR(dchild)) |
| 1269 | goto out_nfserr; | 1277 | goto out_nfserr; |
| 1270 | 1278 | ||
| @@ -1320,8 +1328,8 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1320 | goto out; | 1328 | goto out; |
| 1321 | } | 1329 | } |
| 1322 | 1330 | ||
| 1323 | err = vfs_create(dirp, dchild, iap->ia_mode, NULL); | 1331 | host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL); |
| 1324 | if (err < 0) | 1332 | if (host_err < 0) |
| 1325 | goto out_nfserr; | 1333 | goto out_nfserr; |
| 1326 | 1334 | ||
| 1327 | if (EX_ISSYNC(fhp->fh_export)) { | 1335 | if (EX_ISSYNC(fhp->fh_export)) { |
| @@ -1350,7 +1358,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1350 | */ | 1358 | */ |
| 1351 | set_attr: | 1359 | set_attr: |
| 1352 | if ((iap->ia_valid &= ~(ATTR_UID|ATTR_GID)) != 0) { | 1360 | if ((iap->ia_valid &= ~(ATTR_UID|ATTR_GID)) != 0) { |
| 1353 | int err2 = nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0); | 1361 | __be32 err2 = nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0); |
| 1354 | if (err2) | 1362 | if (err2) |
| 1355 | err = err2; | 1363 | err = err2; |
| 1356 | } | 1364 | } |
| @@ -1368,7 +1376,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1368 | return err; | 1376 | return err; |
| 1369 | 1377 | ||
| 1370 | out_nfserr: | 1378 | out_nfserr: |
| 1371 | err = nfserrno(err); | 1379 | err = nfserrno(host_err); |
| 1372 | goto out; | 1380 | goto out; |
| 1373 | } | 1381 | } |
| 1374 | #endif /* CONFIG_NFSD_V3 */ | 1382 | #endif /* CONFIG_NFSD_V3 */ |
| @@ -1378,13 +1386,14 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1378 | * fits into the buffer. On return, it contains the true length. | 1386 | * fits into the buffer. On return, it contains the true length. |
| 1379 | * N.B. After this call fhp needs an fh_put | 1387 | * N.B. After this call fhp needs an fh_put |
| 1380 | */ | 1388 | */ |
| 1381 | int | 1389 | __be32 |
| 1382 | nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) | 1390 | nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) |
| 1383 | { | 1391 | { |
| 1384 | struct dentry *dentry; | 1392 | struct dentry *dentry; |
| 1385 | struct inode *inode; | 1393 | struct inode *inode; |
| 1386 | mm_segment_t oldfs; | 1394 | mm_segment_t oldfs; |
| 1387 | int err; | 1395 | __be32 err; |
| 1396 | int host_err; | ||
| 1388 | 1397 | ||
| 1389 | err = fh_verify(rqstp, fhp, S_IFLNK, MAY_NOP); | 1398 | err = fh_verify(rqstp, fhp, S_IFLNK, MAY_NOP); |
| 1390 | if (err) | 1399 | if (err) |
| @@ -1403,18 +1412,18 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) | |||
| 1403 | */ | 1412 | */ |
| 1404 | 1413 | ||
| 1405 | oldfs = get_fs(); set_fs(KERNEL_DS); | 1414 | oldfs = get_fs(); set_fs(KERNEL_DS); |
| 1406 | err = inode->i_op->readlink(dentry, buf, *lenp); | 1415 | host_err = inode->i_op->readlink(dentry, buf, *lenp); |
| 1407 | set_fs(oldfs); | 1416 | set_fs(oldfs); |
| 1408 | 1417 | ||
| 1409 | if (err < 0) | 1418 | if (host_err < 0) |
| 1410 | goto out_nfserr; | 1419 | goto out_nfserr; |
| 1411 | *lenp = err; | 1420 | *lenp = host_err; |
| 1412 | err = 0; | 1421 | err = 0; |
| 1413 | out: | 1422 | out: |
| 1414 | return err; | 1423 | return err; |
| 1415 | 1424 | ||
| 1416 | out_nfserr: | 1425 | out_nfserr: |
| 1417 | err = nfserrno(err); | 1426 | err = nfserrno(host_err); |
| 1418 | goto out; | 1427 | goto out; |
| 1419 | } | 1428 | } |
| 1420 | 1429 | ||
| @@ -1422,7 +1431,7 @@ out_nfserr: | |||
| 1422 | * Create a symlink and look up its inode | 1431 | * Create a symlink and look up its inode |
| 1423 | * N.B. After this call _both_ fhp and resfhp need an fh_put | 1432 | * N.B. After this call _both_ fhp and resfhp need an fh_put |
| 1424 | */ | 1433 | */ |
| 1425 | int | 1434 | __be32 |
| 1426 | nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp, | 1435 | nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp, |
| 1427 | char *fname, int flen, | 1436 | char *fname, int flen, |
| 1428 | char *path, int plen, | 1437 | char *path, int plen, |
| @@ -1430,7 +1439,8 @@ nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1430 | struct iattr *iap) | 1439 | struct iattr *iap) |
| 1431 | { | 1440 | { |
| 1432 | struct dentry *dentry, *dnew; | 1441 | struct dentry *dentry, *dnew; |
| 1433 | int err, cerr; | 1442 | __be32 err, cerr; |
| 1443 | int host_err; | ||
| 1434 | umode_t mode; | 1444 | umode_t mode; |
| 1435 | 1445 | ||
| 1436 | err = nfserr_noent; | 1446 | err = nfserr_noent; |
| @@ -1446,7 +1456,7 @@ nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1446 | fh_lock(fhp); | 1456 | fh_lock(fhp); |
| 1447 | dentry = fhp->fh_dentry; | 1457 | dentry = fhp->fh_dentry; |
| 1448 | dnew = lookup_one_len(fname, dentry, flen); | 1458 | dnew = lookup_one_len(fname, dentry, flen); |
| 1449 | err = PTR_ERR(dnew); | 1459 | host_err = PTR_ERR(dnew); |
| 1450 | if (IS_ERR(dnew)) | 1460 | if (IS_ERR(dnew)) |
| 1451 | goto out_nfserr; | 1461 | goto out_nfserr; |
| 1452 | 1462 | ||
| @@ -1458,21 +1468,21 @@ nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
| 1458 | if (unlikely(path[plen] != 0)) { | 1468 | if (unlikely(path[plen] != 0)) { |
| 1459 | char *path_alloced = kmalloc(plen+1, GFP_KERNEL); | 1469 | char *path_alloced = kmalloc(plen+1, GFP_KERNEL); |
| 1460 | if (path_alloced == NULL) | 1470 | if (path_alloced == NULL) |
| 1461 | err = -ENOMEM; | 1471 | host_err = -ENOMEM; |
| 1462 | else { | 1472 | else { |
| 1463 | strncpy(path_alloced, path, plen); | 1473 | strncpy(path_alloced, path, plen); |
| 1464 | path_alloced[plen] = 0; | 1474 | path_alloced[plen] = 0; |
| 1465 | err = vfs_symlink(dentry->d_inode, dnew, path_alloced, mode); | 1475 | host_err = vfs_symlink(dentry->d_inode, dnew, path_alloced, mode); |
| 1466 | kfree(path_alloced); | 1476 | kfree(path_alloced); |
| 1467 | } | 1477 | } |
| 1468 | } else | 1478 | } else |
| 1469 | err = vfs_symlink(dentry->d_inode, dnew, path, mode); | 1479 | host_err = vfs_symlink(dentry->d_inode, dnew, path, mode); |
| 1470 | 1480 | ||
| 1471 | if (!err) | 1481 | if (!host_err) { |
| 1472 | if (EX_ISSYNC(fhp->fh_export)) | 1482 | if (EX_ISSYNC(fhp->fh_export)) |
| 1473 | err = nfsd_sync_dir(dentry); | 1483 | host_err = nfsd_sync_dir(dentry); |
| 1474 | if (err) | 1484 | } |
| 1475 | err = nfserrno(err); | 1485 | err = nfserrno(host_err); |
| 1476 | fh_unlock(fhp); | 1486 | fh_unlock(fhp); |
| 1477 | 1487 | ||
| 1478 | cerr = fh_compose(resfhp, fhp->fh_export, dnew, fhp); | 1488 | cerr = fh_compose(resfhp, fhp->fh_export, dnew, fhp); |
| @@ -1482,7 +1492,7 @@ out: | |||
| 1482 | return err; | 1492 | return err; |
| 1483 | 1493 | ||
| 1484 | out_nfserr: | 1494 | out_nfserr: |
| 1485 | err = nfserrno(err); | 1495 | err = nfserrno(host_err); |
| 1486 | goto out; | 1496 | goto out; |
| 1487 | } | 1497 | } |
| 1488 | 1498 | ||
| @@ -1490,13 +1500,14 @@ out_nfserr: | |||
| 1490 | * Create a hardlink | 1500 | * Create a hardlink |
| 1491 | * N.B. After this call _both_ ffhp and tfhp need an fh_put | 1501 | * N.B. After this call _both_ ffhp and tfhp need an fh_put |
| 1492 | */ | 1502 | */ |
| 1493 | int | 1503 | __be32 |
| 1494 | nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp, | 1504 | nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp, |
| 1495 | char *name, int len, struct svc_fh *tfhp) | 1505 | char *name, int len, struct svc_fh *tfhp) |
| 1496 | { | 1506 | { |
| 1497 | struct dentry *ddir, *dnew, *dold; | 1507 | struct dentry *ddir, *dnew, *dold; |
| 1498 | struct inode *dirp, *dest; | 1508 | struct inode *dirp, *dest; |
| 1499 | int err; | 1509 | __be32 err; |
| 1510 | int host_err; | ||
| 1500 | 1511 | ||
| 1501 | err = fh_verify(rqstp, ffhp, S_IFDIR, MAY_CREATE); | 1512 | err = fh_verify(rqstp, ffhp, S_IFDIR, MAY_CREATE); |
| 1502 | if (err) | 1513 | if (err) |
| @@ -1517,24 +1528,25 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp, | |||
| 1517 | dirp = ddir->d_inode; | 1528 | dirp = ddir->d_inode; |
| 1518 | 1529 | ||
| 1519 | dnew = lookup_one_len(name, ddir, len); | 1530 | dnew = lookup_one_len(name, ddir, len); |
| 1520 | err = PTR_ERR(dnew); | 1531 | host_err = PTR_ERR(dnew); |
| 1521 | if (IS_ERR(dnew)) | 1532 | if (IS_ERR(dnew)) |
| 1522 | goto out_nfserr; | 1533 | goto out_nfserr; |
| 1523 | 1534 | ||
| 1524 | dold = tfhp->fh_dentry; | 1535 | dold = tfhp->fh_dentry; |
| 1525 | dest = dold->d_inode; | 1536 | dest = dold->d_inode; |
| 1526 | 1537 | ||
| 1527 | err = vfs_link(dold, dirp, dnew); | 1538 | host_err = vfs_link(dold, dirp, dnew); |
| 1528 | if (!err) { | 1539 | if (!host_err) { |
| 1529 | if (EX_ISSYNC(ffhp->fh_export)) { | 1540 | if (EX_ISSYNC(ffhp->fh_export)) { |
| 1530 | err = nfserrno(nfsd_sync_dir(ddir)); | 1541 | err = nfserrno(nfsd_sync_dir(ddir)); |
| 1531 | write_inode_now(dest, 1); | 1542 | write_inode_now(dest, 1); |
| 1532 | } | 1543 | } |
| 1544 | err = 0; | ||
| 1533 | } else { | 1545 | } else { |
| 1534 | if (err == -EXDEV && rqstp->rq_vers == 2) | 1546 | if (host_err == -EXDEV && rqstp->rq_vers == 2) |
| 1535 | err = nfserr_acces; | 1547 | err = nfserr_acces; |
| 1536 | else | 1548 | else |
| 1537 | err = nfserrno(err); | 1549 | err = nfserrno(host_err); |
| 1538 | } | 1550 | } |
| 1539 | 1551 | ||
| 1540 | dput(dnew); | 1552 | dput(dnew); |
| @@ -1544,7 +1556,7 @@ out: | |||
| 1544 | return err; | 1556 | return err; |
| 1545 | 1557 | ||
| 1546 | out_nfserr: | 1558 | out_nfserr: |
| 1547 | err = nfserrno(err); | 1559 | err = nfserrno(host_err); |
| 1548 | goto out_unlock; | 1560 | goto out_unlock; |
| 1549 | } | 1561 | } |
| 1550 | 1562 | ||
| @@ -1552,13 +1564,14 @@ out_nfserr: | |||
| 1552 | * Rename a file | 1564 | * Rename a file |
| 1553 | * N.B. After this call _both_ ffhp and tfhp need an fh_put | 1565 | * N.B. After this call _both_ ffhp and tfhp need an fh_put |
| 1554 | */ | 1566 | */ |
| 1555 | int | 1567 | __be32 |
| 1556 | nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, | 1568 | nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, |
| 1557 | struct svc_fh *tfhp, char *tname, int tlen) | 1569 | struct svc_fh *tfhp, char *tname, int tlen) |
| 1558 | { | 1570 | { |
| 1559 | struct dentry *fdentry, *tdentry, *odentry, *ndentry, *trap; | 1571 | struct dentry *fdentry, *tdentry, *odentry, *ndentry, *trap; |
| 1560 | struct inode *fdir, *tdir; | 1572 | struct inode *fdir, *tdir; |
| 1561 | int err; | 1573 | __be32 err; |
| 1574 | int host_err; | ||
| 1562 | 1575 | ||
| 1563 | err = fh_verify(rqstp, ffhp, S_IFDIR, MAY_REMOVE); | 1576 | err = fh_verify(rqstp, ffhp, S_IFDIR, MAY_REMOVE); |
| 1564 | if (err) | 1577 | if (err) |
| @@ -1589,22 +1602,22 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, | |||
| 1589 | fill_pre_wcc(tfhp); | 1602 | fill_pre_wcc(tfhp); |
| 1590 | 1603 | ||
| 1591 | odentry = lookup_one_len(fname, fdentry, flen); | 1604 | odentry = lookup_one_len(fname, fdentry, flen); |
| 1592 | err = PTR_ERR(odentry); | 1605 | host_err = PTR_ERR(odentry); |
| 1593 | if (IS_ERR(odentry)) | 1606 | if (IS_ERR(odentry)) |
| 1594 | goto out_nfserr; | 1607 | goto out_nfserr; |
| 1595 | 1608 | ||
| 1596 | err = -ENOENT; | 1609 | host_err = -ENOENT; |
| 1597 | if (!odentry->d_inode) | 1610 | if (!odentry->d_inode) |
| 1598 | goto out_dput_old; | 1611 | goto out_dput_old; |
| 1599 | err = -EINVAL; | 1612 | host_err = -EINVAL; |
| 1600 | if (odentry == trap) | 1613 | if (odentry == trap) |
| 1601 | goto out_dput_old; | 1614 | goto out_dput_old; |
| 1602 | 1615 | ||
| 1603 | ndentry = lookup_one_len(tname, tdentry, tlen); | 1616 | ndentry = lookup_one_len(tname, tdentry, tlen); |
| 1604 | err = PTR_ERR(ndentry); | 1617 | host_err = PTR_ERR(ndentry); |
| 1605 | if (IS_ERR(ndentry)) | 1618 | if (IS_ERR(ndentry)) |
| 1606 | goto out_dput_old; | 1619 | goto out_dput_old; |
| 1607 | err = -ENOTEMPTY; | 1620 | host_err = -ENOTEMPTY; |
| 1608 | if (ndentry == trap) | 1621 | if (ndentry == trap) |
| 1609 | goto out_dput_new; | 1622 | goto out_dput_new; |
| 1610 | 1623 | ||
| @@ -1612,14 +1625,14 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, | |||
| 1612 | if ((ffhp->fh_export->ex_flags & NFSEXP_MSNFS) && | 1625 | if ((ffhp->fh_export->ex_flags & NFSEXP_MSNFS) && |
| 1613 | ((atomic_read(&odentry->d_count) > 1) | 1626 | ((atomic_read(&odentry->d_count) > 1) |
| 1614 | || (atomic_read(&ndentry->d_count) > 1))) { | 1627 | || (atomic_read(&ndentry->d_count) > 1))) { |
| 1615 | err = -EPERM; | 1628 | host_err = -EPERM; |
| 1616 | } else | 1629 | } else |
| 1617 | #endif | 1630 | #endif |
| 1618 | err = vfs_rename(fdir, odentry, tdir, ndentry); | 1631 | host_err = vfs_rename(fdir, odentry, tdir, ndentry); |
| 1619 | if (!err && EX_ISSYNC(tfhp->fh_export)) { | 1632 | if (!host_err && EX_ISSYNC(tfhp->fh_export)) { |
| 1620 | err = nfsd_sync_dir(tdentry); | 1633 | host_err = nfsd_sync_dir(tdentry); |
| 1621 | if (!err) | 1634 | if (!host_err) |
| 1622 | err = nfsd_sync_dir(fdentry); | 1635 | host_err = nfsd_sync_dir(fdentry); |
| 1623 | } | 1636 | } |
| 1624 | 1637 | ||
| 1625 | out_dput_new: | 1638 | out_dput_new: |
| @@ -1627,8 +1640,7 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, | |||
| 1627 | out_dput_old: | 1640 | out_dput_old: |
| 1628 | dput(odentry); | 1641 | dput(odentry); |
| 1629 | out_nfserr: | 1642 | out_nfserr: |
| 1630 | if (err) | 1643 | err = nfserrno(host_err); |
| 1631 | err = nfserrno(err); | ||
| 1632 | 1644 | ||
| 1633 | /* we cannot reply on fh_unlock on the two filehandles, | 1645 | /* we cannot reply on fh_unlock on the two filehandles, |
| 1634 | * as that would do the wrong thing if the two directories | 1646 | * as that would do the wrong thing if the two directories |
| @@ -1647,13 +1659,14 @@ out: | |||
| 1647 | * Unlink a file or directory | 1659 | * Unlink a file or directory |
| 1648 | * N.B. After this call fhp needs an fh_put | 1660 | * N.B. After this call fhp needs an fh_put |
| 1649 | */ | 1661 | */ |
| 1650 | int | 1662 | __be32 |
| 1651 | nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | 1663 | nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, |
| 1652 | char *fname, int flen) | 1664 | char *fname, int flen) |
| 1653 | { | 1665 | { |
| 1654 | struct dentry *dentry, *rdentry; | 1666 | struct dentry *dentry, *rdentry; |
| 1655 | struct inode *dirp; | 1667 | struct inode *dirp; |
| 1656 | int err; | 1668 | __be32 err; |
| 1669 | int host_err; | ||
| 1657 | 1670 | ||
| 1658 | err = nfserr_acces; | 1671 | err = nfserr_acces; |
| 1659 | if (!flen || isdotent(fname, flen)) | 1672 | if (!flen || isdotent(fname, flen)) |
| @@ -1667,7 +1680,7 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | |||
| 1667 | dirp = dentry->d_inode; | 1680 | dirp = dentry->d_inode; |
| 1668 | 1681 | ||
| 1669 | rdentry = lookup_one_len(fname, dentry, flen); | 1682 | rdentry = lookup_one_len(fname, dentry, flen); |
| 1670 | err = PTR_ERR(rdentry); | 1683 | host_err = PTR_ERR(rdentry); |
| 1671 | if (IS_ERR(rdentry)) | 1684 | if (IS_ERR(rdentry)) |
| 1672 | goto out_nfserr; | 1685 | goto out_nfserr; |
| 1673 | 1686 | ||
| @@ -1684,22 +1697,23 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | |||
| 1684 | #ifdef MSNFS | 1697 | #ifdef MSNFS |
| 1685 | if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) && | 1698 | if ((fhp->fh_export->ex_flags & NFSEXP_MSNFS) && |
| 1686 | (atomic_read(&rdentry->d_count) > 1)) { | 1699 | (atomic_read(&rdentry->d_count) > 1)) { |
| 1687 | err = -EPERM; | 1700 | host_err = -EPERM; |
| 1688 | } else | 1701 | } else |
| 1689 | #endif | 1702 | #endif |
| 1690 | err = vfs_unlink(dirp, rdentry); | 1703 | host_err = vfs_unlink(dirp, rdentry); |
| 1691 | } else { /* It's RMDIR */ | 1704 | } else { /* It's RMDIR */ |
| 1692 | err = vfs_rmdir(dirp, rdentry); | 1705 | host_err = vfs_rmdir(dirp, rdentry); |
| 1693 | } | 1706 | } |
| 1694 | 1707 | ||
| 1695 | dput(rdentry); | 1708 | dput(rdentry); |
| 1696 | 1709 | ||
| 1697 | if (err == 0 && | 1710 | if (host_err) |
| 1698 | EX_ISSYNC(fhp->fh_export)) | 1711 | goto out_nfserr; |
| 1699 | err = nfsd_sync_dir(dentry); | 1712 | if (EX_ISSYNC(fhp->fh_export)) |
| 1713 | host_err = nfsd_sync_dir(dentry); | ||
| 1700 | 1714 | ||
| 1701 | out_nfserr: | 1715 | out_nfserr: |
| 1702 | err = nfserrno(err); | 1716 | err = nfserrno(host_err); |
| 1703 | out: | 1717 | out: |
| 1704 | return err; | 1718 | return err; |
| 1705 | } | 1719 | } |
| @@ -1708,11 +1722,12 @@ out: | |||
| 1708 | * Read entries from a directory. | 1722 | * Read entries from a directory. |
| 1709 | * The NFSv3/4 verifier we ignore for now. | 1723 | * The NFSv3/4 verifier we ignore for now. |
| 1710 | */ | 1724 | */ |
| 1711 | int | 1725 | __be32 |
| 1712 | nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp, | 1726 | nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp, |
| 1713 | struct readdir_cd *cdp, encode_dent_fn func) | 1727 | struct readdir_cd *cdp, encode_dent_fn func) |
| 1714 | { | 1728 | { |
| 1715 | int err; | 1729 | __be32 err; |
| 1730 | int host_err; | ||
| 1716 | struct file *file; | 1731 | struct file *file; |
| 1717 | loff_t offset = *offsetp; | 1732 | loff_t offset = *offsetp; |
| 1718 | 1733 | ||
| @@ -1734,10 +1749,10 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp, | |||
| 1734 | 1749 | ||
| 1735 | do { | 1750 | do { |
| 1736 | cdp->err = nfserr_eof; /* will be cleared on successful read */ | 1751 | cdp->err = nfserr_eof; /* will be cleared on successful read */ |
| 1737 | err = vfs_readdir(file, (filldir_t) func, cdp); | 1752 | host_err = vfs_readdir(file, (filldir_t) func, cdp); |
| 1738 | } while (err >=0 && cdp->err == nfs_ok); | 1753 | } while (host_err >=0 && cdp->err == nfs_ok); |
| 1739 | if (err) | 1754 | if (host_err) |
| 1740 | err = nfserrno(err); | 1755 | err = nfserrno(host_err); |
| 1741 | else | 1756 | else |
| 1742 | err = cdp->err; | 1757 | err = cdp->err; |
| 1743 | *offsetp = vfs_llseek(file, 0, 1); | 1758 | *offsetp = vfs_llseek(file, 0, 1); |
| @@ -1754,10 +1769,10 @@ out: | |||
| 1754 | * Get file system stats | 1769 | * Get file system stats |
| 1755 | * N.B. After this call fhp needs an fh_put | 1770 | * N.B. After this call fhp needs an fh_put |
| 1756 | */ | 1771 | */ |
| 1757 | int | 1772 | __be32 |
| 1758 | nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fhp, struct kstatfs *stat) | 1773 | nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fhp, struct kstatfs *stat) |
| 1759 | { | 1774 | { |
| 1760 | int err = fh_verify(rqstp, fhp, 0, MAY_NOP); | 1775 | __be32 err = fh_verify(rqstp, fhp, 0, MAY_NOP); |
| 1761 | if (!err && vfs_statfs(fhp->fh_dentry,stat)) | 1776 | if (!err && vfs_statfs(fhp->fh_dentry,stat)) |
| 1762 | err = nfserr_io; | 1777 | err = nfserr_io; |
| 1763 | return err; | 1778 | return err; |
| @@ -1766,7 +1781,7 @@ nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fhp, struct kstatfs *stat) | |||
| 1766 | /* | 1781 | /* |
| 1767 | * Check for a user's access permissions to this inode. | 1782 | * Check for a user's access permissions to this inode. |
| 1768 | */ | 1783 | */ |
| 1769 | int | 1784 | __be32 |
| 1770 | nfsd_permission(struct svc_export *exp, struct dentry *dentry, int acc) | 1785 | nfsd_permission(struct svc_export *exp, struct dentry *dentry, int acc) |
| 1771 | { | 1786 | { |
| 1772 | struct inode *inode = dentry->d_inode; | 1787 | struct inode *inode = dentry->d_inode; |
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c index e1fceb8aa32d..d11753c50bc1 100644 --- a/fs/ocfs2/cluster/nodemanager.c +++ b/fs/ocfs2/cluster/nodemanager.c | |||
| @@ -152,14 +152,16 @@ static struct o2nm_node *o2nm_node_ip_tree_lookup(struct o2nm_cluster *cluster, | |||
| 152 | struct o2nm_node *node, *ret = NULL; | 152 | struct o2nm_node *node, *ret = NULL; |
| 153 | 153 | ||
| 154 | while (*p) { | 154 | while (*p) { |
| 155 | int cmp; | ||
| 156 | |||
| 155 | parent = *p; | 157 | parent = *p; |
| 156 | node = rb_entry(parent, struct o2nm_node, nd_ip_node); | 158 | node = rb_entry(parent, struct o2nm_node, nd_ip_node); |
| 157 | 159 | ||
| 158 | if (memcmp(&ip_needle, &node->nd_ipv4_address, | 160 | cmp = memcmp(&ip_needle, &node->nd_ipv4_address, |
| 159 | sizeof(ip_needle)) < 0) | 161 | sizeof(ip_needle)); |
| 162 | if (cmp < 0) | ||
| 160 | p = &(*p)->rb_left; | 163 | p = &(*p)->rb_left; |
| 161 | else if (memcmp(&ip_needle, &node->nd_ipv4_address, | 164 | else if (cmp > 0) |
| 162 | sizeof(ip_needle)) > 0) | ||
| 163 | p = &(*p)->rb_right; | 165 | p = &(*p)->rb_right; |
| 164 | else { | 166 | else { |
| 165 | ret = node; | 167 | ret = node; |
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index d9ba0a931a03..1be74c4e7814 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/highmem.h> | 30 | #include <linux/highmem.h> |
| 31 | #include <linux/pagemap.h> | 31 | #include <linux/pagemap.h> |
| 32 | #include <linux/uio.h> | 32 | #include <linux/uio.h> |
| 33 | #include <linux/sched.h> | ||
| 33 | 34 | ||
| 34 | #define MLOG_MASK_PREFIX ML_INODE | 35 | #define MLOG_MASK_PREFIX ML_INODE |
| 35 | #include <cluster/masklog.h> | 36 | #include <cluster/masklog.h> |
| @@ -691,6 +692,12 @@ static int ocfs2_zero_extend(struct inode *inode, | |||
| 691 | } | 692 | } |
| 692 | 693 | ||
| 693 | start_off += sb->s_blocksize; | 694 | start_off += sb->s_blocksize; |
| 695 | |||
| 696 | /* | ||
| 697 | * Very large extends have the potential to lock up | ||
| 698 | * the cpu for extended periods of time. | ||
| 699 | */ | ||
| 700 | cond_resched(); | ||
| 694 | } | 701 | } |
| 695 | 702 | ||
| 696 | out: | 703 | out: |
| @@ -728,31 +735,36 @@ static int ocfs2_extend_file(struct inode *inode, | |||
| 728 | clusters_to_add = ocfs2_clusters_for_bytes(inode->i_sb, new_i_size) - | 735 | clusters_to_add = ocfs2_clusters_for_bytes(inode->i_sb, new_i_size) - |
| 729 | OCFS2_I(inode)->ip_clusters; | 736 | OCFS2_I(inode)->ip_clusters; |
| 730 | 737 | ||
| 731 | if (clusters_to_add) { | 738 | /* |
| 732 | /* | 739 | * protect the pages that ocfs2_zero_extend is going to be |
| 733 | * protect the pages that ocfs2_zero_extend is going to | 740 | * pulling into the page cache.. we do this before the |
| 734 | * be pulling into the page cache.. we do this before the | 741 | * metadata extend so that we don't get into the situation |
| 735 | * metadata extend so that we don't get into the situation | 742 | * where we've extended the metadata but can't get the data |
| 736 | * where we've extended the metadata but can't get the data | 743 | * lock to zero. |
| 737 | * lock to zero. | 744 | */ |
| 738 | */ | 745 | ret = ocfs2_data_lock(inode, 1); |
| 739 | ret = ocfs2_data_lock(inode, 1); | 746 | if (ret < 0) { |
| 740 | if (ret < 0) { | 747 | mlog_errno(ret); |
| 741 | mlog_errno(ret); | 748 | goto out; |
| 742 | goto out; | 749 | } |
| 743 | } | ||
| 744 | 750 | ||
| 751 | if (clusters_to_add) { | ||
| 745 | ret = ocfs2_extend_allocation(inode, clusters_to_add); | 752 | ret = ocfs2_extend_allocation(inode, clusters_to_add); |
| 746 | if (ret < 0) { | 753 | if (ret < 0) { |
| 747 | mlog_errno(ret); | 754 | mlog_errno(ret); |
| 748 | goto out_unlock; | 755 | goto out_unlock; |
| 749 | } | 756 | } |
| 757 | } | ||
| 750 | 758 | ||
| 751 | ret = ocfs2_zero_extend(inode, (u64)new_i_size - tail_to_skip); | 759 | /* |
| 752 | if (ret < 0) { | 760 | * Call this even if we don't add any clusters to the tree. We |
| 753 | mlog_errno(ret); | 761 | * still need to zero the area between the old i_size and the |
| 754 | goto out_unlock; | 762 | * new i_size. |
| 755 | } | 763 | */ |
| 764 | ret = ocfs2_zero_extend(inode, (u64)new_i_size - tail_to_skip); | ||
| 765 | if (ret < 0) { | ||
| 766 | mlog_errno(ret); | ||
| 767 | goto out_unlock; | ||
| 756 | } | 768 | } |
| 757 | 769 | ||
| 758 | if (!tail_to_skip) { | 770 | if (!tail_to_skip) { |
| @@ -764,8 +776,7 @@ static int ocfs2_extend_file(struct inode *inode, | |||
| 764 | } | 776 | } |
| 765 | 777 | ||
| 766 | out_unlock: | 778 | out_unlock: |
| 767 | if (clusters_to_add) /* this is the only case in which we lock */ | 779 | ocfs2_data_unlock(inode, 1); |
| 768 | ocfs2_data_unlock(inode, 1); | ||
| 769 | 780 | ||
| 770 | out: | 781 | out: |
| 771 | return ret; | 782 | return ret; |
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 259155f0eb2e..a57b751d4f40 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c | |||
| @@ -1085,14 +1085,6 @@ static int ocfs2_rename(struct inode *old_dir, | |||
| 1085 | BUG(); | 1085 | BUG(); |
| 1086 | } | 1086 | } |
| 1087 | 1087 | ||
| 1088 | if (atomic_read(&old_dentry->d_count) > 2) { | ||
| 1089 | shrink_dcache_parent(old_dentry); | ||
| 1090 | if (atomic_read(&old_dentry->d_count) > 2) { | ||
| 1091 | status = -EBUSY; | ||
| 1092 | goto bail; | ||
| 1093 | } | ||
| 1094 | } | ||
| 1095 | |||
| 1096 | /* Assume a directory heirarchy thusly: | 1088 | /* Assume a directory heirarchy thusly: |
| 1097 | * a/b/c | 1089 | * a/b/c |
| 1098 | * a/d | 1090 | * a/d |
diff --git a/fs/proc/base.c b/fs/proc/base.c index 26a8f8416b79..8df27401d292 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -72,6 +72,7 @@ | |||
| 72 | #include <linux/audit.h> | 72 | #include <linux/audit.h> |
| 73 | #include <linux/poll.h> | 73 | #include <linux/poll.h> |
| 74 | #include <linux/nsproxy.h> | 74 | #include <linux/nsproxy.h> |
| 75 | #include <linux/oom.h> | ||
| 75 | #include "internal.h" | 76 | #include "internal.h" |
| 76 | 77 | ||
| 77 | /* NOTE: | 78 | /* NOTE: |
| @@ -689,7 +690,8 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf, | |||
| 689 | if (copy_from_user(buffer, buf, count)) | 690 | if (copy_from_user(buffer, buf, count)) |
| 690 | return -EFAULT; | 691 | return -EFAULT; |
| 691 | oom_adjust = simple_strtol(buffer, &end, 0); | 692 | oom_adjust = simple_strtol(buffer, &end, 0); |
| 692 | if ((oom_adjust < -16 || oom_adjust > 15) && oom_adjust != OOM_DISABLE) | 693 | if ((oom_adjust < OOM_ADJUST_MIN || oom_adjust > OOM_ADJUST_MAX) && |
| 694 | oom_adjust != OOM_DISABLE) | ||
| 693 | return -EINVAL; | 695 | return -EINVAL; |
| 694 | if (*end == '\n') | 696 | if (*end == '\n') |
| 695 | end++; | 697 | end++; |
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index ad8cbc49883a..85ce23268302 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | #include <linux/workqueue.h> | 53 | #include <linux/workqueue.h> |
| 54 | #include <linux/writeback.h> | 54 | #include <linux/writeback.h> |
| 55 | #include <linux/blkdev.h> | 55 | #include <linux/blkdev.h> |
| 56 | #include <linux/backing-dev.h> | ||
| 56 | 57 | ||
| 57 | /* gets a struct reiserfs_journal_list * from a list head */ | 58 | /* gets a struct reiserfs_journal_list * from a list head */ |
| 58 | #define JOURNAL_LIST_ENTRY(h) (list_entry((h), struct reiserfs_journal_list, \ | 59 | #define JOURNAL_LIST_ENTRY(h) (list_entry((h), struct reiserfs_journal_list, \ |
| @@ -970,7 +971,7 @@ int reiserfs_async_progress_wait(struct super_block *s) | |||
| 970 | DEFINE_WAIT(wait); | 971 | DEFINE_WAIT(wait); |
| 971 | struct reiserfs_journal *j = SB_JOURNAL(s); | 972 | struct reiserfs_journal *j = SB_JOURNAL(s); |
| 972 | if (atomic_read(&j->j_async_throttle)) | 973 | if (atomic_read(&j->j_async_throttle)) |
| 973 | blk_congestion_wait(WRITE, HZ / 10); | 974 | congestion_wait(WRITE, HZ / 10); |
| 974 | return 0; | 975 | return 0; |
| 975 | } | 976 | } |
| 976 | 977 | ||
diff --git a/fs/splice.c b/fs/splice.c index a567010b62ac..49fb9f129938 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
| @@ -707,9 +707,9 @@ out_ret: | |||
| 707 | * key here is the 'actor' worker passed in that actually moves the data | 707 | * key here is the 'actor' worker passed in that actually moves the data |
| 708 | * to the wanted destination. See pipe_to_file/pipe_to_sendpage above. | 708 | * to the wanted destination. See pipe_to_file/pipe_to_sendpage above. |
| 709 | */ | 709 | */ |
| 710 | ssize_t splice_from_pipe(struct pipe_inode_info *pipe, struct file *out, | 710 | static ssize_t __splice_from_pipe(struct pipe_inode_info *pipe, |
| 711 | loff_t *ppos, size_t len, unsigned int flags, | 711 | struct file *out, loff_t *ppos, size_t len, |
| 712 | splice_actor *actor) | 712 | unsigned int flags, splice_actor *actor) |
| 713 | { | 713 | { |
| 714 | int ret, do_wakeup, err; | 714 | int ret, do_wakeup, err; |
| 715 | struct splice_desc sd; | 715 | struct splice_desc sd; |
| @@ -722,9 +722,6 @@ ssize_t splice_from_pipe(struct pipe_inode_info *pipe, struct file *out, | |||
| 722 | sd.file = out; | 722 | sd.file = out; |
| 723 | sd.pos = *ppos; | 723 | sd.pos = *ppos; |
| 724 | 724 | ||
| 725 | if (pipe->inode) | ||
| 726 | mutex_lock(&pipe->inode->i_mutex); | ||
| 727 | |||
| 728 | for (;;) { | 725 | for (;;) { |
| 729 | if (pipe->nrbufs) { | 726 | if (pipe->nrbufs) { |
| 730 | struct pipe_buffer *buf = pipe->bufs + pipe->curbuf; | 727 | struct pipe_buffer *buf = pipe->bufs + pipe->curbuf; |
| @@ -797,9 +794,6 @@ ssize_t splice_from_pipe(struct pipe_inode_info *pipe, struct file *out, | |||
| 797 | pipe_wait(pipe); | 794 | pipe_wait(pipe); |
| 798 | } | 795 | } |
| 799 | 796 | ||
| 800 | if (pipe->inode) | ||
| 801 | mutex_unlock(&pipe->inode->i_mutex); | ||
| 802 | |||
| 803 | if (do_wakeup) { | 797 | if (do_wakeup) { |
| 804 | smp_mb(); | 798 | smp_mb(); |
| 805 | if (waitqueue_active(&pipe->wait)) | 799 | if (waitqueue_active(&pipe->wait)) |
| @@ -810,6 +804,73 @@ ssize_t splice_from_pipe(struct pipe_inode_info *pipe, struct file *out, | |||
| 810 | return ret; | 804 | return ret; |
| 811 | } | 805 | } |
| 812 | 806 | ||
| 807 | ssize_t splice_from_pipe(struct pipe_inode_info *pipe, struct file *out, | ||
| 808 | loff_t *ppos, size_t len, unsigned int flags, | ||
| 809 | splice_actor *actor) | ||
| 810 | { | ||
| 811 | ssize_t ret; | ||
| 812 | struct inode *inode = out->f_mapping->host; | ||
| 813 | |||
| 814 | /* | ||
| 815 | * The actor worker might be calling ->prepare_write and | ||
| 816 | * ->commit_write. Most of the time, these expect i_mutex to | ||
| 817 | * be held. Since this may result in an ABBA deadlock with | ||
| 818 | * pipe->inode, we have to order lock acquiry here. | ||
| 819 | */ | ||
| 820 | inode_double_lock(inode, pipe->inode); | ||
| 821 | ret = __splice_from_pipe(pipe, out, ppos, len, flags, actor); | ||
| 822 | inode_double_unlock(inode, pipe->inode); | ||
| 823 | |||
| 824 | return ret; | ||
| 825 | } | ||
| 826 | |||
| 827 | /** | ||
| 828 | * generic_file_splice_write_nolock - generic_file_splice_write without mutexes | ||
| 829 | * @pipe: pipe info | ||
| 830 | * @out: file to write to | ||
| 831 | * @len: number of bytes to splice | ||
| 832 | * @flags: splice modifier flags | ||
| 833 | * | ||
| 834 | * Will either move or copy pages (determined by @flags options) from | ||
| 835 | * the given pipe inode to the given file. The caller is responsible | ||
| 836 | * for acquiring i_mutex on both inodes. | ||
| 837 | * | ||
| 838 | */ | ||
| 839 | ssize_t | ||
| 840 | generic_file_splice_write_nolock(struct pipe_inode_info *pipe, struct file *out, | ||
| 841 | loff_t *ppos, size_t len, unsigned int flags) | ||
| 842 | { | ||
| 843 | struct address_space *mapping = out->f_mapping; | ||
| 844 | struct inode *inode = mapping->host; | ||
| 845 | ssize_t ret; | ||
| 846 | int err; | ||
| 847 | |||
| 848 | err = remove_suid(out->f_dentry); | ||
| 849 | if (unlikely(err)) | ||
| 850 | return err; | ||
| 851 | |||
| 852 | ret = __splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_file); | ||
| 853 | if (ret > 0) { | ||
| 854 | *ppos += ret; | ||
| 855 | |||
| 856 | /* | ||
| 857 | * If file or inode is SYNC and we actually wrote some data, | ||
| 858 | * sync it. | ||
| 859 | */ | ||
| 860 | if (unlikely((out->f_flags & O_SYNC) || IS_SYNC(inode))) { | ||
| 861 | err = generic_osync_inode(inode, mapping, | ||
| 862 | OSYNC_METADATA|OSYNC_DATA); | ||
| 863 | |||
| 864 | if (err) | ||
| 865 | ret = err; | ||
| 866 | } | ||
| 867 | } | ||
| 868 | |||
| 869 | return ret; | ||
| 870 | } | ||
| 871 | |||
| 872 | EXPORT_SYMBOL(generic_file_splice_write_nolock); | ||
| 873 | |||
| 813 | /** | 874 | /** |
| 814 | * generic_file_splice_write - splice data from a pipe to a file | 875 | * generic_file_splice_write - splice data from a pipe to a file |
| 815 | * @pipe: pipe info | 876 | * @pipe: pipe info |
| @@ -826,12 +887,21 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, | |||
| 826 | loff_t *ppos, size_t len, unsigned int flags) | 887 | loff_t *ppos, size_t len, unsigned int flags) |
| 827 | { | 888 | { |
| 828 | struct address_space *mapping = out->f_mapping; | 889 | struct address_space *mapping = out->f_mapping; |
| 890 | struct inode *inode = mapping->host; | ||
| 829 | ssize_t ret; | 891 | ssize_t ret; |
| 892 | int err; | ||
| 893 | |||
| 894 | err = should_remove_suid(out->f_dentry); | ||
| 895 | if (unlikely(err)) { | ||
| 896 | mutex_lock(&inode->i_mutex); | ||
| 897 | err = __remove_suid(out->f_dentry, err); | ||
| 898 | mutex_unlock(&inode->i_mutex); | ||
| 899 | if (err) | ||
| 900 | return err; | ||
| 901 | } | ||
| 830 | 902 | ||
| 831 | ret = splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_file); | 903 | ret = splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_file); |
| 832 | if (ret > 0) { | 904 | if (ret > 0) { |
| 833 | struct inode *inode = mapping->host; | ||
| 834 | |||
| 835 | *ppos += ret; | 905 | *ppos += ret; |
| 836 | 906 | ||
| 837 | /* | 907 | /* |
| @@ -839,8 +909,6 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, | |||
| 839 | * sync it. | 909 | * sync it. |
| 840 | */ | 910 | */ |
| 841 | if (unlikely((out->f_flags & O_SYNC) || IS_SYNC(inode))) { | 911 | if (unlikely((out->f_flags & O_SYNC) || IS_SYNC(inode))) { |
| 842 | int err; | ||
| 843 | |||
| 844 | mutex_lock(&inode->i_mutex); | 912 | mutex_lock(&inode->i_mutex); |
| 845 | err = generic_osync_inode(inode, mapping, | 913 | err = generic_osync_inode(inode, mapping, |
| 846 | OSYNC_METADATA|OSYNC_DATA); | 914 | OSYNC_METADATA|OSYNC_DATA); |
| @@ -1400,13 +1468,7 @@ static int link_pipe(struct pipe_inode_info *ipipe, | |||
| 1400 | * grabbing by inode address. Otherwise two different processes | 1468 | * grabbing by inode address. Otherwise two different processes |
| 1401 | * could deadlock (one doing tee from A -> B, the other from B -> A). | 1469 | * could deadlock (one doing tee from A -> B, the other from B -> A). |
| 1402 | */ | 1470 | */ |
| 1403 | if (ipipe->inode < opipe->inode) { | 1471 | inode_double_lock(ipipe->inode, opipe->inode); |
| 1404 | mutex_lock_nested(&ipipe->inode->i_mutex, I_MUTEX_PARENT); | ||
| 1405 | mutex_lock_nested(&opipe->inode->i_mutex, I_MUTEX_CHILD); | ||
| 1406 | } else { | ||
| 1407 | mutex_lock_nested(&opipe->inode->i_mutex, I_MUTEX_PARENT); | ||
| 1408 | mutex_lock_nested(&ipipe->inode->i_mutex, I_MUTEX_CHILD); | ||
| 1409 | } | ||
| 1410 | 1472 | ||
| 1411 | do { | 1473 | do { |
| 1412 | if (!opipe->readers) { | 1474 | if (!opipe->readers) { |
| @@ -1450,8 +1512,7 @@ static int link_pipe(struct pipe_inode_info *ipipe, | |||
| 1450 | i++; | 1512 | i++; |
| 1451 | } while (len); | 1513 | } while (len); |
| 1452 | 1514 | ||
| 1453 | mutex_unlock(&ipipe->inode->i_mutex); | 1515 | inode_double_unlock(ipipe->inode, opipe->inode); |
| 1454 | mutex_unlock(&opipe->inode->i_mutex); | ||
| 1455 | 1516 | ||
| 1456 | /* | 1517 | /* |
| 1457 | * If we put data in the output pipe, wakeup any potential readers. | 1518 | * If we put data in the output pipe, wakeup any potential readers. |
diff --git a/fs/xfs/linux-2.6/kmem.c b/fs/xfs/linux-2.6/kmem.c index d59737589815..004baf600611 100644 --- a/fs/xfs/linux-2.6/kmem.c +++ b/fs/xfs/linux-2.6/kmem.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/highmem.h> | 21 | #include <linux/highmem.h> |
| 22 | #include <linux/swap.h> | 22 | #include <linux/swap.h> |
| 23 | #include <linux/blkdev.h> | 23 | #include <linux/blkdev.h> |
| 24 | #include <linux/backing-dev.h> | ||
| 24 | #include "time.h" | 25 | #include "time.h" |
| 25 | #include "kmem.h" | 26 | #include "kmem.h" |
| 26 | 27 | ||
| @@ -53,7 +54,7 @@ kmem_alloc(size_t size, unsigned int __nocast flags) | |||
| 53 | printk(KERN_ERR "XFS: possible memory allocation " | 54 | printk(KERN_ERR "XFS: possible memory allocation " |
| 54 | "deadlock in %s (mode:0x%x)\n", | 55 | "deadlock in %s (mode:0x%x)\n", |
| 55 | __FUNCTION__, lflags); | 56 | __FUNCTION__, lflags); |
| 56 | blk_congestion_wait(WRITE, HZ/50); | 57 | congestion_wait(WRITE, HZ/50); |
| 57 | } while (1); | 58 | } while (1); |
| 58 | } | 59 | } |
| 59 | 60 | ||
| @@ -131,7 +132,7 @@ kmem_zone_alloc(kmem_zone_t *zone, unsigned int __nocast flags) | |||
| 131 | printk(KERN_ERR "XFS: possible memory allocation " | 132 | printk(KERN_ERR "XFS: possible memory allocation " |
| 132 | "deadlock in %s (mode:0x%x)\n", | 133 | "deadlock in %s (mode:0x%x)\n", |
| 133 | __FUNCTION__, lflags); | 134 | __FUNCTION__, lflags); |
| 134 | blk_congestion_wait(WRITE, HZ/50); | 135 | congestion_wait(WRITE, HZ/50); |
| 135 | } while (1); | 136 | } while (1); |
| 136 | } | 137 | } |
| 137 | 138 | ||
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c index 9bbadafdcb00..db5f5a3608ca 100644 --- a/fs/xfs/linux-2.6/xfs_buf.c +++ b/fs/xfs/linux-2.6/xfs_buf.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/hash.h> | 30 | #include <linux/hash.h> |
| 31 | #include <linux/kthread.h> | 31 | #include <linux/kthread.h> |
| 32 | #include <linux/migrate.h> | 32 | #include <linux/migrate.h> |
| 33 | #include <linux/backing-dev.h> | ||
| 33 | #include "xfs_linux.h" | 34 | #include "xfs_linux.h" |
| 34 | 35 | ||
| 35 | STATIC kmem_zone_t *xfs_buf_zone; | 36 | STATIC kmem_zone_t *xfs_buf_zone; |
| @@ -395,7 +396,7 @@ _xfs_buf_lookup_pages( | |||
| 395 | 396 | ||
| 396 | XFS_STATS_INC(xb_page_retries); | 397 | XFS_STATS_INC(xb_page_retries); |
| 397 | xfsbufd_wakeup(0, gfp_mask); | 398 | xfsbufd_wakeup(0, gfp_mask); |
| 398 | blk_congestion_wait(WRITE, HZ/50); | 399 | congestion_wait(WRITE, HZ/50); |
| 399 | goto retry; | 400 | goto retry; |
| 400 | } | 401 | } |
| 401 | 402 | ||
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index 1d9573cf4a0b..c92ae0f166ff 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h | |||
| @@ -37,7 +37,10 @@ | |||
| 37 | #endif | 37 | #endif |
| 38 | 38 | ||
| 39 | #ifndef HAVE_ARCH_WARN_ON | 39 | #ifndef HAVE_ARCH_WARN_ON |
| 40 | #define WARN_ON(condition) unlikely((condition)) | 40 | #define WARN_ON(condition) ({ \ |
| 41 | typeof(condition) __ret_warn_on = (condition); \ | ||
| 42 | unlikely(__ret_warn_on); \ | ||
| 43 | }) | ||
| 41 | #endif | 44 | #endif |
| 42 | #endif | 45 | #endif |
| 43 | 46 | ||
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 69240b52f8e1..9d0d11c180d9 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -125,6 +125,10 @@ | |||
| 125 | *(__param) \ | 125 | *(__param) \ |
| 126 | VMLINUX_SYMBOL(__stop___param) = .; \ | 126 | VMLINUX_SYMBOL(__stop___param) = .; \ |
| 127 | } \ | 127 | } \ |
| 128 | \ | ||
| 129 | /* Unwind data binary search table */ \ | ||
| 130 | EH_FRAME_HDR \ | ||
| 131 | \ | ||
| 128 | __end_rodata = .; \ | 132 | __end_rodata = .; \ |
| 129 | . = ALIGN(4096); | 133 | . = ALIGN(4096); |
| 130 | 134 | ||
| @@ -157,6 +161,18 @@ | |||
| 157 | *(.kprobes.text) \ | 161 | *(.kprobes.text) \ |
| 158 | VMLINUX_SYMBOL(__kprobes_text_end) = .; | 162 | VMLINUX_SYMBOL(__kprobes_text_end) = .; |
| 159 | 163 | ||
| 164 | #ifdef CONFIG_STACK_UNWIND | ||
| 165 | /* Unwind data binary search table */ | ||
| 166 | #define EH_FRAME_HDR \ | ||
| 167 | .eh_frame_hdr : AT(ADDR(.eh_frame_hdr) - LOAD_OFFSET) { \ | ||
| 168 | VMLINUX_SYMBOL(__start_unwind_hdr) = .; \ | ||
| 169 | *(.eh_frame_hdr) \ | ||
| 170 | VMLINUX_SYMBOL(__end_unwind_hdr) = .; \ | ||
| 171 | } | ||
| 172 | #else | ||
| 173 | #define EH_FRAME_HDR | ||
| 174 | #endif | ||
| 175 | |||
| 160 | /* DWARF debug sections. | 176 | /* DWARF debug sections. |
| 161 | Symbols in the DWARF debugging sections are relative to | 177 | Symbols in the DWARF debugging sections are relative to |
| 162 | the beginning of the section so we begin them at 0. */ | 178 | the beginning of the section so we begin them at 0. */ |
diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h index 9ab59e2bb233..e3c9925876a3 100644 --- a/include/asm-mips/cacheflush.h +++ b/include/asm-mips/cacheflush.h | |||
| @@ -55,24 +55,13 @@ extern void (*flush_icache_range)(unsigned long start, unsigned long end); | |||
| 55 | #define flush_cache_vmap(start, end) flush_cache_all() | 55 | #define flush_cache_vmap(start, end) flush_cache_all() |
| 56 | #define flush_cache_vunmap(start, end) flush_cache_all() | 56 | #define flush_cache_vunmap(start, end) flush_cache_all() |
| 57 | 57 | ||
| 58 | static inline void copy_to_user_page(struct vm_area_struct *vma, | 58 | extern void copy_to_user_page(struct vm_area_struct *vma, |
| 59 | struct page *page, unsigned long vaddr, void *dst, const void *src, | 59 | struct page *page, unsigned long vaddr, void *dst, const void *src, |
| 60 | unsigned long len) | 60 | unsigned long len); |
| 61 | { | ||
| 62 | if (cpu_has_dc_aliases) | ||
| 63 | flush_cache_page(vma, vaddr, page_to_pfn(page)); | ||
| 64 | memcpy(dst, src, len); | ||
| 65 | __flush_icache_page(vma, page); | ||
| 66 | } | ||
| 67 | 61 | ||
| 68 | static inline void copy_from_user_page(struct vm_area_struct *vma, | 62 | extern void copy_from_user_page(struct vm_area_struct *vma, |
| 69 | struct page *page, unsigned long vaddr, void *dst, const void *src, | 63 | struct page *page, unsigned long vaddr, void *dst, const void *src, |
| 70 | unsigned long len) | 64 | unsigned long len); |
| 71 | { | ||
| 72 | if (cpu_has_dc_aliases) | ||
| 73 | flush_cache_page(vma, vaddr, page_to_pfn(page)); | ||
| 74 | memcpy(dst, src, len); | ||
| 75 | } | ||
| 76 | 65 | ||
| 77 | extern void (*flush_cache_sigtramp)(unsigned long addr); | 66 | extern void (*flush_cache_sigtramp)(unsigned long addr); |
| 78 | extern void (*flush_icache_all)(void); | 67 | extern void (*flush_icache_all)(void); |
diff --git a/include/asm-mips/fixmap.h b/include/asm-mips/fixmap.h index 6959bdb59310..02c8a13fc894 100644 --- a/include/asm-mips/fixmap.h +++ b/include/asm-mips/fixmap.h | |||
| @@ -45,8 +45,16 @@ | |||
| 45 | * fix-mapped? | 45 | * fix-mapped? |
| 46 | */ | 46 | */ |
| 47 | enum fixed_addresses { | 47 | enum fixed_addresses { |
| 48 | #define FIX_N_COLOURS 8 | ||
| 49 | FIX_CMAP_BEGIN, | ||
| 50 | #ifdef CONFIG_MIPS_MT_SMTC | ||
| 51 | FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * NR_CPUS), | ||
| 52 | #else | ||
| 53 | FIX_CMAP_END = FIX_CMAP_BEGIN + FIX_N_COLOURS, | ||
| 54 | #endif | ||
| 48 | #ifdef CONFIG_HIGHMEM | 55 | #ifdef CONFIG_HIGHMEM |
| 49 | FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ | 56 | /* reserved pte's for temporary kernel mappings */ |
| 57 | FIX_KMAP_BEGIN = FIX_CMAP_END + 1, | ||
| 50 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, | 58 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, |
| 51 | #endif | 59 | #endif |
| 52 | __end_of_fixed_addresses | 60 | __end_of_fixed_addresses |
| @@ -70,9 +78,9 @@ extern void __set_fixmap (enum fixed_addresses idx, | |||
| 70 | * at the top of mem.. | 78 | * at the top of mem.. |
| 71 | */ | 79 | */ |
| 72 | #if defined(CONFIG_CPU_TX39XX) || defined(CONFIG_CPU_TX49XX) | 80 | #if defined(CONFIG_CPU_TX39XX) || defined(CONFIG_CPU_TX49XX) |
| 73 | #define FIXADDR_TOP (0xff000000UL - 0x2000) | 81 | #define FIXADDR_TOP ((unsigned long)(long)(int)(0xff000000 - 0x20000)) |
| 74 | #else | 82 | #else |
| 75 | #define FIXADDR_TOP (0xffffe000UL) | 83 | #define FIXADDR_TOP ((unsigned long)(long)(int)0xfffe0000) |
| 76 | #endif | 84 | #endif |
| 77 | #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) | 85 | #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) |
| 78 | #define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) | 86 | #define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) |
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h index c2d124badbe5..bc5f3c53155f 100644 --- a/include/asm-mips/io.h +++ b/include/asm-mips/io.h | |||
| @@ -172,7 +172,7 @@ extern unsigned long isa_slot_offset; | |||
| 172 | #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) | 172 | #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) |
| 173 | 173 | ||
| 174 | extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags); | 174 | extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags); |
| 175 | extern void __iounmap(volatile void __iomem *addr); | 175 | extern void __iounmap(const volatile void __iomem *addr); |
| 176 | 176 | ||
| 177 | static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size, | 177 | static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size, |
| 178 | unsigned long flags) | 178 | unsigned long flags) |
| @@ -279,7 +279,7 @@ static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size, | |||
| 279 | #define ioremap_uncached_accelerated(offset, size) \ | 279 | #define ioremap_uncached_accelerated(offset, size) \ |
| 280 | __ioremap_mode((offset), (size), _CACHE_UNCACHED_ACCELERATED) | 280 | __ioremap_mode((offset), (size), _CACHE_UNCACHED_ACCELERATED) |
| 281 | 281 | ||
| 282 | static inline void iounmap(volatile void __iomem *addr) | 282 | static inline void iounmap(const volatile void __iomem *addr) |
| 283 | { | 283 | { |
| 284 | #define __IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == CKSEG1) | 284 | #define __IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == CKSEG1) |
| 285 | 285 | ||
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h index 685c91467e63..30240a445dbb 100644 --- a/include/asm-mips/unistd.h +++ b/include/asm-mips/unistd.h | |||
| @@ -331,16 +331,17 @@ | |||
| 331 | #define __NR_move_pages (__NR_Linux + 308) | 331 | #define __NR_move_pages (__NR_Linux + 308) |
| 332 | #define __NR_set_robust_list (__NR_Linux + 309) | 332 | #define __NR_set_robust_list (__NR_Linux + 309) |
| 333 | #define __NR_get_robust_list (__NR_Linux + 310) | 333 | #define __NR_get_robust_list (__NR_Linux + 310) |
| 334 | #define __NR_kexec_load (__NR_Linux + 311) | ||
| 334 | 335 | ||
| 335 | /* | 336 | /* |
| 336 | * Offset of the last Linux o32 flavoured syscall | 337 | * Offset of the last Linux o32 flavoured syscall |
| 337 | */ | 338 | */ |
| 338 | #define __NR_Linux_syscalls 310 | 339 | #define __NR_Linux_syscalls 311 |
| 339 | 340 | ||
| 340 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 341 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
| 341 | 342 | ||
| 342 | #define __NR_O32_Linux 4000 | 343 | #define __NR_O32_Linux 4000 |
| 343 | #define __NR_O32_Linux_syscalls 310 | 344 | #define __NR_O32_Linux_syscalls 311 |
| 344 | 345 | ||
| 345 | #if _MIPS_SIM == _MIPS_SIM_ABI64 | 346 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
| 346 | 347 | ||
| @@ -618,16 +619,17 @@ | |||
| 618 | #define __NR_move_pages (__NR_Linux + 267) | 619 | #define __NR_move_pages (__NR_Linux + 267) |
| 619 | #define __NR_set_robust_list (__NR_Linux + 268) | 620 | #define __NR_set_robust_list (__NR_Linux + 268) |
| 620 | #define __NR_get_robust_list (__NR_Linux + 269) | 621 | #define __NR_get_robust_list (__NR_Linux + 269) |
| 622 | #define __NR_kexec_load (__NR_Linux + 270) | ||
| 621 | 623 | ||
| 622 | /* | 624 | /* |
| 623 | * Offset of the last Linux 64-bit flavoured syscall | 625 | * Offset of the last Linux 64-bit flavoured syscall |
| 624 | */ | 626 | */ |
| 625 | #define __NR_Linux_syscalls 269 | 627 | #define __NR_Linux_syscalls 270 |
| 626 | 628 | ||
| 627 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ | 629 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ |
| 628 | 630 | ||
| 629 | #define __NR_64_Linux 5000 | 631 | #define __NR_64_Linux 5000 |
| 630 | #define __NR_64_Linux_syscalls 269 | 632 | #define __NR_64_Linux_syscalls 270 |
| 631 | 633 | ||
| 632 | #if _MIPS_SIM == _MIPS_SIM_NABI32 | 634 | #if _MIPS_SIM == _MIPS_SIM_NABI32 |
| 633 | 635 | ||
| @@ -909,16 +911,17 @@ | |||
| 909 | #define __NR_move_pages (__NR_Linux + 271) | 911 | #define __NR_move_pages (__NR_Linux + 271) |
| 910 | #define __NR_set_robust_list (__NR_Linux + 272) | 912 | #define __NR_set_robust_list (__NR_Linux + 272) |
| 911 | #define __NR_get_robust_list (__NR_Linux + 273) | 913 | #define __NR_get_robust_list (__NR_Linux + 273) |
| 914 | #define __NR_kexec_load (__NR_Linux + 274) | ||
| 912 | 915 | ||
| 913 | /* | 916 | /* |
| 914 | * Offset of the last N32 flavoured syscall | 917 | * Offset of the last N32 flavoured syscall |
| 915 | */ | 918 | */ |
| 916 | #define __NR_Linux_syscalls 273 | 919 | #define __NR_Linux_syscalls 274 |
| 917 | 920 | ||
| 918 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ | 921 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
| 919 | 922 | ||
| 920 | #define __NR_N32_Linux 6000 | 923 | #define __NR_N32_Linux 6000 |
| 921 | #define __NR_N32_Linux_syscalls 273 | 924 | #define __NR_N32_Linux_syscalls 274 |
| 922 | 925 | ||
| 923 | #ifdef __KERNEL__ | 926 | #ifdef __KERNEL__ |
| 924 | 927 | ||
diff --git a/include/asm-mips/vr41xx/vr41xx.h b/include/asm-mips/vr41xx/vr41xx.h index dd3eb3dc5886..88b492f6ea9c 100644 --- a/include/asm-mips/vr41xx/vr41xx.h +++ b/include/asm-mips/vr41xx/vr41xx.h | |||
| @@ -75,7 +75,7 @@ extern void vr41xx_mask_clock(vr41xx_clock_t clock); | |||
| 75 | * Interrupt Control Unit | 75 | * Interrupt Control Unit |
| 76 | */ | 76 | */ |
| 77 | extern int vr41xx_set_intassign(unsigned int irq, unsigned char intassign); | 77 | extern int vr41xx_set_intassign(unsigned int irq, unsigned char intassign); |
| 78 | extern int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int, struct pt_regs *)); | 78 | extern int cascade_irq(unsigned int irq, int (*get_irq)(unsigned int)); |
| 79 | 79 | ||
| 80 | #define PIUINT_COMMAND 0x0040 | 80 | #define PIUINT_COMMAND 0x0040 |
| 81 | #define PIUINT_DATA 0x0020 | 81 | #define PIUINT_DATA 0x0020 |
diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h index 83a3dd15a6ed..aaf6ef40ee2f 100644 --- a/include/asm-sparc/elf.h +++ b/include/asm-sparc/elf.h | |||
| @@ -8,11 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | #include <asm/ptrace.h> | 9 | #include <asm/ptrace.h> |
| 10 | 10 | ||
| 11 | #ifdef __KERNEL__ | ||
| 12 | #include <asm/mbus.h> | ||
| 13 | #include <asm/uaccess.h> | ||
| 14 | #endif | ||
| 15 | |||
| 16 | /* | 11 | /* |
| 17 | * Sparc section types | 12 | * Sparc section types |
| 18 | */ | 13 | */ |
| @@ -77,6 +72,23 @@ typedef unsigned long elf_greg_t; | |||
| 77 | #define ELF_NGREG 38 | 72 | #define ELF_NGREG 38 |
| 78 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; | 73 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; |
| 79 | 74 | ||
| 75 | typedef struct { | ||
| 76 | union { | ||
| 77 | unsigned long pr_regs[32]; | ||
| 78 | double pr_dregs[16]; | ||
| 79 | } pr_fr; | ||
| 80 | unsigned long __unused; | ||
| 81 | unsigned long pr_fsr; | ||
| 82 | unsigned char pr_qcnt; | ||
| 83 | unsigned char pr_q_entrysize; | ||
| 84 | unsigned char pr_en; | ||
| 85 | unsigned int pr_q[64]; | ||
| 86 | } elf_fpregset_t; | ||
| 87 | |||
| 88 | #ifdef __KERNEL__ | ||
| 89 | #include <asm/mbus.h> | ||
| 90 | #include <asm/uaccess.h> | ||
| 91 | |||
| 80 | /* Format is: | 92 | /* Format is: |
| 81 | * G0 --> G7 | 93 | * G0 --> G7 |
| 82 | * O0 --> O7 | 94 | * O0 --> O7 |
| @@ -99,20 +111,7 @@ do { unsigned long *dest = &(__elf_regs[0]); \ | |||
| 99 | dest[34] = src->npc; \ | 111 | dest[34] = src->npc; \ |
| 100 | dest[35] = src->y; \ | 112 | dest[35] = src->y; \ |
| 101 | dest[36] = dest[37] = 0; /* XXX */ \ | 113 | dest[36] = dest[37] = 0; /* XXX */ \ |
| 102 | } while(0); /* Janitors: Don't touch this colon. */ | 114 | } while(0); /* Janitors: Don't touch this semicolon. */ |
| 103 | |||
| 104 | typedef struct { | ||
| 105 | union { | ||
| 106 | unsigned long pr_regs[32]; | ||
| 107 | double pr_dregs[16]; | ||
| 108 | } pr_fr; | ||
| 109 | unsigned long __unused; | ||
| 110 | unsigned long pr_fsr; | ||
| 111 | unsigned char pr_qcnt; | ||
| 112 | unsigned char pr_q_entrysize; | ||
| 113 | unsigned char pr_en; | ||
| 114 | unsigned int pr_q[64]; | ||
| 115 | } elf_fpregset_t; | ||
| 116 | 115 | ||
| 117 | #define ELF_CORE_COPY_TASK_REGS(__tsk, __elf_regs) \ | 116 | #define ELF_CORE_COPY_TASK_REGS(__tsk, __elf_regs) \ |
| 118 | ({ ELF_CORE_COPY_REGS((*(__elf_regs)), (__tsk)->thread.kregs); 1; }) | 117 | ({ ELF_CORE_COPY_REGS((*(__elf_regs)), (__tsk)->thread.kregs); 1; }) |
| @@ -165,8 +164,8 @@ typedef struct { | |||
| 165 | 164 | ||
| 166 | #define ELF_PLATFORM (NULL) | 165 | #define ELF_PLATFORM (NULL) |
| 167 | 166 | ||
| 168 | #ifdef __KERNEL__ | ||
| 169 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) | 167 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) |
| 170 | #endif | 168 | |
| 169 | #endif /* __KERNEL__ */ | ||
| 171 | 170 | ||
| 172 | #endif /* !(__ASMSPARC_ELF_H) */ | 171 | #endif /* !(__ASMSPARC_ELF_H) */ |
diff --git a/include/asm-um/archparam-ppc.h b/include/asm-um/archparam-ppc.h index 172cd6ffacc4..4269d8a37b4f 100644 --- a/include/asm-um/archparam-ppc.h +++ b/include/asm-um/archparam-ppc.h | |||
| @@ -1,15 +1,6 @@ | |||
| 1 | #ifndef __UM_ARCHPARAM_PPC_H | 1 | #ifndef __UM_ARCHPARAM_PPC_H |
| 2 | #define __UM_ARCHPARAM_PPC_H | 2 | #define __UM_ARCHPARAM_PPC_H |
| 3 | 3 | ||
| 4 | /********* Bits for asm-um/hw_irq.h **********/ | ||
| 5 | |||
| 6 | struct hw_interrupt_type; | ||
| 7 | |||
| 8 | /********* Bits for asm-um/hardirq.h **********/ | ||
| 9 | |||
| 10 | #define irq_enter(cpu, irq) hardirq_enter(cpu) | ||
| 11 | #define irq_exit(cpu, irq) hardirq_exit(cpu) | ||
| 12 | |||
| 13 | /********* Bits for asm-um/string.h **********/ | 4 | /********* Bits for asm-um/string.h **********/ |
| 14 | 5 | ||
| 15 | #define __HAVE_ARCH_STRRCHR | 6 | #define __HAVE_ARCH_STRRCHR |
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h index 6899e770b173..0555c1c4d8fa 100644 --- a/include/asm-x86_64/pgtable.h +++ b/include/asm-x86_64/pgtable.h | |||
| @@ -366,6 +366,7 @@ static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot) | |||
| 366 | { | 366 | { |
| 367 | pte_t pte; | 367 | pte_t pte; |
| 368 | pte_val(pte) = physpage | pgprot_val(pgprot); | 368 | pte_val(pte) = physpage | pgprot_val(pgprot); |
| 369 | pte_val(pte) &= __supported_pte_mask; | ||
| 369 | return pte; | 370 | return pte; |
| 370 | } | 371 | } |
| 371 | 372 | ||
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index c181fef786e4..e72cfcdf5344 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h | |||
| @@ -122,6 +122,8 @@ extern int fix_aperture; | |||
| 122 | extern int reboot_force; | 122 | extern int reboot_force; |
| 123 | extern int notsc_setup(char *); | 123 | extern int notsc_setup(char *); |
| 124 | 124 | ||
| 125 | extern int timer_over_8254; | ||
| 126 | |||
| 125 | extern int gsi_irq_sharing(int gsi); | 127 | extern int gsi_irq_sharing(int gsi); |
| 126 | 128 | ||
| 127 | extern void smp_local_timer_interrupt(void); | 129 | extern void smp_local_timer_interrupt(void); |
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 5114ff18101d..a1155a2beb32 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -120,6 +120,7 @@ header-y += netrom.h | |||
| 120 | header-y += nfs2.h | 120 | header-y += nfs2.h |
| 121 | header-y += nfs4_mount.h | 121 | header-y += nfs4_mount.h |
| 122 | header-y += nfs_mount.h | 122 | header-y += nfs_mount.h |
| 123 | header-y += oom.h | ||
| 123 | header-y += param.h | 124 | header-y += param.h |
| 124 | header-y += pci_ids.h | 125 | header-y += pci_ids.h |
| 125 | header-y += pci_regs.h | 126 | header-y += pci_regs.h |
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index f7a1390d67f5..7011d6255593 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h | |||
| @@ -10,6 +10,8 @@ | |||
| 10 | 10 | ||
| 11 | #include <asm/atomic.h> | 11 | #include <asm/atomic.h> |
| 12 | 12 | ||
| 13 | struct page; | ||
| 14 | |||
| 13 | /* | 15 | /* |
| 14 | * Bits in backing_dev_info.state | 16 | * Bits in backing_dev_info.state |
| 15 | */ | 17 | */ |
| @@ -88,6 +90,11 @@ static inline int bdi_rw_congested(struct backing_dev_info *bdi) | |||
| 88 | (1 << BDI_write_congested)); | 90 | (1 << BDI_write_congested)); |
| 89 | } | 91 | } |
| 90 | 92 | ||
| 93 | void clear_bdi_congested(struct backing_dev_info *bdi, int rw); | ||
| 94 | void set_bdi_congested(struct backing_dev_info *bdi, int rw); | ||
| 95 | long congestion_wait(int rw, long timeout); | ||
| 96 | void congestion_end(int rw); | ||
| 97 | |||
| 91 | #define bdi_cap_writeback_dirty(bdi) \ | 98 | #define bdi_cap_writeback_dirty(bdi) \ |
| 92 | (!((bdi)->capabilities & BDI_CAP_NO_WRITEBACK)) | 99 | (!((bdi)->capabilities & BDI_CAP_NO_WRITEBACK)) |
| 93 | 100 | ||
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d370d2cfe138..7bfcde2d5578 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -651,6 +651,26 @@ extern void blk_recount_segments(request_queue_t *, struct bio *); | |||
| 651 | extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __user *); | 651 | extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __user *); |
| 652 | extern int sg_scsi_ioctl(struct file *, struct request_queue *, | 652 | extern int sg_scsi_ioctl(struct file *, struct request_queue *, |
| 653 | struct gendisk *, struct scsi_ioctl_command __user *); | 653 | struct gendisk *, struct scsi_ioctl_command __user *); |
| 654 | |||
| 655 | /* | ||
| 656 | * A queue has just exitted congestion. Note this in the global counter of | ||
| 657 | * congested queues, and wake up anyone who was waiting for requests to be | ||
| 658 | * put back. | ||
| 659 | */ | ||
| 660 | static inline void blk_clear_queue_congested(request_queue_t *q, int rw) | ||
| 661 | { | ||
| 662 | clear_bdi_congested(&q->backing_dev_info, rw); | ||
| 663 | } | ||
| 664 | |||
| 665 | /* | ||
| 666 | * A queue has just entered congestion. Flag that in the queue's VM-visible | ||
| 667 | * state flags and increment the global gounter of congested queues. | ||
| 668 | */ | ||
| 669 | static inline void blk_set_queue_congested(request_queue_t *q, int rw) | ||
| 670 | { | ||
| 671 | set_bdi_congested(&q->backing_dev_info, rw); | ||
| 672 | } | ||
| 673 | |||
| 654 | extern void blk_start_queue(request_queue_t *q); | 674 | extern void blk_start_queue(request_queue_t *q); |
| 655 | extern void blk_stop_queue(request_queue_t *q); | 675 | extern void blk_stop_queue(request_queue_t *q); |
| 656 | extern void blk_sync_queue(struct request_queue *q); | 676 | extern void blk_sync_queue(struct request_queue *q); |
| @@ -765,10 +785,8 @@ extern int blk_queue_init_tags(request_queue_t *, int, struct blk_queue_tag *); | |||
| 765 | extern void blk_queue_free_tags(request_queue_t *); | 785 | extern void blk_queue_free_tags(request_queue_t *); |
| 766 | extern int blk_queue_resize_tags(request_queue_t *, int); | 786 | extern int blk_queue_resize_tags(request_queue_t *, int); |
| 767 | extern void blk_queue_invalidate_tags(request_queue_t *); | 787 | extern void blk_queue_invalidate_tags(request_queue_t *); |
| 768 | extern long blk_congestion_wait(int rw, long timeout); | ||
| 769 | extern struct blk_queue_tag *blk_init_tags(int); | 788 | extern struct blk_queue_tag *blk_init_tags(int); |
| 770 | extern void blk_free_tags(struct blk_queue_tag *); | 789 | extern void blk_free_tags(struct blk_queue_tag *); |
| 771 | extern void blk_congestion_end(int rw); | ||
| 772 | 790 | ||
| 773 | static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt, | 791 | static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt, |
| 774 | int tag) | 792 | int tag) |
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h index cfdb4f6a89d4..c26c3adcfacf 100644 --- a/include/linux/compat_ioctl.h +++ b/include/linux/compat_ioctl.h | |||
| @@ -131,6 +131,7 @@ COMPATIBLE_IOCTL(RUN_ARRAY) | |||
| 131 | COMPATIBLE_IOCTL(STOP_ARRAY) | 131 | COMPATIBLE_IOCTL(STOP_ARRAY) |
| 132 | COMPATIBLE_IOCTL(STOP_ARRAY_RO) | 132 | COMPATIBLE_IOCTL(STOP_ARRAY_RO) |
| 133 | COMPATIBLE_IOCTL(RESTART_ARRAY_RW) | 133 | COMPATIBLE_IOCTL(RESTART_ARRAY_RW) |
| 134 | COMPATIBLE_IOCTL(GET_BITMAP_FILE) | ||
| 134 | ULONG_IOCTL(SET_BITMAP_FILE) | 135 | ULONG_IOCTL(SET_BITMAP_FILE) |
| 135 | /* DM */ | 136 | /* DM */ |
| 136 | COMPATIBLE_IOCTL(DM_VERSION_32) | 137 | COMPATIBLE_IOCTL(DM_VERSION_32) |
diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 38dc403be70b..904bf3d2d90b 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h | |||
| @@ -69,6 +69,7 @@ extern struct dmi_device * dmi_find_device(int type, const char *name, | |||
| 69 | struct dmi_device *from); | 69 | struct dmi_device *from); |
| 70 | extern void dmi_scan_machine(void); | 70 | extern void dmi_scan_machine(void); |
| 71 | extern int dmi_get_year(int field); | 71 | extern int dmi_get_year(int field); |
| 72 | extern int dmi_name_in_vendors(char *str); | ||
| 72 | 73 | ||
| 73 | #else | 74 | #else |
| 74 | 75 | ||
| @@ -77,6 +78,7 @@ static inline char * dmi_get_system_info(int field) { return NULL; } | |||
| 77 | static inline struct dmi_device * dmi_find_device(int type, const char *name, | 78 | static inline struct dmi_device * dmi_find_device(int type, const char *name, |
| 78 | struct dmi_device *from) { return NULL; } | 79 | struct dmi_device *from) { return NULL; } |
| 79 | static inline int dmi_get_year(int year) { return 0; } | 80 | static inline int dmi_get_year(int year) { return 0; } |
| 81 | static inline int dmi_name_in_vendors(char *s) { return 0; } | ||
| 80 | 82 | ||
| 81 | #endif | 83 | #endif |
| 82 | 84 | ||
diff --git a/include/linux/fs.h b/include/linux/fs.h index 661c7c572149..2fe6e3f900ba 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -623,6 +623,9 @@ enum inode_i_mutex_lock_class | |||
| 623 | I_MUTEX_QUOTA | 623 | I_MUTEX_QUOTA |
| 624 | }; | 624 | }; |
| 625 | 625 | ||
| 626 | extern void inode_double_lock(struct inode *inode1, struct inode *inode2); | ||
| 627 | extern void inode_double_unlock(struct inode *inode1, struct inode *inode2); | ||
| 628 | |||
| 626 | /* | 629 | /* |
| 627 | * NOTE: in a 32bit arch with a preemptable kernel and | 630 | * NOTE: in a 32bit arch with a preemptable kernel and |
| 628 | * an UP compile the i_size_read/write must be atomic | 631 | * an UP compile the i_size_read/write must be atomic |
| @@ -1709,6 +1712,8 @@ extern void __iget(struct inode * inode); | |||
| 1709 | extern void clear_inode(struct inode *); | 1712 | extern void clear_inode(struct inode *); |
| 1710 | extern void destroy_inode(struct inode *); | 1713 | extern void destroy_inode(struct inode *); |
| 1711 | extern struct inode *new_inode(struct super_block *); | 1714 | extern struct inode *new_inode(struct super_block *); |
| 1715 | extern int __remove_suid(struct dentry *, int); | ||
| 1716 | extern int should_remove_suid(struct dentry *); | ||
| 1712 | extern int remove_suid(struct dentry *); | 1717 | extern int remove_suid(struct dentry *); |
| 1713 | extern void remove_dquot_ref(struct super_block *, int, struct list_head *); | 1718 | extern void remove_dquot_ref(struct super_block *, int, struct list_head *); |
| 1714 | 1719 | ||
| @@ -1755,6 +1760,8 @@ extern ssize_t generic_file_splice_read(struct file *, loff_t *, | |||
| 1755 | struct pipe_inode_info *, size_t, unsigned int); | 1760 | struct pipe_inode_info *, size_t, unsigned int); |
| 1756 | extern ssize_t generic_file_splice_write(struct pipe_inode_info *, | 1761 | extern ssize_t generic_file_splice_write(struct pipe_inode_info *, |
| 1757 | struct file *, loff_t *, size_t, unsigned int); | 1762 | struct file *, loff_t *, size_t, unsigned int); |
| 1763 | extern ssize_t generic_file_splice_write_nolock(struct pipe_inode_info *, | ||
| 1764 | struct file *, loff_t *, size_t, unsigned int); | ||
| 1758 | extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, | 1765 | extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, |
| 1759 | struct file *out, loff_t *, size_t len, unsigned int flags); | 1766 | struct file *out, loff_t *, size_t len, unsigned int flags); |
| 1760 | extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, | 1767 | extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, |
diff --git a/include/linux/irq.h b/include/linux/irq.h index 775f5a7da493..52fc4052a0ae 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
| @@ -322,6 +322,9 @@ extern struct irq_chip no_irq_chip; | |||
| 322 | extern struct irq_chip dummy_irq_chip; | 322 | extern struct irq_chip dummy_irq_chip; |
| 323 | 323 | ||
| 324 | extern void | 324 | extern void |
| 325 | set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip, | ||
| 326 | irq_flow_handler_t handle); | ||
| 327 | extern void | ||
| 325 | set_irq_chip_and_handler_name(unsigned int irq, struct irq_chip *chip, | 328 | set_irq_chip_and_handler_name(unsigned int irq, struct irq_chip *chip, |
| 326 | irq_flow_handler_t handle, const char *name); | 329 | irq_flow_handler_t handle, const char *name); |
| 327 | 330 | ||
diff --git a/include/linux/libata.h b/include/linux/libata.h index d0a7ad5ed518..b03d5a340dc8 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -143,7 +143,7 @@ enum { | |||
| 143 | ATA_DFLAG_CFG_MASK = (1 << 8) - 1, | 143 | ATA_DFLAG_CFG_MASK = (1 << 8) - 1, |
| 144 | 144 | ||
| 145 | ATA_DFLAG_PIO = (1 << 8), /* device limited to PIO mode */ | 145 | ATA_DFLAG_PIO = (1 << 8), /* device limited to PIO mode */ |
| 146 | ATA_DFLAG_NCQ_OFF = (1 << 9), /* devied limited to non-NCQ mode */ | 146 | ATA_DFLAG_NCQ_OFF = (1 << 9), /* device limited to non-NCQ mode */ |
| 147 | ATA_DFLAG_SUSPENDED = (1 << 10), /* device suspended */ | 147 | ATA_DFLAG_SUSPENDED = (1 << 10), /* device suspended */ |
| 148 | ATA_DFLAG_INIT_MASK = (1 << 16) - 1, | 148 | ATA_DFLAG_INIT_MASK = (1 << 16) - 1, |
| 149 | 149 | ||
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 2909619c0295..862d9730a60d 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
| @@ -154,7 +154,7 @@ int nlm_async_reply(struct nlm_rqst *, u32, const struct rpc_call_ops *); | |||
| 154 | struct nlm_wait * nlmclnt_prepare_block(struct nlm_host *host, struct file_lock *fl); | 154 | struct nlm_wait * nlmclnt_prepare_block(struct nlm_host *host, struct file_lock *fl); |
| 155 | void nlmclnt_finish_block(struct nlm_wait *block); | 155 | void nlmclnt_finish_block(struct nlm_wait *block); |
| 156 | int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout); | 156 | int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout); |
| 157 | u32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *); | 157 | __be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *); |
| 158 | void nlmclnt_recovery(struct nlm_host *); | 158 | void nlmclnt_recovery(struct nlm_host *); |
| 159 | int nlmclnt_reclaim(struct nlm_host *, struct file_lock *); | 159 | int nlmclnt_reclaim(struct nlm_host *, struct file_lock *); |
| 160 | void nlmclnt_next_cookie(struct nlm_cookie *); | 160 | void nlmclnt_next_cookie(struct nlm_cookie *); |
| @@ -184,12 +184,12 @@ typedef int (*nlm_host_match_fn_t)(struct nlm_host *cur, struct nlm_host *ref) | |||
| 184 | /* | 184 | /* |
| 185 | * Server-side lock handling | 185 | * Server-side lock handling |
| 186 | */ | 186 | */ |
| 187 | u32 nlmsvc_lock(struct svc_rqst *, struct nlm_file *, | 187 | __be32 nlmsvc_lock(struct svc_rqst *, struct nlm_file *, |
| 188 | struct nlm_lock *, int, struct nlm_cookie *); | 188 | struct nlm_lock *, int, struct nlm_cookie *); |
| 189 | u32 nlmsvc_unlock(struct nlm_file *, struct nlm_lock *); | 189 | __be32 nlmsvc_unlock(struct nlm_file *, struct nlm_lock *); |
| 190 | u32 nlmsvc_testlock(struct nlm_file *, struct nlm_lock *, | 190 | __be32 nlmsvc_testlock(struct nlm_file *, struct nlm_lock *, |
| 191 | struct nlm_lock *); | 191 | struct nlm_lock *); |
| 192 | u32 nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *); | 192 | __be32 nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *); |
| 193 | unsigned long nlmsvc_retry_blocked(void); | 193 | unsigned long nlmsvc_retry_blocked(void); |
| 194 | void nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *, | 194 | void nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *, |
| 195 | nlm_host_match_fn_t match); | 195 | nlm_host_match_fn_t match); |
| @@ -198,7 +198,7 @@ void nlmsvc_grant_reply(struct nlm_cookie *, u32); | |||
| 198 | /* | 198 | /* |
| 199 | * File handling for the server personality | 199 | * File handling for the server personality |
| 200 | */ | 200 | */ |
| 201 | u32 nlm_lookup_file(struct svc_rqst *, struct nlm_file **, | 201 | __be32 nlm_lookup_file(struct svc_rqst *, struct nlm_file **, |
| 202 | struct nfs_fh *); | 202 | struct nfs_fh *); |
| 203 | void nlm_release_file(struct nlm_file *); | 203 | void nlm_release_file(struct nlm_file *); |
| 204 | void nlmsvc_mark_resources(void); | 204 | void nlmsvc_mark_resources(void); |
diff --git a/include/linux/lockd/share.h b/include/linux/lockd/share.h index cd7816e74c05..630c5bf69b07 100644 --- a/include/linux/lockd/share.h +++ b/include/linux/lockd/share.h | |||
| @@ -21,9 +21,9 @@ struct nlm_share { | |||
| 21 | u32 s_mode; /* deny mode */ | 21 | u32 s_mode; /* deny mode */ |
| 22 | }; | 22 | }; |
| 23 | 23 | ||
| 24 | u32 nlmsvc_share_file(struct nlm_host *, struct nlm_file *, | 24 | __be32 nlmsvc_share_file(struct nlm_host *, struct nlm_file *, |
| 25 | struct nlm_args *); | 25 | struct nlm_args *); |
| 26 | u32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *, | 26 | __be32 nlmsvc_unshare_file(struct nlm_host *, struct nlm_file *, |
| 27 | struct nlm_args *); | 27 | struct nlm_args *); |
| 28 | void nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *, | 28 | void nlmsvc_traverse_shares(struct nlm_host *, struct nlm_file *, |
| 29 | nlm_host_match_fn_t); | 29 | nlm_host_match_fn_t); |
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h index 66fdae3b490c..29e7d9fc9dad 100644 --- a/include/linux/lockd/xdr.h +++ b/include/linux/lockd/xdr.h | |||
| @@ -90,19 +90,19 @@ struct nlm_reboot { | |||
| 90 | */ | 90 | */ |
| 91 | #define NLMSVC_XDRSIZE sizeof(struct nlm_args) | 91 | #define NLMSVC_XDRSIZE sizeof(struct nlm_args) |
| 92 | 92 | ||
| 93 | int nlmsvc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *); | 93 | int nlmsvc_decode_testargs(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 94 | int nlmsvc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *); | 94 | int nlmsvc_encode_testres(struct svc_rqst *, __be32 *, struct nlm_res *); |
| 95 | int nlmsvc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *); | 95 | int nlmsvc_decode_lockargs(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 96 | int nlmsvc_decode_cancargs(struct svc_rqst *, u32 *, struct nlm_args *); | 96 | int nlmsvc_decode_cancargs(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 97 | int nlmsvc_decode_unlockargs(struct svc_rqst *, u32 *, struct nlm_args *); | 97 | int nlmsvc_decode_unlockargs(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 98 | int nlmsvc_encode_res(struct svc_rqst *, u32 *, struct nlm_res *); | 98 | int nlmsvc_encode_res(struct svc_rqst *, __be32 *, struct nlm_res *); |
| 99 | int nlmsvc_decode_res(struct svc_rqst *, u32 *, struct nlm_res *); | 99 | int nlmsvc_decode_res(struct svc_rqst *, __be32 *, struct nlm_res *); |
| 100 | int nlmsvc_encode_void(struct svc_rqst *, u32 *, void *); | 100 | int nlmsvc_encode_void(struct svc_rqst *, __be32 *, void *); |
| 101 | int nlmsvc_decode_void(struct svc_rqst *, u32 *, void *); | 101 | int nlmsvc_decode_void(struct svc_rqst *, __be32 *, void *); |
| 102 | int nlmsvc_decode_shareargs(struct svc_rqst *, u32 *, struct nlm_args *); | 102 | int nlmsvc_decode_shareargs(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 103 | int nlmsvc_encode_shareres(struct svc_rqst *, u32 *, struct nlm_res *); | 103 | int nlmsvc_encode_shareres(struct svc_rqst *, __be32 *, struct nlm_res *); |
| 104 | int nlmsvc_decode_notify(struct svc_rqst *, u32 *, struct nlm_args *); | 104 | int nlmsvc_decode_notify(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 105 | int nlmsvc_decode_reboot(struct svc_rqst *, u32 *, struct nlm_reboot *); | 105 | int nlmsvc_decode_reboot(struct svc_rqst *, __be32 *, struct nlm_reboot *); |
| 106 | /* | 106 | /* |
| 107 | int nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *); | 107 | int nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *); |
| 108 | int nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *); | 108 | int nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *); |
diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h index 3cc1ae25009b..dd12b4c9e613 100644 --- a/include/linux/lockd/xdr4.h +++ b/include/linux/lockd/xdr4.h | |||
| @@ -23,19 +23,19 @@ | |||
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | int nlm4svc_decode_testargs(struct svc_rqst *, u32 *, struct nlm_args *); | 26 | int nlm4svc_decode_testargs(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 27 | int nlm4svc_encode_testres(struct svc_rqst *, u32 *, struct nlm_res *); | 27 | int nlm4svc_encode_testres(struct svc_rqst *, __be32 *, struct nlm_res *); |
| 28 | int nlm4svc_decode_lockargs(struct svc_rqst *, u32 *, struct nlm_args *); | 28 | int nlm4svc_decode_lockargs(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 29 | int nlm4svc_decode_cancargs(struct svc_rqst *, u32 *, struct nlm_args *); | 29 | int nlm4svc_decode_cancargs(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 30 | int nlm4svc_decode_unlockargs(struct svc_rqst *, u32 *, struct nlm_args *); | 30 | int nlm4svc_decode_unlockargs(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 31 | int nlm4svc_encode_res(struct svc_rqst *, u32 *, struct nlm_res *); | 31 | int nlm4svc_encode_res(struct svc_rqst *, __be32 *, struct nlm_res *); |
| 32 | int nlm4svc_decode_res(struct svc_rqst *, u32 *, struct nlm_res *); | 32 | int nlm4svc_decode_res(struct svc_rqst *, __be32 *, struct nlm_res *); |
| 33 | int nlm4svc_encode_void(struct svc_rqst *, u32 *, void *); | 33 | int nlm4svc_encode_void(struct svc_rqst *, __be32 *, void *); |
| 34 | int nlm4svc_decode_void(struct svc_rqst *, u32 *, void *); | 34 | int nlm4svc_decode_void(struct svc_rqst *, __be32 *, void *); |
| 35 | int nlm4svc_decode_shareargs(struct svc_rqst *, u32 *, struct nlm_args *); | 35 | int nlm4svc_decode_shareargs(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 36 | int nlm4svc_encode_shareres(struct svc_rqst *, u32 *, struct nlm_res *); | 36 | int nlm4svc_encode_shareres(struct svc_rqst *, __be32 *, struct nlm_res *); |
| 37 | int nlm4svc_decode_notify(struct svc_rqst *, u32 *, struct nlm_args *); | 37 | int nlm4svc_decode_notify(struct svc_rqst *, __be32 *, struct nlm_args *); |
| 38 | int nlm4svc_decode_reboot(struct svc_rqst *, u32 *, struct nlm_reboot *); | 38 | int nlm4svc_decode_reboot(struct svc_rqst *, __be32 *, struct nlm_reboot *); |
| 39 | /* | 39 | /* |
| 40 | int nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *); | 40 | int nlmclt_encode_testargs(struct rpc_rqst *, u32 *, struct nlm_args *); |
| 41 | int nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *); | 41 | int nlmclt_encode_lockargs(struct rpc_rqst *, u32 *, struct nlm_args *); |
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index 09f0f575ddff..daabb3aa1ec6 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h | |||
| @@ -150,7 +150,7 @@ extern void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new); | |||
| 150 | extern void mpol_fix_fork_child_flag(struct task_struct *p); | 150 | extern void mpol_fix_fork_child_flag(struct task_struct *p); |
| 151 | #define set_cpuset_being_rebound(x) (cpuset_being_rebound = (x)) | 151 | #define set_cpuset_being_rebound(x) (cpuset_being_rebound = (x)) |
| 152 | 152 | ||
| 153 | #ifdef CONFIG_CPUSET | 153 | #ifdef CONFIG_CPUSETS |
| 154 | #define current_cpuset_is_being_rebound() \ | 154 | #define current_cpuset_is_being_rebound() \ |
| 155 | (cpuset_being_rebound == current->cpuset) | 155 | (cpuset_being_rebound == current->cpuset) |
| 156 | #else | 156 | #else |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 5a6068ff5556..d538de901965 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -1115,9 +1115,6 @@ int in_gate_area_no_task(unsigned long addr); | |||
| 1115 | #define in_gate_area(task, addr) ({(void)task; in_gate_area_no_task(addr);}) | 1115 | #define in_gate_area(task, addr) ({(void)task; in_gate_area_no_task(addr);}) |
| 1116 | #endif /* __HAVE_ARCH_GATE_AREA */ | 1116 | #endif /* __HAVE_ARCH_GATE_AREA */ |
| 1117 | 1117 | ||
| 1118 | /* /proc/<pid>/oom_adj set to -17 protects from the oom-killer */ | ||
| 1119 | #define OOM_DISABLE -17 | ||
| 1120 | |||
| 1121 | int drop_caches_sysctl_handler(struct ctl_table *, int, struct file *, | 1118 | int drop_caches_sysctl_handler(struct ctl_table *, int, struct file *, |
| 1122 | void __user *, size_t *, loff_t *); | 1119 | void __user *, size_t *, loff_t *); |
| 1123 | unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask, | 1120 | unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask, |
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 59855b8718a0..ed0762b283a9 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
| @@ -674,6 +674,12 @@ void sparse_init(void); | |||
| 674 | #define sparse_index_init(_sec, _nid) do {} while (0) | 674 | #define sparse_index_init(_sec, _nid) do {} while (0) |
| 675 | #endif /* CONFIG_SPARSEMEM */ | 675 | #endif /* CONFIG_SPARSEMEM */ |
| 676 | 676 | ||
| 677 | #ifdef CONFIG_NODES_SPAN_OTHER_NODES | ||
| 678 | #define early_pfn_in_nid(pfn, nid) (early_pfn_to_nid(pfn) == (nid)) | ||
| 679 | #else | ||
| 680 | #define early_pfn_in_nid(pfn, nid) (1) | ||
| 681 | #endif | ||
| 682 | |||
| 677 | #ifndef early_pfn_valid | 683 | #ifndef early_pfn_valid |
| 678 | #define early_pfn_valid(pfn) (1) | 684 | #define early_pfn_valid(pfn) (1) |
| 679 | #endif | 685 | #endif |
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 76ff54846ada..45228c1a1195 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
| @@ -157,7 +157,7 @@ struct nfs_inode { | |||
| 157 | * This is the cookie verifier used for NFSv3 readdir | 157 | * This is the cookie verifier used for NFSv3 readdir |
| 158 | * operations | 158 | * operations |
| 159 | */ | 159 | */ |
| 160 | __u32 cookieverf[2]; | 160 | __be32 cookieverf[2]; |
| 161 | 161 | ||
| 162 | /* | 162 | /* |
| 163 | * This is the list of dirty unwritten pages. | 163 | * This is the list of dirty unwritten pages. |
| @@ -290,6 +290,7 @@ static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long | |||
| 290 | * linux/fs/nfs/inode.c | 290 | * linux/fs/nfs/inode.c |
| 291 | */ | 291 | */ |
| 292 | extern int nfs_sync_mapping(struct address_space *mapping); | 292 | extern int nfs_sync_mapping(struct address_space *mapping); |
| 293 | extern void nfs_zap_mapping(struct inode *inode, struct address_space *mapping); | ||
| 293 | extern void nfs_zap_caches(struct inode *); | 294 | extern void nfs_zap_caches(struct inode *); |
| 294 | extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *, | 295 | extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *, |
| 295 | struct nfs_fattr *); | 296 | struct nfs_fattr *); |
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index dc5397d9d23c..768c1ad5ff6f 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h | |||
| @@ -266,7 +266,7 @@ struct nfs_writeargs { | |||
| 266 | 266 | ||
| 267 | struct nfs_writeverf { | 267 | struct nfs_writeverf { |
| 268 | enum nfs3_stable_how committed; | 268 | enum nfs3_stable_how committed; |
| 269 | __u32 verifier[2]; | 269 | __be32 verifier[2]; |
| 270 | }; | 270 | }; |
| 271 | 271 | ||
| 272 | struct nfs_writeres { | 272 | struct nfs_writeres { |
| @@ -420,7 +420,7 @@ struct nfs3_createargs { | |||
| 420 | unsigned int len; | 420 | unsigned int len; |
| 421 | struct iattr * sattr; | 421 | struct iattr * sattr; |
| 422 | enum nfs3_createmode createmode; | 422 | enum nfs3_createmode createmode; |
| 423 | __u32 verifier[2]; | 423 | __be32 verifier[2]; |
| 424 | }; | 424 | }; |
| 425 | 425 | ||
| 426 | struct nfs3_mkdirargs { | 426 | struct nfs3_mkdirargs { |
| @@ -467,7 +467,7 @@ struct nfs3_linkargs { | |||
| 467 | struct nfs3_readdirargs { | 467 | struct nfs3_readdirargs { |
| 468 | struct nfs_fh * fh; | 468 | struct nfs_fh * fh; |
| 469 | __u64 cookie; | 469 | __u64 cookie; |
| 470 | __u32 verf[2]; | 470 | __be32 verf[2]; |
| 471 | int plus; | 471 | int plus; |
| 472 | unsigned int count; | 472 | unsigned int count; |
| 473 | struct page ** pages; | 473 | struct page ** pages; |
| @@ -503,7 +503,7 @@ struct nfs3_linkres { | |||
| 503 | 503 | ||
| 504 | struct nfs3_readdirres { | 504 | struct nfs3_readdirres { |
| 505 | struct nfs_fattr * dir_attr; | 505 | struct nfs_fattr * dir_attr; |
| 506 | __u32 * verf; | 506 | __be32 * verf; |
| 507 | int plus; | 507 | int plus; |
| 508 | }; | 508 | }; |
| 509 | 509 | ||
| @@ -811,7 +811,7 @@ struct nfs_rpc_ops { | |||
| 811 | int (*pathconf) (struct nfs_server *, struct nfs_fh *, | 811 | int (*pathconf) (struct nfs_server *, struct nfs_fh *, |
| 812 | struct nfs_pathconf *); | 812 | struct nfs_pathconf *); |
| 813 | int (*set_capabilities)(struct nfs_server *, struct nfs_fh *); | 813 | int (*set_capabilities)(struct nfs_server *, struct nfs_fh *); |
| 814 | u32 * (*decode_dirent)(u32 *, struct nfs_entry *, int plus); | 814 | __be32 *(*decode_dirent)(__be32 *, struct nfs_entry *, int plus); |
| 815 | void (*read_setup) (struct nfs_read_data *); | 815 | void (*read_setup) (struct nfs_read_data *); |
| 816 | int (*read_done) (struct rpc_task *, struct nfs_read_data *); | 816 | int (*read_done) (struct rpc_task *, struct nfs_read_data *); |
| 817 | void (*write_setup) (struct nfs_write_data *, int how); | 817 | void (*write_setup) (struct nfs_write_data *, int how); |
diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h index c3a3557c2a5b..007480cd6a60 100644 --- a/include/linux/nfsd/cache.h +++ b/include/linux/nfsd/cache.h | |||
| @@ -26,14 +26,14 @@ struct svc_cacherep { | |||
| 26 | c_type, /* status, buffer */ | 26 | c_type, /* status, buffer */ |
| 27 | c_secure : 1; /* req came from port < 1024 */ | 27 | c_secure : 1; /* req came from port < 1024 */ |
| 28 | struct sockaddr_in c_addr; | 28 | struct sockaddr_in c_addr; |
| 29 | u32 c_xid; | 29 | __be32 c_xid; |
| 30 | u32 c_prot; | 30 | u32 c_prot; |
| 31 | u32 c_proc; | 31 | u32 c_proc; |
| 32 | u32 c_vers; | 32 | u32 c_vers; |
| 33 | unsigned long c_timestamp; | 33 | unsigned long c_timestamp; |
| 34 | union { | 34 | union { |
| 35 | struct kvec u_vec; | 35 | struct kvec u_vec; |
| 36 | u32 u_status; | 36 | __be32 u_status; |
| 37 | } c_u; | 37 | } c_u; |
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| @@ -75,7 +75,7 @@ enum { | |||
| 75 | void nfsd_cache_init(void); | 75 | void nfsd_cache_init(void); |
| 76 | void nfsd_cache_shutdown(void); | 76 | void nfsd_cache_shutdown(void); |
| 77 | int nfsd_cache_lookup(struct svc_rqst *, int); | 77 | int nfsd_cache_lookup(struct svc_rqst *, int); |
| 78 | void nfsd_cache_update(struct svc_rqst *, int, u32 *); | 78 | void nfsd_cache_update(struct svc_rqst *, int, __be32 *); |
| 79 | 79 | ||
| 80 | #endif /* __KERNEL__ */ | 80 | #endif /* __KERNEL__ */ |
| 81 | #endif /* NFSCACHE_H */ | 81 | #endif /* NFSCACHE_H */ |
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index 6e78ea969f49..045e38cdbe64 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h | |||
| @@ -117,8 +117,8 @@ struct svc_export * exp_parent(struct auth_domain *clp, | |||
| 117 | struct cache_req *reqp); | 117 | struct cache_req *reqp); |
| 118 | int exp_rootfh(struct auth_domain *, | 118 | int exp_rootfh(struct auth_domain *, |
| 119 | char *path, struct knfsd_fh *, int maxsize); | 119 | char *path, struct knfsd_fh *, int maxsize); |
| 120 | int exp_pseudoroot(struct auth_domain *, struct svc_fh *fhp, struct cache_req *creq); | 120 | __be32 exp_pseudoroot(struct auth_domain *, struct svc_fh *fhp, struct cache_req *creq); |
| 121 | int nfserrno(int errno); | 121 | __be32 nfserrno(int errno); |
| 122 | 122 | ||
| 123 | extern struct cache_detail svc_export_cache; | 123 | extern struct cache_detail svc_export_cache; |
| 124 | 124 | ||
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index d0d4aae7085f..eb231143d579 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | * Callback function for readdir | 50 | * Callback function for readdir |
| 51 | */ | 51 | */ |
| 52 | struct readdir_cd { | 52 | struct readdir_cd { |
| 53 | int err; /* 0, nfserr, or nfserr_eof */ | 53 | __be32 err; /* 0, nfserr, or nfserr_eof */ |
| 54 | }; | 54 | }; |
| 55 | typedef int (*encode_dent_fn)(struct readdir_cd *, const char *, | 55 | typedef int (*encode_dent_fn)(struct readdir_cd *, const char *, |
| 56 | int, loff_t, ino_t, unsigned int); | 56 | int, loff_t, ino_t, unsigned int); |
| @@ -64,7 +64,7 @@ extern struct svc_serv *nfsd_serv; | |||
| 64 | * Function prototypes. | 64 | * Function prototypes. |
| 65 | */ | 65 | */ |
| 66 | int nfsd_svc(unsigned short port, int nrservs); | 66 | int nfsd_svc(unsigned short port, int nrservs); |
| 67 | int nfsd_dispatch(struct svc_rqst *rqstp, u32 *statp); | 67 | int nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp); |
| 68 | 68 | ||
| 69 | /* nfsd/vfs.c */ | 69 | /* nfsd/vfs.c */ |
| 70 | int fh_lock_parent(struct svc_fh *, struct dentry *); | 70 | int fh_lock_parent(struct svc_fh *, struct dentry *); |
| @@ -72,57 +72,57 @@ int nfsd_racache_init(int); | |||
| 72 | void nfsd_racache_shutdown(void); | 72 | void nfsd_racache_shutdown(void); |
| 73 | int nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, | 73 | int nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, |
| 74 | struct svc_export **expp); | 74 | struct svc_export **expp); |
| 75 | int nfsd_lookup(struct svc_rqst *, struct svc_fh *, | 75 | __be32 nfsd_lookup(struct svc_rqst *, struct svc_fh *, |
| 76 | const char *, int, struct svc_fh *); | 76 | const char *, int, struct svc_fh *); |
| 77 | int nfsd_setattr(struct svc_rqst *, struct svc_fh *, | 77 | __be32 nfsd_setattr(struct svc_rqst *, struct svc_fh *, |
| 78 | struct iattr *, int, time_t); | 78 | struct iattr *, int, time_t); |
| 79 | #ifdef CONFIG_NFSD_V4 | 79 | #ifdef CONFIG_NFSD_V4 |
| 80 | int nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *, | 80 | __be32 nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *, |
| 81 | struct nfs4_acl *); | 81 | struct nfs4_acl *); |
| 82 | int nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **); | 82 | int nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **); |
| 83 | #endif /* CONFIG_NFSD_V4 */ | 83 | #endif /* CONFIG_NFSD_V4 */ |
| 84 | int nfsd_create(struct svc_rqst *, struct svc_fh *, | 84 | __be32 nfsd_create(struct svc_rqst *, struct svc_fh *, |
| 85 | char *name, int len, struct iattr *attrs, | 85 | char *name, int len, struct iattr *attrs, |
| 86 | int type, dev_t rdev, struct svc_fh *res); | 86 | int type, dev_t rdev, struct svc_fh *res); |
| 87 | #ifdef CONFIG_NFSD_V3 | 87 | #ifdef CONFIG_NFSD_V3 |
| 88 | int nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *, u32 *); | 88 | __be32 nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *, u32 *); |
| 89 | int nfsd_create_v3(struct svc_rqst *, struct svc_fh *, | 89 | __be32 nfsd_create_v3(struct svc_rqst *, struct svc_fh *, |
| 90 | char *name, int len, struct iattr *attrs, | 90 | char *name, int len, struct iattr *attrs, |
| 91 | struct svc_fh *res, int createmode, | 91 | struct svc_fh *res, int createmode, |
| 92 | u32 *verifier, int *truncp); | 92 | u32 *verifier, int *truncp); |
| 93 | int nfsd_commit(struct svc_rqst *, struct svc_fh *, | 93 | __be32 nfsd_commit(struct svc_rqst *, struct svc_fh *, |
| 94 | loff_t, unsigned long); | 94 | loff_t, unsigned long); |
| 95 | #endif /* CONFIG_NFSD_V3 */ | 95 | #endif /* CONFIG_NFSD_V3 */ |
| 96 | int nfsd_open(struct svc_rqst *, struct svc_fh *, int, | 96 | __be32 nfsd_open(struct svc_rqst *, struct svc_fh *, int, |
| 97 | int, struct file **); | 97 | int, struct file **); |
| 98 | void nfsd_close(struct file *); | 98 | void nfsd_close(struct file *); |
| 99 | int nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *, | 99 | __be32 nfsd_read(struct svc_rqst *, struct svc_fh *, struct file *, |
| 100 | loff_t, struct kvec *, int, unsigned long *); | 100 | loff_t, struct kvec *, int, unsigned long *); |
| 101 | int nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *, | 101 | __be32 nfsd_write(struct svc_rqst *, struct svc_fh *,struct file *, |
| 102 | loff_t, struct kvec *,int, unsigned long, int *); | 102 | loff_t, struct kvec *,int, unsigned long, int *); |
| 103 | int nfsd_readlink(struct svc_rqst *, struct svc_fh *, | 103 | __be32 nfsd_readlink(struct svc_rqst *, struct svc_fh *, |
| 104 | char *, int *); | 104 | char *, int *); |
| 105 | int nfsd_symlink(struct svc_rqst *, struct svc_fh *, | 105 | __be32 nfsd_symlink(struct svc_rqst *, struct svc_fh *, |
| 106 | char *name, int len, char *path, int plen, | 106 | char *name, int len, char *path, int plen, |
| 107 | struct svc_fh *res, struct iattr *); | 107 | struct svc_fh *res, struct iattr *); |
| 108 | int nfsd_link(struct svc_rqst *, struct svc_fh *, | 108 | __be32 nfsd_link(struct svc_rqst *, struct svc_fh *, |
| 109 | char *, int, struct svc_fh *); | 109 | char *, int, struct svc_fh *); |
| 110 | int nfsd_rename(struct svc_rqst *, | 110 | __be32 nfsd_rename(struct svc_rqst *, |
| 111 | struct svc_fh *, char *, int, | 111 | struct svc_fh *, char *, int, |
| 112 | struct svc_fh *, char *, int); | 112 | struct svc_fh *, char *, int); |
| 113 | int nfsd_remove(struct svc_rqst *, | 113 | __be32 nfsd_remove(struct svc_rqst *, |
| 114 | struct svc_fh *, char *, int); | 114 | struct svc_fh *, char *, int); |
| 115 | int nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type, | 115 | __be32 nfsd_unlink(struct svc_rqst *, struct svc_fh *, int type, |
| 116 | char *name, int len); | 116 | char *name, int len); |
| 117 | int nfsd_truncate(struct svc_rqst *, struct svc_fh *, | 117 | int nfsd_truncate(struct svc_rqst *, struct svc_fh *, |
| 118 | unsigned long size); | 118 | unsigned long size); |
| 119 | int nfsd_readdir(struct svc_rqst *, struct svc_fh *, | 119 | __be32 nfsd_readdir(struct svc_rqst *, struct svc_fh *, |
| 120 | loff_t *, struct readdir_cd *, encode_dent_fn); | 120 | loff_t *, struct readdir_cd *, encode_dent_fn); |
| 121 | int nfsd_statfs(struct svc_rqst *, struct svc_fh *, | 121 | __be32 nfsd_statfs(struct svc_rqst *, struct svc_fh *, |
| 122 | struct kstatfs *); | 122 | struct kstatfs *); |
| 123 | 123 | ||
| 124 | int nfsd_notify_change(struct inode *, struct iattr *); | 124 | int nfsd_notify_change(struct inode *, struct iattr *); |
| 125 | int nfsd_permission(struct svc_export *, struct dentry *, int); | 125 | __be32 nfsd_permission(struct svc_export *, struct dentry *, int); |
| 126 | int nfsd_sync_dir(struct dentry *dp); | 126 | int nfsd_sync_dir(struct dentry *dp); |
| 127 | 127 | ||
| 128 | #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) | 128 | #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) |
| @@ -238,6 +238,7 @@ void nfsd_lockd_shutdown(void); | |||
| 238 | #define nfserr_badname __constant_htonl(NFSERR_BADNAME) | 238 | #define nfserr_badname __constant_htonl(NFSERR_BADNAME) |
| 239 | #define nfserr_cb_path_down __constant_htonl(NFSERR_CB_PATH_DOWN) | 239 | #define nfserr_cb_path_down __constant_htonl(NFSERR_CB_PATH_DOWN) |
| 240 | #define nfserr_locked __constant_htonl(NFSERR_LOCKED) | 240 | #define nfserr_locked __constant_htonl(NFSERR_LOCKED) |
| 241 | #define nfserr_replay_me __constant_htonl(NFSERR_REPLAY_ME) | ||
| 241 | 242 | ||
| 242 | /* error codes for internal use */ | 243 | /* error codes for internal use */ |
| 243 | /* if a request fails due to kmalloc failure, it gets dropped. | 244 | /* if a request fails due to kmalloc failure, it gets dropped. |
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index 069257ea99a0..f3b51d62ec7d 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h | |||
| @@ -157,7 +157,7 @@ typedef struct svc_fh { | |||
| 157 | __u64 fh_post_size; /* i_size */ | 157 | __u64 fh_post_size; /* i_size */ |
| 158 | unsigned long fh_post_blocks; /* i_blocks */ | 158 | unsigned long fh_post_blocks; /* i_blocks */ |
| 159 | unsigned long fh_post_blksize;/* i_blksize */ | 159 | unsigned long fh_post_blksize;/* i_blksize */ |
| 160 | __u32 fh_post_rdev[2];/* i_rdev */ | 160 | __be32 fh_post_rdev[2];/* i_rdev */ |
| 161 | struct timespec fh_post_atime; /* i_atime */ | 161 | struct timespec fh_post_atime; /* i_atime */ |
| 162 | struct timespec fh_post_mtime; /* i_mtime */ | 162 | struct timespec fh_post_mtime; /* i_mtime */ |
| 163 | struct timespec fh_post_ctime; /* i_ctime */ | 163 | struct timespec fh_post_ctime; /* i_ctime */ |
| @@ -209,9 +209,9 @@ extern char * SVCFH_fmt(struct svc_fh *fhp); | |||
| 209 | /* | 209 | /* |
| 210 | * Function prototypes | 210 | * Function prototypes |
| 211 | */ | 211 | */ |
| 212 | u32 fh_verify(struct svc_rqst *, struct svc_fh *, int, int); | 212 | __be32 fh_verify(struct svc_rqst *, struct svc_fh *, int, int); |
| 213 | int fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *); | 213 | __be32 fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *); |
| 214 | int fh_update(struct svc_fh *); | 214 | __be32 fh_update(struct svc_fh *); |
| 215 | void fh_put(struct svc_fh *); | 215 | void fh_put(struct svc_fh *); |
| 216 | 216 | ||
| 217 | static __inline__ struct svc_fh * | 217 | static __inline__ struct svc_fh * |
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h index 8bf23cf8b603..c3673f487e84 100644 --- a/include/linux/nfsd/state.h +++ b/include/linux/nfsd/state.h | |||
| @@ -125,7 +125,7 @@ struct nfs4_client { | |||
| 125 | char cl_recdir[HEXDIR_LEN]; /* recovery dir */ | 125 | char cl_recdir[HEXDIR_LEN]; /* recovery dir */ |
| 126 | nfs4_verifier cl_verifier; /* generated by client */ | 126 | nfs4_verifier cl_verifier; /* generated by client */ |
| 127 | time_t cl_time; /* time of last lease renewal */ | 127 | time_t cl_time; /* time of last lease renewal */ |
| 128 | u32 cl_addr; /* client ipaddress */ | 128 | __be32 cl_addr; /* client ipaddress */ |
| 129 | struct svc_cred cl_cred; /* setclientid principal */ | 129 | struct svc_cred cl_cred; /* setclientid principal */ |
| 130 | clientid_t cl_clientid; /* generated by server */ | 130 | clientid_t cl_clientid; /* generated by server */ |
| 131 | nfs4_verifier cl_confirm; /* generated by server */ | 131 | nfs4_verifier cl_confirm; /* generated by server */ |
| @@ -164,7 +164,7 @@ update_stateid(stateid_t *stateid) | |||
| 164 | * is cached. | 164 | * is cached. |
| 165 | */ | 165 | */ |
| 166 | struct nfs4_replay { | 166 | struct nfs4_replay { |
| 167 | u32 rp_status; | 167 | __be32 rp_status; |
| 168 | unsigned int rp_buflen; | 168 | unsigned int rp_buflen; |
| 169 | char *rp_buf; | 169 | char *rp_buf; |
| 170 | unsigned intrp_allocated; | 170 | unsigned intrp_allocated; |
| @@ -273,19 +273,19 @@ struct nfs4_stateid { | |||
| 273 | ((err) != nfserr_stale_stateid) && \ | 273 | ((err) != nfserr_stale_stateid) && \ |
| 274 | ((err) != nfserr_bad_stateid)) | 274 | ((err) != nfserr_bad_stateid)) |
| 275 | 275 | ||
| 276 | extern int nfsd4_renew(clientid_t *clid); | 276 | extern __be32 nfsd4_renew(clientid_t *clid); |
| 277 | extern int nfs4_preprocess_stateid_op(struct svc_fh *current_fh, | 277 | extern __be32 nfs4_preprocess_stateid_op(struct svc_fh *current_fh, |
| 278 | stateid_t *stateid, int flags, struct file **filp); | 278 | stateid_t *stateid, int flags, struct file **filp); |
| 279 | extern void nfs4_lock_state(void); | 279 | extern void nfs4_lock_state(void); |
| 280 | extern void nfs4_unlock_state(void); | 280 | extern void nfs4_unlock_state(void); |
| 281 | extern int nfs4_in_grace(void); | 281 | extern int nfs4_in_grace(void); |
| 282 | extern int nfs4_check_open_reclaim(clientid_t *clid); | 282 | extern __be32 nfs4_check_open_reclaim(clientid_t *clid); |
| 283 | extern void put_nfs4_client(struct nfs4_client *clp); | 283 | extern void put_nfs4_client(struct nfs4_client *clp); |
| 284 | extern void nfs4_free_stateowner(struct kref *kref); | 284 | extern void nfs4_free_stateowner(struct kref *kref); |
| 285 | extern void nfsd4_probe_callback(struct nfs4_client *clp); | 285 | extern void nfsd4_probe_callback(struct nfs4_client *clp); |
| 286 | extern void nfsd4_cb_recall(struct nfs4_delegation *dp); | 286 | extern void nfsd4_cb_recall(struct nfs4_delegation *dp); |
| 287 | extern void nfs4_put_delegation(struct nfs4_delegation *dp); | 287 | extern void nfs4_put_delegation(struct nfs4_delegation *dp); |
| 288 | extern int nfs4_make_rec_clidname(char *clidname, struct xdr_netobj *clname); | 288 | extern __be32 nfs4_make_rec_clidname(char *clidname, struct xdr_netobj *clname); |
| 289 | extern void nfsd4_init_recdir(char *recdir_name); | 289 | extern void nfsd4_init_recdir(char *recdir_name); |
| 290 | extern int nfsd4_recdir_load(void); | 290 | extern int nfsd4_recdir_load(void); |
| 291 | extern void nfsd4_shutdown_recdir(void); | 291 | extern void nfsd4_shutdown_recdir(void); |
diff --git a/include/linux/nfsd/xdr.h b/include/linux/nfsd/xdr.h index 0e53de87d886..877192d3ae79 100644 --- a/include/linux/nfsd/xdr.h +++ b/include/linux/nfsd/xdr.h | |||
| @@ -81,7 +81,7 @@ struct nfsd_readdirargs { | |||
| 81 | struct svc_fh fh; | 81 | struct svc_fh fh; |
| 82 | __u32 cookie; | 82 | __u32 cookie; |
| 83 | __u32 count; | 83 | __u32 count; |
| 84 | u32 * buffer; | 84 | __be32 * buffer; |
| 85 | }; | 85 | }; |
| 86 | 86 | ||
| 87 | struct nfsd_attrstat { | 87 | struct nfsd_attrstat { |
| @@ -108,9 +108,9 @@ struct nfsd_readdirres { | |||
| 108 | int count; | 108 | int count; |
| 109 | 109 | ||
| 110 | struct readdir_cd common; | 110 | struct readdir_cd common; |
| 111 | u32 * buffer; | 111 | __be32 * buffer; |
| 112 | int buflen; | 112 | int buflen; |
| 113 | u32 * offset; | 113 | __be32 * offset; |
| 114 | }; | 114 | }; |
| 115 | 115 | ||
| 116 | struct nfsd_statfsres { | 116 | struct nfsd_statfsres { |
| @@ -135,43 +135,43 @@ union nfsd_xdrstore { | |||
| 135 | #define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore) | 135 | #define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore) |
| 136 | 136 | ||
| 137 | 137 | ||
| 138 | int nfssvc_decode_void(struct svc_rqst *, u32 *, void *); | 138 | int nfssvc_decode_void(struct svc_rqst *, __be32 *, void *); |
| 139 | int nfssvc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *); | 139 | int nfssvc_decode_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *); |
| 140 | int nfssvc_decode_sattrargs(struct svc_rqst *, u32 *, | 140 | int nfssvc_decode_sattrargs(struct svc_rqst *, __be32 *, |
| 141 | struct nfsd_sattrargs *); | 141 | struct nfsd_sattrargs *); |
| 142 | int nfssvc_decode_diropargs(struct svc_rqst *, u32 *, | 142 | int nfssvc_decode_diropargs(struct svc_rqst *, __be32 *, |
| 143 | struct nfsd_diropargs *); | 143 | struct nfsd_diropargs *); |
| 144 | int nfssvc_decode_readargs(struct svc_rqst *, u32 *, | 144 | int nfssvc_decode_readargs(struct svc_rqst *, __be32 *, |
| 145 | struct nfsd_readargs *); | 145 | struct nfsd_readargs *); |
| 146 | int nfssvc_decode_writeargs(struct svc_rqst *, u32 *, | 146 | int nfssvc_decode_writeargs(struct svc_rqst *, __be32 *, |
| 147 | struct nfsd_writeargs *); | 147 | struct nfsd_writeargs *); |
| 148 | int nfssvc_decode_createargs(struct svc_rqst *, u32 *, | 148 | int nfssvc_decode_createargs(struct svc_rqst *, __be32 *, |
| 149 | struct nfsd_createargs *); | 149 | struct nfsd_createargs *); |
| 150 | int nfssvc_decode_renameargs(struct svc_rqst *, u32 *, | 150 | int nfssvc_decode_renameargs(struct svc_rqst *, __be32 *, |
| 151 | struct nfsd_renameargs *); | 151 | struct nfsd_renameargs *); |
| 152 | int nfssvc_decode_readlinkargs(struct svc_rqst *, u32 *, | 152 | int nfssvc_decode_readlinkargs(struct svc_rqst *, __be32 *, |
| 153 | struct nfsd_readlinkargs *); | 153 | struct nfsd_readlinkargs *); |
| 154 | int nfssvc_decode_linkargs(struct svc_rqst *, u32 *, | 154 | int nfssvc_decode_linkargs(struct svc_rqst *, __be32 *, |
| 155 | struct nfsd_linkargs *); | 155 | struct nfsd_linkargs *); |
| 156 | int nfssvc_decode_symlinkargs(struct svc_rqst *, u32 *, | 156 | int nfssvc_decode_symlinkargs(struct svc_rqst *, __be32 *, |
| 157 | struct nfsd_symlinkargs *); | 157 | struct nfsd_symlinkargs *); |
| 158 | int nfssvc_decode_readdirargs(struct svc_rqst *, u32 *, | 158 | int nfssvc_decode_readdirargs(struct svc_rqst *, __be32 *, |
| 159 | struct nfsd_readdirargs *); | 159 | struct nfsd_readdirargs *); |
| 160 | int nfssvc_encode_void(struct svc_rqst *, u32 *, void *); | 160 | int nfssvc_encode_void(struct svc_rqst *, __be32 *, void *); |
| 161 | int nfssvc_encode_attrstat(struct svc_rqst *, u32 *, struct nfsd_attrstat *); | 161 | int nfssvc_encode_attrstat(struct svc_rqst *, __be32 *, struct nfsd_attrstat *); |
| 162 | int nfssvc_encode_diropres(struct svc_rqst *, u32 *, struct nfsd_diropres *); | 162 | int nfssvc_encode_diropres(struct svc_rqst *, __be32 *, struct nfsd_diropres *); |
| 163 | int nfssvc_encode_readlinkres(struct svc_rqst *, u32 *, struct nfsd_readlinkres *); | 163 | int nfssvc_encode_readlinkres(struct svc_rqst *, __be32 *, struct nfsd_readlinkres *); |
| 164 | int nfssvc_encode_readres(struct svc_rqst *, u32 *, struct nfsd_readres *); | 164 | int nfssvc_encode_readres(struct svc_rqst *, __be32 *, struct nfsd_readres *); |
| 165 | int nfssvc_encode_statfsres(struct svc_rqst *, u32 *, struct nfsd_statfsres *); | 165 | int nfssvc_encode_statfsres(struct svc_rqst *, __be32 *, struct nfsd_statfsres *); |
| 166 | int nfssvc_encode_readdirres(struct svc_rqst *, u32 *, struct nfsd_readdirres *); | 166 | int nfssvc_encode_readdirres(struct svc_rqst *, __be32 *, struct nfsd_readdirres *); |
| 167 | 167 | ||
| 168 | int nfssvc_encode_entry(struct readdir_cd *, const char *name, | 168 | int nfssvc_encode_entry(struct readdir_cd *, const char *name, |
| 169 | int namlen, loff_t offset, ino_t ino, unsigned int); | 169 | int namlen, loff_t offset, ino_t ino, unsigned int); |
| 170 | 170 | ||
| 171 | int nfssvc_release_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *); | 171 | int nfssvc_release_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *); |
| 172 | 172 | ||
| 173 | /* Helper functions for NFSv2 ACL code */ | 173 | /* Helper functions for NFSv2 ACL code */ |
| 174 | u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp); | 174 | __be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp); |
| 175 | u32 *nfs2svc_decode_fh(u32 *p, struct svc_fh *fhp); | 175 | __be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp); |
| 176 | 176 | ||
| 177 | #endif /* LINUX_NFSD_H */ | 177 | #endif /* LINUX_NFSD_H */ |
diff --git a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h index 474d882dc2f3..79963867b0d7 100644 --- a/include/linux/nfsd/xdr3.h +++ b/include/linux/nfsd/xdr3.h | |||
| @@ -51,7 +51,7 @@ struct nfsd3_createargs { | |||
| 51 | int len; | 51 | int len; |
| 52 | int createmode; | 52 | int createmode; |
| 53 | struct iattr attrs; | 53 | struct iattr attrs; |
| 54 | __u32 * verf; | 54 | __be32 * verf; |
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | struct nfsd3_mknodargs { | 57 | struct nfsd3_mknodargs { |
| @@ -98,8 +98,8 @@ struct nfsd3_readdirargs { | |||
| 98 | __u64 cookie; | 98 | __u64 cookie; |
| 99 | __u32 dircount; | 99 | __u32 dircount; |
| 100 | __u32 count; | 100 | __u32 count; |
| 101 | __u32 * verf; | 101 | __be32 * verf; |
| 102 | u32 * buffer; | 102 | __be32 * buffer; |
| 103 | }; | 103 | }; |
| 104 | 104 | ||
| 105 | struct nfsd3_commitargs { | 105 | struct nfsd3_commitargs { |
| @@ -122,79 +122,79 @@ struct nfsd3_setaclargs { | |||
| 122 | }; | 122 | }; |
| 123 | 123 | ||
| 124 | struct nfsd3_attrstat { | 124 | struct nfsd3_attrstat { |
| 125 | __u32 status; | 125 | __be32 status; |
| 126 | struct svc_fh fh; | 126 | struct svc_fh fh; |
| 127 | struct kstat stat; | 127 | struct kstat stat; |
| 128 | }; | 128 | }; |
| 129 | 129 | ||
| 130 | /* LOOKUP, CREATE, MKDIR, SYMLINK, MKNOD */ | 130 | /* LOOKUP, CREATE, MKDIR, SYMLINK, MKNOD */ |
| 131 | struct nfsd3_diropres { | 131 | struct nfsd3_diropres { |
| 132 | __u32 status; | 132 | __be32 status; |
| 133 | struct svc_fh dirfh; | 133 | struct svc_fh dirfh; |
| 134 | struct svc_fh fh; | 134 | struct svc_fh fh; |
| 135 | }; | 135 | }; |
| 136 | 136 | ||
| 137 | struct nfsd3_accessres { | 137 | struct nfsd3_accessres { |
| 138 | __u32 status; | 138 | __be32 status; |
| 139 | struct svc_fh fh; | 139 | struct svc_fh fh; |
| 140 | __u32 access; | 140 | __u32 access; |
| 141 | }; | 141 | }; |
| 142 | 142 | ||
| 143 | struct nfsd3_readlinkres { | 143 | struct nfsd3_readlinkres { |
| 144 | __u32 status; | 144 | __be32 status; |
| 145 | struct svc_fh fh; | 145 | struct svc_fh fh; |
| 146 | __u32 len; | 146 | __u32 len; |
| 147 | }; | 147 | }; |
| 148 | 148 | ||
| 149 | struct nfsd3_readres { | 149 | struct nfsd3_readres { |
| 150 | __u32 status; | 150 | __be32 status; |
| 151 | struct svc_fh fh; | 151 | struct svc_fh fh; |
| 152 | unsigned long count; | 152 | unsigned long count; |
| 153 | int eof; | 153 | int eof; |
| 154 | }; | 154 | }; |
| 155 | 155 | ||
| 156 | struct nfsd3_writeres { | 156 | struct nfsd3_writeres { |
| 157 | __u32 status; | 157 | __be32 status; |
| 158 | struct svc_fh fh; | 158 | struct svc_fh fh; |
| 159 | unsigned long count; | 159 | unsigned long count; |
| 160 | int committed; | 160 | int committed; |
| 161 | }; | 161 | }; |
| 162 | 162 | ||
| 163 | struct nfsd3_renameres { | 163 | struct nfsd3_renameres { |
| 164 | __u32 status; | 164 | __be32 status; |
| 165 | struct svc_fh ffh; | 165 | struct svc_fh ffh; |
| 166 | struct svc_fh tfh; | 166 | struct svc_fh tfh; |
| 167 | }; | 167 | }; |
| 168 | 168 | ||
| 169 | struct nfsd3_linkres { | 169 | struct nfsd3_linkres { |
| 170 | __u32 status; | 170 | __be32 status; |
| 171 | struct svc_fh tfh; | 171 | struct svc_fh tfh; |
| 172 | struct svc_fh fh; | 172 | struct svc_fh fh; |
| 173 | }; | 173 | }; |
| 174 | 174 | ||
| 175 | struct nfsd3_readdirres { | 175 | struct nfsd3_readdirres { |
| 176 | __u32 status; | 176 | __be32 status; |
| 177 | struct svc_fh fh; | 177 | struct svc_fh fh; |
| 178 | int count; | 178 | int count; |
| 179 | __u32 verf[2]; | 179 | __be32 verf[2]; |
| 180 | 180 | ||
| 181 | struct readdir_cd common; | 181 | struct readdir_cd common; |
| 182 | u32 * buffer; | 182 | __be32 * buffer; |
| 183 | int buflen; | 183 | int buflen; |
| 184 | u32 * offset; | 184 | __be32 * offset; |
| 185 | u32 * offset1; | 185 | __be32 * offset1; |
| 186 | struct svc_rqst * rqstp; | 186 | struct svc_rqst * rqstp; |
| 187 | 187 | ||
| 188 | }; | 188 | }; |
| 189 | 189 | ||
| 190 | struct nfsd3_fsstatres { | 190 | struct nfsd3_fsstatres { |
| 191 | __u32 status; | 191 | __be32 status; |
| 192 | struct kstatfs stats; | 192 | struct kstatfs stats; |
| 193 | __u32 invarsec; | 193 | __u32 invarsec; |
| 194 | }; | 194 | }; |
| 195 | 195 | ||
| 196 | struct nfsd3_fsinfores { | 196 | struct nfsd3_fsinfores { |
| 197 | __u32 status; | 197 | __be32 status; |
| 198 | __u32 f_rtmax; | 198 | __u32 f_rtmax; |
| 199 | __u32 f_rtpref; | 199 | __u32 f_rtpref; |
| 200 | __u32 f_rtmult; | 200 | __u32 f_rtmult; |
| @@ -207,7 +207,7 @@ struct nfsd3_fsinfores { | |||
| 207 | }; | 207 | }; |
| 208 | 208 | ||
| 209 | struct nfsd3_pathconfres { | 209 | struct nfsd3_pathconfres { |
| 210 | __u32 status; | 210 | __be32 status; |
| 211 | __u32 p_link_max; | 211 | __u32 p_link_max; |
| 212 | __u32 p_name_max; | 212 | __u32 p_name_max; |
| 213 | __u32 p_no_trunc; | 213 | __u32 p_no_trunc; |
| @@ -217,12 +217,12 @@ struct nfsd3_pathconfres { | |||
| 217 | }; | 217 | }; |
| 218 | 218 | ||
| 219 | struct nfsd3_commitres { | 219 | struct nfsd3_commitres { |
| 220 | __u32 status; | 220 | __be32 status; |
| 221 | struct svc_fh fh; | 221 | struct svc_fh fh; |
| 222 | }; | 222 | }; |
| 223 | 223 | ||
| 224 | struct nfsd3_getaclres { | 224 | struct nfsd3_getaclres { |
| 225 | __u32 status; | 225 | __be32 status; |
| 226 | struct svc_fh fh; | 226 | struct svc_fh fh; |
| 227 | int mask; | 227 | int mask; |
| 228 | struct posix_acl *acl_access; | 228 | struct posix_acl *acl_access; |
| @@ -266,70 +266,70 @@ union nfsd3_xdrstore { | |||
| 266 | 266 | ||
| 267 | #define NFS3_SVC_XDRSIZE sizeof(union nfsd3_xdrstore) | 267 | #define NFS3_SVC_XDRSIZE sizeof(union nfsd3_xdrstore) |
| 268 | 268 | ||
| 269 | int nfs3svc_decode_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *); | 269 | int nfs3svc_decode_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *); |
| 270 | int nfs3svc_decode_sattrargs(struct svc_rqst *, u32 *, | 270 | int nfs3svc_decode_sattrargs(struct svc_rqst *, __be32 *, |
| 271 | struct nfsd3_sattrargs *); | 271 | struct nfsd3_sattrargs *); |
| 272 | int nfs3svc_decode_diropargs(struct svc_rqst *, u32 *, | 272 | int nfs3svc_decode_diropargs(struct svc_rqst *, __be32 *, |
| 273 | struct nfsd3_diropargs *); | 273 | struct nfsd3_diropargs *); |
| 274 | int nfs3svc_decode_accessargs(struct svc_rqst *, u32 *, | 274 | int nfs3svc_decode_accessargs(struct svc_rqst *, __be32 *, |
| 275 | struct nfsd3_accessargs *); | 275 | struct nfsd3_accessargs *); |
| 276 | int nfs3svc_decode_readargs(struct svc_rqst *, u32 *, | 276 | int nfs3svc_decode_readargs(struct svc_rqst *, __be32 *, |
| 277 | struct nfsd3_readargs *); | 277 | struct nfsd3_readargs *); |
| 278 | int nfs3svc_decode_writeargs(struct svc_rqst *, u32 *, | 278 | int nfs3svc_decode_writeargs(struct svc_rqst *, __be32 *, |
| 279 | struct nfsd3_writeargs *); | 279 | struct nfsd3_writeargs *); |
| 280 | int nfs3svc_decode_createargs(struct svc_rqst *, u32 *, | 280 | int nfs3svc_decode_createargs(struct svc_rqst *, __be32 *, |
| 281 | struct nfsd3_createargs *); | 281 | struct nfsd3_createargs *); |
| 282 | int nfs3svc_decode_mkdirargs(struct svc_rqst *, u32 *, | 282 | int nfs3svc_decode_mkdirargs(struct svc_rqst *, __be32 *, |
| 283 | struct nfsd3_createargs *); | 283 | struct nfsd3_createargs *); |
| 284 | int nfs3svc_decode_mknodargs(struct svc_rqst *, u32 *, | 284 | int nfs3svc_decode_mknodargs(struct svc_rqst *, __be32 *, |
| 285 | struct nfsd3_mknodargs *); | 285 | struct nfsd3_mknodargs *); |
| 286 | int nfs3svc_decode_renameargs(struct svc_rqst *, u32 *, | 286 | int nfs3svc_decode_renameargs(struct svc_rqst *, __be32 *, |
| 287 | struct nfsd3_renameargs *); | 287 | struct nfsd3_renameargs *); |
| 288 | int nfs3svc_decode_readlinkargs(struct svc_rqst *, u32 *, | 288 | int nfs3svc_decode_readlinkargs(struct svc_rqst *, __be32 *, |
| 289 | struct nfsd3_readlinkargs *); | 289 | struct nfsd3_readlinkargs *); |
| 290 | int nfs3svc_decode_linkargs(struct svc_rqst *, u32 *, | 290 | int nfs3svc_decode_linkargs(struct svc_rqst *, __be32 *, |
| 291 | struct nfsd3_linkargs *); | 291 | struct nfsd3_linkargs *); |
| 292 | int nfs3svc_decode_symlinkargs(struct svc_rqst *, u32 *, | 292 | int nfs3svc_decode_symlinkargs(struct svc_rqst *, __be32 *, |
| 293 | struct nfsd3_symlinkargs *); | 293 | struct nfsd3_symlinkargs *); |
| 294 | int nfs3svc_decode_readdirargs(struct svc_rqst *, u32 *, | 294 | int nfs3svc_decode_readdirargs(struct svc_rqst *, __be32 *, |
| 295 | struct nfsd3_readdirargs *); | 295 | struct nfsd3_readdirargs *); |
| 296 | int nfs3svc_decode_readdirplusargs(struct svc_rqst *, u32 *, | 296 | int nfs3svc_decode_readdirplusargs(struct svc_rqst *, __be32 *, |
| 297 | struct nfsd3_readdirargs *); | 297 | struct nfsd3_readdirargs *); |
| 298 | int nfs3svc_decode_commitargs(struct svc_rqst *, u32 *, | 298 | int nfs3svc_decode_commitargs(struct svc_rqst *, __be32 *, |
| 299 | struct nfsd3_commitargs *); | 299 | struct nfsd3_commitargs *); |
| 300 | int nfs3svc_encode_voidres(struct svc_rqst *, u32 *, void *); | 300 | int nfs3svc_encode_voidres(struct svc_rqst *, __be32 *, void *); |
| 301 | int nfs3svc_encode_attrstat(struct svc_rqst *, u32 *, | 301 | int nfs3svc_encode_attrstat(struct svc_rqst *, __be32 *, |
| 302 | struct nfsd3_attrstat *); | 302 | struct nfsd3_attrstat *); |
| 303 | int nfs3svc_encode_wccstat(struct svc_rqst *, u32 *, | 303 | int nfs3svc_encode_wccstat(struct svc_rqst *, __be32 *, |
| 304 | struct nfsd3_attrstat *); | 304 | struct nfsd3_attrstat *); |
| 305 | int nfs3svc_encode_diropres(struct svc_rqst *, u32 *, | 305 | int nfs3svc_encode_diropres(struct svc_rqst *, __be32 *, |
| 306 | struct nfsd3_diropres *); | 306 | struct nfsd3_diropres *); |
| 307 | int nfs3svc_encode_accessres(struct svc_rqst *, u32 *, | 307 | int nfs3svc_encode_accessres(struct svc_rqst *, __be32 *, |
| 308 | struct nfsd3_accessres *); | 308 | struct nfsd3_accessres *); |
| 309 | int nfs3svc_encode_readlinkres(struct svc_rqst *, u32 *, | 309 | int nfs3svc_encode_readlinkres(struct svc_rqst *, __be32 *, |
| 310 | struct nfsd3_readlinkres *); | 310 | struct nfsd3_readlinkres *); |
| 311 | int nfs3svc_encode_readres(struct svc_rqst *, u32 *, struct nfsd3_readres *); | 311 | int nfs3svc_encode_readres(struct svc_rqst *, __be32 *, struct nfsd3_readres *); |
| 312 | int nfs3svc_encode_writeres(struct svc_rqst *, u32 *, struct nfsd3_writeres *); | 312 | int nfs3svc_encode_writeres(struct svc_rqst *, __be32 *, struct nfsd3_writeres *); |
| 313 | int nfs3svc_encode_createres(struct svc_rqst *, u32 *, | 313 | int nfs3svc_encode_createres(struct svc_rqst *, __be32 *, |
| 314 | struct nfsd3_diropres *); | 314 | struct nfsd3_diropres *); |
| 315 | int nfs3svc_encode_renameres(struct svc_rqst *, u32 *, | 315 | int nfs3svc_encode_renameres(struct svc_rqst *, __be32 *, |
| 316 | struct nfsd3_renameres *); | 316 | struct nfsd3_renameres *); |
| 317 | int nfs3svc_encode_linkres(struct svc_rqst *, u32 *, | 317 | int nfs3svc_encode_linkres(struct svc_rqst *, __be32 *, |
| 318 | struct nfsd3_linkres *); | 318 | struct nfsd3_linkres *); |
| 319 | int nfs3svc_encode_readdirres(struct svc_rqst *, u32 *, | 319 | int nfs3svc_encode_readdirres(struct svc_rqst *, __be32 *, |
| 320 | struct nfsd3_readdirres *); | 320 | struct nfsd3_readdirres *); |
| 321 | int nfs3svc_encode_fsstatres(struct svc_rqst *, u32 *, | 321 | int nfs3svc_encode_fsstatres(struct svc_rqst *, __be32 *, |
| 322 | struct nfsd3_fsstatres *); | 322 | struct nfsd3_fsstatres *); |
| 323 | int nfs3svc_encode_fsinfores(struct svc_rqst *, u32 *, | 323 | int nfs3svc_encode_fsinfores(struct svc_rqst *, __be32 *, |
| 324 | struct nfsd3_fsinfores *); | 324 | struct nfsd3_fsinfores *); |
| 325 | int nfs3svc_encode_pathconfres(struct svc_rqst *, u32 *, | 325 | int nfs3svc_encode_pathconfres(struct svc_rqst *, __be32 *, |
| 326 | struct nfsd3_pathconfres *); | 326 | struct nfsd3_pathconfres *); |
| 327 | int nfs3svc_encode_commitres(struct svc_rqst *, u32 *, | 327 | int nfs3svc_encode_commitres(struct svc_rqst *, __be32 *, |
| 328 | struct nfsd3_commitres *); | 328 | struct nfsd3_commitres *); |
| 329 | 329 | ||
| 330 | int nfs3svc_release_fhandle(struct svc_rqst *, u32 *, | 330 | int nfs3svc_release_fhandle(struct svc_rqst *, __be32 *, |
| 331 | struct nfsd3_attrstat *); | 331 | struct nfsd3_attrstat *); |
| 332 | int nfs3svc_release_fhandle2(struct svc_rqst *, u32 *, | 332 | int nfs3svc_release_fhandle2(struct svc_rqst *, __be32 *, |
| 333 | struct nfsd3_fhandle_pair *); | 333 | struct nfsd3_fhandle_pair *); |
| 334 | int nfs3svc_encode_entry(struct readdir_cd *, const char *name, | 334 | int nfs3svc_encode_entry(struct readdir_cd *, const char *name, |
| 335 | int namlen, loff_t offset, ino_t ino, | 335 | int namlen, loff_t offset, ino_t ino, |
| @@ -338,9 +338,9 @@ int nfs3svc_encode_entry_plus(struct readdir_cd *, const char *name, | |||
| 338 | int namlen, loff_t offset, ino_t ino, | 338 | int namlen, loff_t offset, ino_t ino, |
| 339 | unsigned int); | 339 | unsigned int); |
| 340 | /* Helper functions for NFSv3 ACL code */ | 340 | /* Helper functions for NFSv3 ACL code */ |
| 341 | u32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, u32 *p, | 341 | __be32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, |
| 342 | struct svc_fh *fhp); | 342 | struct svc_fh *fhp); |
| 343 | u32 *nfs3svc_decode_fh(u32 *p, struct svc_fh *fhp); | 343 | __be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp); |
| 344 | 344 | ||
| 345 | 345 | ||
| 346 | #endif /* _LINUX_NFSD_XDR3_H */ | 346 | #endif /* _LINUX_NFSD_XDR3_H */ |
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h index 66e642762a07..45ca01b5f844 100644 --- a/include/linux/nfsd/xdr4.h +++ b/include/linux/nfsd/xdr4.h | |||
| @@ -258,9 +258,9 @@ struct nfsd4_readdir { | |||
| 258 | struct svc_fh * rd_fhp; /* response */ | 258 | struct svc_fh * rd_fhp; /* response */ |
| 259 | 259 | ||
| 260 | struct readdir_cd common; | 260 | struct readdir_cd common; |
| 261 | u32 * buffer; | 261 | __be32 * buffer; |
| 262 | int buflen; | 262 | int buflen; |
| 263 | u32 * offset; | 263 | __be32 * offset; |
| 264 | }; | 264 | }; |
| 265 | 265 | ||
| 266 | struct nfsd4_release_lockowner { | 266 | struct nfsd4_release_lockowner { |
| @@ -334,7 +334,7 @@ struct nfsd4_write { | |||
| 334 | 334 | ||
| 335 | struct nfsd4_op { | 335 | struct nfsd4_op { |
| 336 | int opnum; | 336 | int opnum; |
| 337 | int status; | 337 | __be32 status; |
| 338 | union { | 338 | union { |
| 339 | struct nfsd4_access access; | 339 | struct nfsd4_access access; |
| 340 | struct nfsd4_close close; | 340 | struct nfsd4_close close; |
| @@ -371,12 +371,12 @@ struct nfsd4_op { | |||
| 371 | 371 | ||
| 372 | struct nfsd4_compoundargs { | 372 | struct nfsd4_compoundargs { |
| 373 | /* scratch variables for XDR decode */ | 373 | /* scratch variables for XDR decode */ |
| 374 | u32 * p; | 374 | __be32 * p; |
| 375 | u32 * end; | 375 | __be32 * end; |
| 376 | struct page ** pagelist; | 376 | struct page ** pagelist; |
| 377 | int pagelen; | 377 | int pagelen; |
| 378 | u32 tmp[8]; | 378 | __be32 tmp[8]; |
| 379 | u32 * tmpp; | 379 | __be32 * tmpp; |
| 380 | struct tmpbuf { | 380 | struct tmpbuf { |
| 381 | struct tmpbuf *next; | 381 | struct tmpbuf *next; |
| 382 | void (*release)(const void *); | 382 | void (*release)(const void *); |
| @@ -395,15 +395,15 @@ struct nfsd4_compoundargs { | |||
| 395 | 395 | ||
| 396 | struct nfsd4_compoundres { | 396 | struct nfsd4_compoundres { |
| 397 | /* scratch variables for XDR encode */ | 397 | /* scratch variables for XDR encode */ |
| 398 | u32 * p; | 398 | __be32 * p; |
| 399 | u32 * end; | 399 | __be32 * end; |
| 400 | struct xdr_buf * xbuf; | 400 | struct xdr_buf * xbuf; |
| 401 | struct svc_rqst * rqstp; | 401 | struct svc_rqst * rqstp; |
| 402 | 402 | ||
| 403 | u32 taglen; | 403 | u32 taglen; |
| 404 | char * tag; | 404 | char * tag; |
| 405 | u32 opcnt; | 405 | u32 opcnt; |
| 406 | u32 * tagp; /* where to encode tag and opcount */ | 406 | __be32 * tagp; /* where to encode tag and opcount */ |
| 407 | }; | 407 | }; |
| 408 | 408 | ||
| 409 | #define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs) | 409 | #define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs) |
| @@ -419,45 +419,45 @@ set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp) | |||
| 419 | cinfo->after_ctime_nsec = fhp->fh_post_ctime.tv_nsec; | 419 | cinfo->after_ctime_nsec = fhp->fh_post_ctime.tv_nsec; |
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | int nfs4svc_encode_voidres(struct svc_rqst *, u32 *, void *); | 422 | int nfs4svc_encode_voidres(struct svc_rqst *, __be32 *, void *); |
| 423 | int nfs4svc_decode_compoundargs(struct svc_rqst *, u32 *, | 423 | int nfs4svc_decode_compoundargs(struct svc_rqst *, __be32 *, |
| 424 | struct nfsd4_compoundargs *); | 424 | struct nfsd4_compoundargs *); |
| 425 | int nfs4svc_encode_compoundres(struct svc_rqst *, u32 *, | 425 | int nfs4svc_encode_compoundres(struct svc_rqst *, __be32 *, |
| 426 | struct nfsd4_compoundres *); | 426 | struct nfsd4_compoundres *); |
| 427 | void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *); | 427 | void nfsd4_encode_operation(struct nfsd4_compoundres *, struct nfsd4_op *); |
| 428 | void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op); | 428 | void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op); |
| 429 | int nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, | 429 | __be32 nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, |
| 430 | struct dentry *dentry, u32 *buffer, int *countp, | 430 | struct dentry *dentry, __be32 *buffer, int *countp, |
| 431 | u32 *bmval, struct svc_rqst *); | 431 | u32 *bmval, struct svc_rqst *); |
| 432 | extern int nfsd4_setclientid(struct svc_rqst *rqstp, | 432 | extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp, |
| 433 | struct nfsd4_setclientid *setclid); | 433 | struct nfsd4_setclientid *setclid); |
| 434 | extern int nfsd4_setclientid_confirm(struct svc_rqst *rqstp, | 434 | extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp, |
| 435 | struct nfsd4_setclientid_confirm *setclientid_confirm); | 435 | struct nfsd4_setclientid_confirm *setclientid_confirm); |
| 436 | extern int nfsd4_process_open1(struct nfsd4_open *open); | 436 | extern __be32 nfsd4_process_open1(struct nfsd4_open *open); |
| 437 | extern int nfsd4_process_open2(struct svc_rqst *rqstp, | 437 | extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp, |
| 438 | struct svc_fh *current_fh, struct nfsd4_open *open); | 438 | struct svc_fh *current_fh, struct nfsd4_open *open); |
| 439 | extern int nfsd4_open_confirm(struct svc_rqst *rqstp, | 439 | extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp, |
| 440 | struct svc_fh *current_fh, struct nfsd4_open_confirm *oc, | 440 | struct svc_fh *current_fh, struct nfsd4_open_confirm *oc, |
| 441 | struct nfs4_stateowner **); | 441 | struct nfs4_stateowner **); |
| 442 | extern int nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, | 442 | extern __be32 nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, |
| 443 | struct nfsd4_close *close, | 443 | struct nfsd4_close *close, |
| 444 | struct nfs4_stateowner **replay_owner); | 444 | struct nfs4_stateowner **replay_owner); |
| 445 | extern int nfsd4_open_downgrade(struct svc_rqst *rqstp, | 445 | extern __be32 nfsd4_open_downgrade(struct svc_rqst *rqstp, |
| 446 | struct svc_fh *current_fh, struct nfsd4_open_downgrade *od, | 446 | struct svc_fh *current_fh, struct nfsd4_open_downgrade *od, |
| 447 | struct nfs4_stateowner **replay_owner); | 447 | struct nfs4_stateowner **replay_owner); |
| 448 | extern int nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, | 448 | extern __be32 nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, |
| 449 | struct nfsd4_lock *lock, | 449 | struct nfsd4_lock *lock, |
| 450 | struct nfs4_stateowner **replay_owner); | 450 | struct nfs4_stateowner **replay_owner); |
| 451 | extern int nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, | 451 | extern __be32 nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, |
| 452 | struct nfsd4_lockt *lockt); | 452 | struct nfsd4_lockt *lockt); |
| 453 | extern int nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, | 453 | extern __be32 nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, |
| 454 | struct nfsd4_locku *locku, | 454 | struct nfsd4_locku *locku, |
| 455 | struct nfs4_stateowner **replay_owner); | 455 | struct nfs4_stateowner **replay_owner); |
| 456 | extern int | 456 | extern __be32 |
| 457 | nfsd4_release_lockowner(struct svc_rqst *rqstp, | 457 | nfsd4_release_lockowner(struct svc_rqst *rqstp, |
| 458 | struct nfsd4_release_lockowner *rlockowner); | 458 | struct nfsd4_release_lockowner *rlockowner); |
| 459 | extern void nfsd4_release_compoundargs(struct nfsd4_compoundargs *); | 459 | extern void nfsd4_release_compoundargs(struct nfsd4_compoundargs *); |
| 460 | extern int nfsd4_delegreturn(struct svc_rqst *rqstp, | 460 | extern __be32 nfsd4_delegreturn(struct svc_rqst *rqstp, |
| 461 | struct svc_fh *current_fh, struct nfsd4_delegreturn *dr); | 461 | struct svc_fh *current_fh, struct nfsd4_delegreturn *dr); |
| 462 | #endif | 462 | #endif |
| 463 | 463 | ||
diff --git a/include/linux/oom.h b/include/linux/oom.h new file mode 100644 index 000000000000..ad76463629a0 --- /dev/null +++ b/include/linux/oom.h | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | #ifndef __INCLUDE_LINUX_OOM_H | ||
| 2 | #define __INCLUDE_LINUX_OOM_H | ||
| 3 | |||
| 4 | /* /proc/<pid>/oom_adj set to -17 protects from the oom-killer */ | ||
| 5 | #define OOM_DISABLE (-17) | ||
| 6 | /* inclusive */ | ||
| 7 | #define OOM_ADJUST_MIN (-16) | ||
| 8 | #define OOM_ADJUST_MAX 15 | ||
| 9 | |||
| 10 | #endif | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index 4689e2a699c0..09be0f81b27b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -455,7 +455,11 @@ int pci_find_next_capability (struct pci_dev *dev, u8 pos, int cap); | |||
| 455 | int pci_find_ext_capability (struct pci_dev *dev, int cap); | 455 | int pci_find_ext_capability (struct pci_dev *dev, int cap); |
| 456 | struct pci_bus *pci_find_next_bus(const struct pci_bus *from); | 456 | struct pci_bus *pci_find_next_bus(const struct pci_bus *from); |
| 457 | 457 | ||
| 458 | struct pci_dev *pci_get_device (unsigned int vendor, unsigned int device, struct pci_dev *from); | 458 | struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device, |
| 459 | struct pci_dev *from); | ||
| 460 | struct pci_dev *pci_get_device_reverse(unsigned int vendor, unsigned int device, | ||
| 461 | struct pci_dev *from); | ||
| 462 | |||
| 459 | struct pci_dev *pci_get_subsys (unsigned int vendor, unsigned int device, | 463 | struct pci_dev *pci_get_subsys (unsigned int vendor, unsigned int device, |
| 460 | unsigned int ss_vendor, unsigned int ss_device, | 464 | unsigned int ss_vendor, unsigned int ss_device, |
| 461 | struct pci_dev *from); | 465 | struct pci_dev *from); |
| @@ -660,7 +664,12 @@ static inline struct pci_dev *pci_find_device(unsigned int vendor, unsigned int | |||
| 660 | static inline struct pci_dev *pci_find_slot(unsigned int bus, unsigned int devfn) | 664 | static inline struct pci_dev *pci_find_slot(unsigned int bus, unsigned int devfn) |
| 661 | { return NULL; } | 665 | { return NULL; } |
| 662 | 666 | ||
| 663 | static inline struct pci_dev *pci_get_device (unsigned int vendor, unsigned int device, struct pci_dev *from) | 667 | static inline struct pci_dev *pci_get_device(unsigned int vendor, |
| 668 | unsigned int device, struct pci_dev *from) | ||
| 669 | { return NULL; } | ||
| 670 | |||
| 671 | static inline struct pci_dev *pci_get_device_reverse(unsigned int vendor, | ||
| 672 | unsigned int device, struct pci_dev *from) | ||
| 664 | { return NULL; } | 673 | { return NULL; } |
| 665 | 674 | ||
| 666 | static inline struct pci_dev *pci_get_subsys (unsigned int vendor, unsigned int device, | 675 | static inline struct pci_dev *pci_get_subsys (unsigned int vendor, unsigned int device, |
diff --git a/include/linux/personality.h b/include/linux/personality.h index 80d780e5a8f5..bf4cf2080e5c 100644 --- a/include/linux/personality.h +++ b/include/linux/personality.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _LINUX_PERSONALITY_H | 1 | #ifndef _LINUX_PERSONALITY_H |
| 2 | #define _LINUX_PERSONALITY_H | 2 | #define _LINUX_PERSONALITY_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | |||
| 4 | /* | 6 | /* |
| 5 | * Handling of different ABIs (personalities). | 7 | * Handling of different ABIs (personalities). |
| 6 | */ | 8 | */ |
| @@ -12,6 +14,8 @@ extern int register_exec_domain(struct exec_domain *); | |||
| 12 | extern int unregister_exec_domain(struct exec_domain *); | 14 | extern int unregister_exec_domain(struct exec_domain *); |
| 13 | extern int __set_personality(unsigned long); | 15 | extern int __set_personality(unsigned long); |
| 14 | 16 | ||
| 17 | #endif /* __KERNEL__ */ | ||
| 18 | |||
| 15 | /* | 19 | /* |
| 16 | * Flags for bug emulation. | 20 | * Flags for bug emulation. |
| 17 | * | 21 | * |
| @@ -71,6 +75,7 @@ enum { | |||
| 71 | PER_MASK = 0x00ff, | 75 | PER_MASK = 0x00ff, |
| 72 | }; | 76 | }; |
| 73 | 77 | ||
| 78 | #ifdef __KERNEL__ | ||
| 74 | 79 | ||
| 75 | /* | 80 | /* |
| 76 | * Description of an execution domain. | 81 | * Description of an execution domain. |
| @@ -111,4 +116,6 @@ struct exec_domain { | |||
| 111 | #define set_personality(pers) \ | 116 | #define set_personality(pers) \ |
| 112 | ((current->personality == pers) ? 0 : __set_personality(pers)) | 117 | ((current->personality == pers) ? 0 : __set_personality(pers)) |
| 113 | 118 | ||
| 119 | #endif /* __KERNEL__ */ | ||
| 120 | |||
| 114 | #endif /* _LINUX_PERSONALITY_H */ | 121 | #endif /* _LINUX_PERSONALITY_H */ |
diff --git a/include/linux/raid/bitmap.h b/include/linux/raid/bitmap.h index 84d887751855..ebd42a3710b4 100644 --- a/include/linux/raid/bitmap.h +++ b/include/linux/raid/bitmap.h | |||
| @@ -146,16 +146,16 @@ enum bitmap_state { | |||
| 146 | 146 | ||
| 147 | /* the superblock at the front of the bitmap file -- little endian */ | 147 | /* the superblock at the front of the bitmap file -- little endian */ |
| 148 | typedef struct bitmap_super_s { | 148 | typedef struct bitmap_super_s { |
| 149 | __u32 magic; /* 0 BITMAP_MAGIC */ | 149 | __le32 magic; /* 0 BITMAP_MAGIC */ |
| 150 | __u32 version; /* 4 the bitmap major for now, could change... */ | 150 | __le32 version; /* 4 the bitmap major for now, could change... */ |
| 151 | __u8 uuid[16]; /* 8 128 bit uuid - must match md device uuid */ | 151 | __u8 uuid[16]; /* 8 128 bit uuid - must match md device uuid */ |
| 152 | __u64 events; /* 24 event counter for the bitmap (1)*/ | 152 | __le64 events; /* 24 event counter for the bitmap (1)*/ |
| 153 | __u64 events_cleared;/*32 event counter when last bit cleared (2) */ | 153 | __le64 events_cleared;/*32 event counter when last bit cleared (2) */ |
| 154 | __u64 sync_size; /* 40 the size of the md device's sync range(3) */ | 154 | __le64 sync_size; /* 40 the size of the md device's sync range(3) */ |
| 155 | __u32 state; /* 48 bitmap state information */ | 155 | __le32 state; /* 48 bitmap state information */ |
| 156 | __u32 chunksize; /* 52 the bitmap chunk size in bytes */ | 156 | __le32 chunksize; /* 52 the bitmap chunk size in bytes */ |
| 157 | __u32 daemon_sleep; /* 56 seconds between disk flushes */ | 157 | __le32 daemon_sleep; /* 56 seconds between disk flushes */ |
| 158 | __u32 write_behind; /* 60 number of outstanding write-behind writes */ | 158 | __le32 write_behind; /* 60 number of outstanding write-behind writes */ |
| 159 | 159 | ||
| 160 | __u8 pad[256 - 64]; /* set to zero */ | 160 | __u8 pad[256 - 64]; /* set to zero */ |
| 161 | } bitmap_super_t; | 161 | } bitmap_super_t; |
diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h index b6ebc69bae54..3f2cd98c508b 100644 --- a/include/linux/raid/md_p.h +++ b/include/linux/raid/md_p.h | |||
| @@ -206,52 +206,52 @@ static inline __u64 md_event(mdp_super_t *sb) { | |||
| 206 | */ | 206 | */ |
| 207 | struct mdp_superblock_1 { | 207 | struct mdp_superblock_1 { |
| 208 | /* constant array information - 128 bytes */ | 208 | /* constant array information - 128 bytes */ |
| 209 | __u32 magic; /* MD_SB_MAGIC: 0xa92b4efc - little endian */ | 209 | __le32 magic; /* MD_SB_MAGIC: 0xa92b4efc - little endian */ |
| 210 | __u32 major_version; /* 1 */ | 210 | __le32 major_version; /* 1 */ |
| 211 | __u32 feature_map; /* bit 0 set if 'bitmap_offset' is meaningful */ | 211 | __le32 feature_map; /* bit 0 set if 'bitmap_offset' is meaningful */ |
| 212 | __u32 pad0; /* always set to 0 when writing */ | 212 | __le32 pad0; /* always set to 0 when writing */ |
| 213 | 213 | ||
| 214 | __u8 set_uuid[16]; /* user-space generated. */ | 214 | __u8 set_uuid[16]; /* user-space generated. */ |
| 215 | char set_name[32]; /* set and interpreted by user-space */ | 215 | char set_name[32]; /* set and interpreted by user-space */ |
| 216 | 216 | ||
| 217 | __u64 ctime; /* lo 40 bits are seconds, top 24 are microseconds or 0*/ | 217 | __le64 ctime; /* lo 40 bits are seconds, top 24 are microseconds or 0*/ |
| 218 | __u32 level; /* -4 (multipath), -1 (linear), 0,1,4,5 */ | 218 | __le32 level; /* -4 (multipath), -1 (linear), 0,1,4,5 */ |
| 219 | __u32 layout; /* only for raid5 and raid10 currently */ | 219 | __le32 layout; /* only for raid5 and raid10 currently */ |
| 220 | __u64 size; /* used size of component devices, in 512byte sectors */ | 220 | __le64 size; /* used size of component devices, in 512byte sectors */ |
| 221 | 221 | ||
| 222 | __u32 chunksize; /* in 512byte sectors */ | 222 | __le32 chunksize; /* in 512byte sectors */ |
| 223 | __u32 raid_disks; | 223 | __le32 raid_disks; |
| 224 | __u32 bitmap_offset; /* sectors after start of superblock that bitmap starts | 224 | __le32 bitmap_offset; /* sectors after start of superblock that bitmap starts |
| 225 | * NOTE: signed, so bitmap can be before superblock | 225 | * NOTE: signed, so bitmap can be before superblock |
| 226 | * only meaningful of feature_map[0] is set. | 226 | * only meaningful of feature_map[0] is set. |
| 227 | */ | 227 | */ |
| 228 | 228 | ||
| 229 | /* These are only valid with feature bit '4' */ | 229 | /* These are only valid with feature bit '4' */ |
| 230 | __u32 new_level; /* new level we are reshaping to */ | 230 | __le32 new_level; /* new level we are reshaping to */ |
| 231 | __u64 reshape_position; /* next address in array-space for reshape */ | 231 | __le64 reshape_position; /* next address in array-space for reshape */ |
| 232 | __u32 delta_disks; /* change in number of raid_disks */ | 232 | __le32 delta_disks; /* change in number of raid_disks */ |
| 233 | __u32 new_layout; /* new layout */ | 233 | __le32 new_layout; /* new layout */ |
| 234 | __u32 new_chunk; /* new chunk size (bytes) */ | 234 | __le32 new_chunk; /* new chunk size (bytes) */ |
| 235 | __u8 pad1[128-124]; /* set to 0 when written */ | 235 | __u8 pad1[128-124]; /* set to 0 when written */ |
| 236 | 236 | ||
| 237 | /* constant this-device information - 64 bytes */ | 237 | /* constant this-device information - 64 bytes */ |
| 238 | __u64 data_offset; /* sector start of data, often 0 */ | 238 | __le64 data_offset; /* sector start of data, often 0 */ |
| 239 | __u64 data_size; /* sectors in this device that can be used for data */ | 239 | __le64 data_size; /* sectors in this device that can be used for data */ |
| 240 | __u64 super_offset; /* sector start of this superblock */ | 240 | __le64 super_offset; /* sector start of this superblock */ |
| 241 | __u64 recovery_offset;/* sectors before this offset (from data_offset) have been recovered */ | 241 | __le64 recovery_offset;/* sectors before this offset (from data_offset) have been recovered */ |
| 242 | __u32 dev_number; /* permanent identifier of this device - not role in raid */ | 242 | __le32 dev_number; /* permanent identifier of this device - not role in raid */ |
| 243 | __u32 cnt_corrected_read; /* number of read errors that were corrected by re-writing */ | 243 | __le32 cnt_corrected_read; /* number of read errors that were corrected by re-writing */ |
| 244 | __u8 device_uuid[16]; /* user-space setable, ignored by kernel */ | 244 | __u8 device_uuid[16]; /* user-space setable, ignored by kernel */ |
| 245 | __u8 devflags; /* per-device flags. Only one defined...*/ | 245 | __u8 devflags; /* per-device flags. Only one defined...*/ |
| 246 | #define WriteMostly1 1 /* mask for writemostly flag in above */ | 246 | #define WriteMostly1 1 /* mask for writemostly flag in above */ |
| 247 | __u8 pad2[64-57]; /* set to 0 when writing */ | 247 | __u8 pad2[64-57]; /* set to 0 when writing */ |
| 248 | 248 | ||
| 249 | /* array state information - 64 bytes */ | 249 | /* array state information - 64 bytes */ |
| 250 | __u64 utime; /* 40 bits second, 24 btes microseconds */ | 250 | __le64 utime; /* 40 bits second, 24 btes microseconds */ |
| 251 | __u64 events; /* incremented when superblock updated */ | 251 | __le64 events; /* incremented when superblock updated */ |
| 252 | __u64 resync_offset; /* data before this offset (from data_offset) known to be in sync */ | 252 | __le64 resync_offset; /* data before this offset (from data_offset) known to be in sync */ |
| 253 | __u32 sb_csum; /* checksum upto devs[max_dev] */ | 253 | __le32 sb_csum; /* checksum upto devs[max_dev] */ |
| 254 | __u32 max_dev; /* size of devs[] array to consider */ | 254 | __le32 max_dev; /* size of devs[] array to consider */ |
| 255 | __u8 pad3[64-32]; /* set to 0 when writing */ | 255 | __u8 pad3[64-32]; /* set to 0 when writing */ |
| 256 | 256 | ||
| 257 | /* device state information. Indexed by dev_number. | 257 | /* device state information. Indexed by dev_number. |
| @@ -260,7 +260,7 @@ struct mdp_superblock_1 { | |||
| 260 | * into the 'roles' value. If a device is spare or faulty, then it doesn't | 260 | * into the 'roles' value. If a device is spare or faulty, then it doesn't |
| 261 | * have a meaningful role. | 261 | * have a meaningful role. |
| 262 | */ | 262 | */ |
| 263 | __u16 dev_roles[0]; /* role in array, or 0xffff for a spare, or 0xfffe for faulty */ | 263 | __le16 dev_roles[0]; /* role in array, or 0xffff for a spare, or 0xfffe for faulty */ |
| 264 | }; | 264 | }; |
| 265 | 265 | ||
| 266 | /* feature_map bits */ | 266 | /* feature_map bits */ |
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 9c9a8ad92477..965d6c20086e 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h | |||
| @@ -335,7 +335,7 @@ struct svc_version { | |||
| 335 | /* | 335 | /* |
| 336 | * RPC procedure info | 336 | * RPC procedure info |
| 337 | */ | 337 | */ |
| 338 | typedef int (*svc_procfunc)(struct svc_rqst *, void *argp, void *resp); | 338 | typedef __be32 (*svc_procfunc)(struct svc_rqst *, void *argp, void *resp); |
| 339 | struct svc_procedure { | 339 | struct svc_procedure { |
| 340 | svc_procfunc pc_func; /* process the request */ | 340 | svc_procfunc pc_func; /* process the request */ |
| 341 | kxdrproc_t pc_decode; /* XDR decode args */ | 341 | kxdrproc_t pc_decode; /* XDR decode args */ |
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 0e058a2d1c6d..2d36f6db3706 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
| @@ -342,6 +342,8 @@ struct tcp_sock { | |||
| 342 | 342 | ||
| 343 | unsigned long last_synq_overflow; | 343 | unsigned long last_synq_overflow; |
| 344 | 344 | ||
| 345 | __u32 tso_deferred; | ||
| 346 | |||
| 345 | /* Receiver side RTT estimation */ | 347 | /* Receiver side RTT estimation */ |
| 346 | struct { | 348 | struct { |
| 347 | __u32 rtt; | 349 | __u32 rtt; |
diff --git a/include/linux/tipc.h b/include/linux/tipc.h index 243a15f54002..bea469455a0c 100644 --- a/include/linux/tipc.h +++ b/include/linux/tipc.h | |||
| @@ -129,6 +129,7 @@ static inline unsigned int tipc_node(__u32 addr) | |||
| 129 | 129 | ||
| 130 | #define TIPC_SUB_PORTS 0x01 /* filter for port availability */ | 130 | #define TIPC_SUB_PORTS 0x01 /* filter for port availability */ |
| 131 | #define TIPC_SUB_SERVICE 0x02 /* filter for service availability */ | 131 | #define TIPC_SUB_SERVICE 0x02 /* filter for service availability */ |
| 132 | #define TIPC_SUB_CANCEL 0x04 /* cancel a subscription */ | ||
| 132 | #if 0 | 133 | #if 0 |
| 133 | /* The following filter options are not currently implemented */ | 134 | /* The following filter options are not currently implemented */ |
| 134 | #define TIPC_SUB_NO_BIND_EVTS 0x04 /* filter out "publish" events */ | 135 | #define TIPC_SUB_NO_BIND_EVTS 0x04 /* filter out "publish" events */ |
diff --git a/include/linux/unwind.h b/include/linux/unwind.h index 73e1751d03dd..749928c161fb 100644 --- a/include/linux/unwind.h +++ b/include/linux/unwind.h | |||
| @@ -26,6 +26,7 @@ struct module; | |||
| 26 | * Initialize unwind support. | 26 | * Initialize unwind support. |
| 27 | */ | 27 | */ |
| 28 | extern void unwind_init(void); | 28 | extern void unwind_init(void); |
| 29 | extern void unwind_setup(void); | ||
| 29 | 30 | ||
| 30 | #ifdef CONFIG_MODULES | 31 | #ifdef CONFIG_MODULES |
| 31 | 32 | ||
| @@ -73,6 +74,7 @@ extern int unwind_to_user(struct unwind_frame_info *); | |||
| 73 | struct unwind_frame_info {}; | 74 | struct unwind_frame_info {}; |
| 74 | 75 | ||
| 75 | static inline void unwind_init(void) {} | 76 | static inline void unwind_init(void) {} |
| 77 | static inline void unwind_setup(void) {} | ||
| 76 | 78 | ||
| 77 | #ifdef CONFIG_MODULES | 79 | #ifdef CONFIG_MODULES |
| 78 | 80 | ||
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index a341c8032866..fc35e6bdfb93 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
| @@ -85,7 +85,6 @@ int wakeup_pdflush(long nr_pages); | |||
| 85 | void laptop_io_completion(void); | 85 | void laptop_io_completion(void); |
| 86 | void laptop_sync_completion(void); | 86 | void laptop_sync_completion(void); |
| 87 | void throttle_vm_writeout(void); | 87 | void throttle_vm_writeout(void); |
| 88 | void writeback_congestion_end(void); | ||
| 89 | 88 | ||
| 90 | /* These are exported to sysctl. */ | 89 | /* These are exported to sysctl. */ |
| 91 | extern int dirty_background_ratio; | 90 | extern int dirty_background_ratio; |
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h index 425b3a57ac74..617b672b1132 100644 --- a/include/net/ieee80211softmac.h +++ b/include/net/ieee80211softmac.h | |||
| @@ -63,13 +63,11 @@ struct ieee80211softmac_wpa { | |||
| 63 | 63 | ||
| 64 | /* | 64 | /* |
| 65 | * Information about association | 65 | * Information about association |
| 66 | * | ||
| 67 | * Do we need a lock for this? | ||
| 68 | * We only ever use this structure inlined | ||
| 69 | * into our global struct. I've used its lock, | ||
| 70 | * but maybe we need a local one here? | ||
| 71 | */ | 66 | */ |
| 72 | struct ieee80211softmac_assoc_info { | 67 | struct ieee80211softmac_assoc_info { |
| 68 | |||
| 69 | struct mutex mutex; | ||
| 70 | |||
| 73 | /* | 71 | /* |
| 74 | * This is the requested ESSID. It is written | 72 | * This is the requested ESSID. It is written |
| 75 | * only by the WX handlers. | 73 | * only by the WX handlers. |
| @@ -99,12 +97,13 @@ struct ieee80211softmac_assoc_info { | |||
| 99 | * | 97 | * |
| 100 | * bssfixed is used for SIOCSIWAP. | 98 | * bssfixed is used for SIOCSIWAP. |
| 101 | */ | 99 | */ |
| 102 | u8 static_essid:1, | 100 | u8 static_essid; |
| 103 | short_preamble_available:1, | 101 | u8 short_preamble_available; |
| 104 | associating:1, | 102 | u8 associating; |
| 105 | assoc_wait:1, | 103 | u8 associated; |
| 106 | bssvalid:1, | 104 | u8 assoc_wait; |
| 107 | bssfixed:1; | 105 | u8 bssvalid; |
| 106 | u8 bssfixed; | ||
| 108 | 107 | ||
| 109 | /* Scan retries remaining */ | 108 | /* Scan retries remaining */ |
| 110 | int scan_retry; | 109 | int scan_retry; |
| @@ -229,12 +228,10 @@ struct ieee80211softmac_device { | |||
| 229 | /* private stuff follows */ | 228 | /* private stuff follows */ |
| 230 | /* this lock protects this structure */ | 229 | /* this lock protects this structure */ |
| 231 | spinlock_t lock; | 230 | spinlock_t lock; |
| 232 | 231 | ||
| 233 | /* couple of flags */ | 232 | u8 running; /* SoftMAC started? */ |
| 234 | u8 scanning:1, /* protects scanning from being done multiple times at once */ | 233 | u8 scanning; |
| 235 | associated:1, | 234 | |
| 236 | running:1; | ||
| 237 | |||
| 238 | struct ieee80211softmac_scaninfo *scaninfo; | 235 | struct ieee80211softmac_scaninfo *scaninfo; |
| 239 | struct ieee80211softmac_assoc_info associnfo; | 236 | struct ieee80211softmac_assoc_info associnfo; |
| 240 | struct ieee80211softmac_bss_info bssinfo; | 237 | struct ieee80211softmac_bss_info bssinfo; |
| @@ -250,7 +247,7 @@ struct ieee80211softmac_device { | |||
| 250 | 247 | ||
| 251 | /* we need to keep a list of network structs we copied */ | 248 | /* we need to keep a list of network structs we copied */ |
| 252 | struct list_head network_list; | 249 | struct list_head network_list; |
| 253 | 250 | ||
| 254 | /* This must be the last item so that it points to the data | 251 | /* This must be the last item so that it points to the data |
| 255 | * allocated beyond this structure by alloc_ieee80211 */ | 252 | * allocated beyond this structure by alloc_ieee80211 */ |
| 256 | u8 priv[0]; | 253 | u8 priv[0]; |
| @@ -295,7 +292,7 @@ static inline u8 ieee80211softmac_suggest_txrate(struct ieee80211softmac_device | |||
| 295 | { | 292 | { |
| 296 | struct ieee80211softmac_txrates *txrates = &mac->txrates; | 293 | struct ieee80211softmac_txrates *txrates = &mac->txrates; |
| 297 | 294 | ||
| 298 | if (!mac->associated) | 295 | if (!mac->associnfo.associated) |
| 299 | return txrates->mgt_mcast_rate; | 296 | return txrates->mgt_mcast_rate; |
| 300 | 297 | ||
| 301 | /* We are associated, sending unicast frame */ | 298 | /* We are associated, sending unicast frame */ |
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h index f13cc0c2b163..aa10a8178e70 100644 --- a/include/net/inetpeer.h +++ b/include/net/inetpeer.h | |||
| @@ -17,14 +17,15 @@ | |||
| 17 | 17 | ||
| 18 | struct inet_peer | 18 | struct inet_peer |
| 19 | { | 19 | { |
| 20 | /* group together avl_left,avl_right,v4daddr to speedup lookups */ | ||
| 20 | struct inet_peer *avl_left, *avl_right; | 21 | struct inet_peer *avl_left, *avl_right; |
| 22 | __be32 v4daddr; /* peer's address */ | ||
| 23 | __u16 avl_height; | ||
| 24 | __u16 ip_id_count; /* IP ID for the next packet */ | ||
| 21 | struct inet_peer *unused_next, **unused_prevp; | 25 | struct inet_peer *unused_next, **unused_prevp; |
| 22 | __u32 dtime; /* the time of last use of not | 26 | __u32 dtime; /* the time of last use of not |
| 23 | * referenced entries */ | 27 | * referenced entries */ |
| 24 | atomic_t refcnt; | 28 | atomic_t refcnt; |
| 25 | __be32 v4daddr; /* peer's address */ | ||
| 26 | __u16 avl_height; | ||
| 27 | __u16 ip_id_count; /* IP ID for the next packet */ | ||
| 28 | atomic_t rid; /* Frag reception counter */ | 29 | atomic_t rid; /* Frag reception counter */ |
| 29 | __u32 tcp_ts; | 30 | __u32 tcp_ts; |
| 30 | unsigned long tcp_ts_stamp; | 31 | unsigned long tcp_ts_stamp; |
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 6ca6b71dfe0f..c14b70ed4c57 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
| @@ -36,13 +36,6 @@ struct route_info { | |||
| 36 | #define RT6_LOOKUP_F_REACHABLE 0x2 | 36 | #define RT6_LOOKUP_F_REACHABLE 0x2 |
| 37 | #define RT6_LOOKUP_F_HAS_SADDR 0x4 | 37 | #define RT6_LOOKUP_F_HAS_SADDR 0x4 |
| 38 | 38 | ||
| 39 | struct pol_chain { | ||
| 40 | int type; | ||
| 41 | int priority; | ||
| 42 | struct fib6_node *rules; | ||
| 43 | struct pol_chain *next; | ||
| 44 | }; | ||
| 45 | |||
| 46 | extern struct rt6_info ip6_null_entry; | 39 | extern struct rt6_info ip6_null_entry; |
| 47 | 40 | ||
| 48 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES | 41 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES |
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 82229146bac7..949b932d2f08 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
| @@ -21,17 +21,14 @@ | |||
| 21 | #include <net/fib_rules.h> | 21 | #include <net/fib_rules.h> |
| 22 | 22 | ||
| 23 | struct fib_config { | 23 | struct fib_config { |
| 24 | u8 fc_family; | ||
| 25 | u8 fc_dst_len; | 24 | u8 fc_dst_len; |
| 26 | u8 fc_src_len; | ||
| 27 | u8 fc_tos; | 25 | u8 fc_tos; |
| 28 | u8 fc_protocol; | 26 | u8 fc_protocol; |
| 29 | u8 fc_scope; | 27 | u8 fc_scope; |
| 30 | u8 fc_type; | 28 | u8 fc_type; |
| 31 | /* 1 byte unused */ | 29 | /* 3 bytes unused */ |
| 32 | u32 fc_table; | 30 | u32 fc_table; |
| 33 | __be32 fc_dst; | 31 | __be32 fc_dst; |
| 34 | __be32 fc_src; | ||
| 35 | __be32 fc_gw; | 32 | __be32 fc_gw; |
| 36 | int fc_oif; | 33 | int fc_oif; |
| 37 | u32 fc_flags; | 34 | u32 fc_flags; |
diff --git a/init/Kconfig b/init/Kconfig index 10382931eead..c8b2624af176 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | config DEFCONFIG_LIST | 1 | config DEFCONFIG_LIST |
| 2 | string | 2 | string |
| 3 | depends on !UML | ||
| 3 | option defconfig_list | 4 | option defconfig_list |
| 4 | default "/lib/modules/$UNAME_RELEASE/.config" | 5 | default "/lib/modules/$UNAME_RELEASE/.config" |
| 5 | default "/etc/kernel-config" | 6 | default "/etc/kernel-config" |
diff --git a/init/main.c b/init/main.c index ee123243fb53..36f608a7cfba 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -503,6 +503,7 @@ asmlinkage void __init start_kernel(void) | |||
| 503 | printk(KERN_NOTICE); | 503 | printk(KERN_NOTICE); |
| 504 | printk(linux_banner); | 504 | printk(linux_banner); |
| 505 | setup_arch(&command_line); | 505 | setup_arch(&command_line); |
| 506 | unwind_setup(); | ||
| 506 | setup_per_cpu_areas(); | 507 | setup_per_cpu_areas(); |
| 507 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ | 508 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ |
| 508 | 509 | ||
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index 6ebdb82a0ce4..674aceb7335a 100644 --- a/kernel/nsproxy.c +++ b/kernel/nsproxy.c | |||
| @@ -44,11 +44,9 @@ static inline struct nsproxy *clone_namespaces(struct nsproxy *orig) | |||
| 44 | { | 44 | { |
| 45 | struct nsproxy *ns; | 45 | struct nsproxy *ns; |
| 46 | 46 | ||
| 47 | ns = kmalloc(sizeof(struct nsproxy), GFP_KERNEL); | 47 | ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL); |
| 48 | if (ns) { | 48 | if (ns) |
| 49 | memcpy(ns, orig, sizeof(struct nsproxy)); | ||
| 50 | atomic_set(&ns->count, 1); | 49 | atomic_set(&ns->count, 1); |
| 51 | } | ||
| 52 | return ns; | 50 | return ns; |
| 53 | } | 51 | } |
| 54 | 52 | ||
diff --git a/kernel/sched.c b/kernel/sched.c index 094b5687eef6..3399701c680e 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -160,15 +160,6 @@ | |||
| 160 | #define TASK_PREEMPTS_CURR(p, rq) \ | 160 | #define TASK_PREEMPTS_CURR(p, rq) \ |
| 161 | ((p)->prio < (rq)->curr->prio) | 161 | ((p)->prio < (rq)->curr->prio) |
| 162 | 162 | ||
| 163 | /* | ||
| 164 | * task_timeslice() scales user-nice values [ -20 ... 0 ... 19 ] | ||
| 165 | * to time slice values: [800ms ... 100ms ... 5ms] | ||
| 166 | * | ||
| 167 | * The higher a thread's priority, the bigger timeslices | ||
| 168 | * it gets during one round of execution. But even the lowest | ||
| 169 | * priority thread gets MIN_TIMESLICE worth of execution time. | ||
| 170 | */ | ||
| 171 | |||
| 172 | #define SCALE_PRIO(x, prio) \ | 163 | #define SCALE_PRIO(x, prio) \ |
| 173 | max(x * (MAX_PRIO - prio) / (MAX_USER_PRIO / 2), MIN_TIMESLICE) | 164 | max(x * (MAX_PRIO - prio) / (MAX_USER_PRIO / 2), MIN_TIMESLICE) |
| 174 | 165 | ||
| @@ -180,6 +171,15 @@ static unsigned int static_prio_timeslice(int static_prio) | |||
| 180 | return SCALE_PRIO(DEF_TIMESLICE, static_prio); | 171 | return SCALE_PRIO(DEF_TIMESLICE, static_prio); |
| 181 | } | 172 | } |
| 182 | 173 | ||
| 174 | /* | ||
| 175 | * task_timeslice() scales user-nice values [ -20 ... 0 ... 19 ] | ||
| 176 | * to time slice values: [800ms ... 100ms ... 5ms] | ||
| 177 | * | ||
| 178 | * The higher a thread's priority, the bigger timeslices | ||
| 179 | * it gets during one round of execution. But even the lowest | ||
| 180 | * priority thread gets MIN_TIMESLICE worth of execution time. | ||
| 181 | */ | ||
| 182 | |||
| 183 | static inline unsigned int task_timeslice(struct task_struct *p) | 183 | static inline unsigned int task_timeslice(struct task_struct *p) |
| 184 | { | 184 | { |
| 185 | return static_prio_timeslice(p->static_prio); | 185 | return static_prio_timeslice(p->static_prio); |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 8020fb273c4f..8bff2c18fb5a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -136,8 +136,10 @@ static int parse_table(int __user *, int, void __user *, size_t __user *, | |||
| 136 | static int proc_do_uts_string(ctl_table *table, int write, struct file *filp, | 136 | static int proc_do_uts_string(ctl_table *table, int write, struct file *filp, |
| 137 | void __user *buffer, size_t *lenp, loff_t *ppos); | 137 | void __user *buffer, size_t *lenp, loff_t *ppos); |
| 138 | 138 | ||
| 139 | #ifdef CONFIG_PROC_SYSCTL | ||
| 139 | static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp, | 140 | static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp, |
| 140 | void __user *buffer, size_t *lenp, loff_t *ppos); | 141 | void __user *buffer, size_t *lenp, loff_t *ppos); |
| 142 | #endif | ||
| 141 | 143 | ||
| 142 | static ctl_table root_table[]; | 144 | static ctl_table root_table[]; |
| 143 | static struct ctl_table_header root_table_header = | 145 | static struct ctl_table_header root_table_header = |
| @@ -542,6 +544,7 @@ static ctl_table kern_table[] = { | |||
| 542 | .proc_handler = &proc_dointvec, | 544 | .proc_handler = &proc_dointvec, |
| 543 | }, | 545 | }, |
| 544 | #endif | 546 | #endif |
| 547 | #ifdef CONFIG_PROC_SYSCTL | ||
| 545 | { | 548 | { |
| 546 | .ctl_name = KERN_CADPID, | 549 | .ctl_name = KERN_CADPID, |
| 547 | .procname = "cad_pid", | 550 | .procname = "cad_pid", |
| @@ -550,6 +553,7 @@ static ctl_table kern_table[] = { | |||
| 550 | .mode = 0600, | 553 | .mode = 0600, |
| 551 | .proc_handler = &proc_do_cad_pid, | 554 | .proc_handler = &proc_do_cad_pid, |
| 552 | }, | 555 | }, |
| 556 | #endif | ||
| 553 | { | 557 | { |
| 554 | .ctl_name = KERN_MAX_THREADS, | 558 | .ctl_name = KERN_MAX_THREADS, |
| 555 | .procname = "threads-max", | 559 | .procname = "threads-max", |
diff --git a/kernel/unwind.c b/kernel/unwind.c index 2e2368607aab..f7e50d16dbf6 100644 --- a/kernel/unwind.c +++ b/kernel/unwind.c | |||
| @@ -11,13 +11,15 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/unwind.h> | 12 | #include <linux/unwind.h> |
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/delay.h> | 14 | #include <linux/bootmem.h> |
| 15 | #include <linux/sort.h> | ||
| 15 | #include <linux/stop_machine.h> | 16 | #include <linux/stop_machine.h> |
| 16 | #include <asm/sections.h> | 17 | #include <asm/sections.h> |
| 17 | #include <asm/uaccess.h> | 18 | #include <asm/uaccess.h> |
| 18 | #include <asm/unaligned.h> | 19 | #include <asm/unaligned.h> |
| 19 | 20 | ||
| 20 | extern char __start_unwind[], __end_unwind[]; | 21 | extern char __start_unwind[], __end_unwind[]; |
| 22 | extern const u8 __start_unwind_hdr[], __end_unwind_hdr[]; | ||
| 21 | 23 | ||
| 22 | #define MAX_STACK_DEPTH 8 | 24 | #define MAX_STACK_DEPTH 8 |
| 23 | 25 | ||
| @@ -100,6 +102,8 @@ static struct unwind_table { | |||
| 100 | } core, init; | 102 | } core, init; |
| 101 | const void *address; | 103 | const void *address; |
| 102 | unsigned long size; | 104 | unsigned long size; |
| 105 | const unsigned char *header; | ||
| 106 | unsigned long hdrsz; | ||
| 103 | struct unwind_table *link; | 107 | struct unwind_table *link; |
| 104 | const char *name; | 108 | const char *name; |
| 105 | } root_table; | 109 | } root_table; |
| @@ -145,6 +149,10 @@ static struct unwind_table *find_table(unsigned long pc) | |||
| 145 | return table; | 149 | return table; |
| 146 | } | 150 | } |
| 147 | 151 | ||
| 152 | static unsigned long read_pointer(const u8 **pLoc, | ||
| 153 | const void *end, | ||
| 154 | signed ptrType); | ||
| 155 | |||
| 148 | static void init_unwind_table(struct unwind_table *table, | 156 | static void init_unwind_table(struct unwind_table *table, |
| 149 | const char *name, | 157 | const char *name, |
| 150 | const void *core_start, | 158 | const void *core_start, |
| @@ -152,14 +160,30 @@ static void init_unwind_table(struct unwind_table *table, | |||
| 152 | const void *init_start, | 160 | const void *init_start, |
| 153 | unsigned long init_size, | 161 | unsigned long init_size, |
| 154 | const void *table_start, | 162 | const void *table_start, |
| 155 | unsigned long table_size) | 163 | unsigned long table_size, |
| 164 | const u8 *header_start, | ||
| 165 | unsigned long header_size) | ||
| 156 | { | 166 | { |
| 167 | const u8 *ptr = header_start + 4; | ||
| 168 | const u8 *end = header_start + header_size; | ||
| 169 | |||
| 157 | table->core.pc = (unsigned long)core_start; | 170 | table->core.pc = (unsigned long)core_start; |
| 158 | table->core.range = core_size; | 171 | table->core.range = core_size; |
| 159 | table->init.pc = (unsigned long)init_start; | 172 | table->init.pc = (unsigned long)init_start; |
| 160 | table->init.range = init_size; | 173 | table->init.range = init_size; |
| 161 | table->address = table_start; | 174 | table->address = table_start; |
| 162 | table->size = table_size; | 175 | table->size = table_size; |
| 176 | /* See if the linker provided table looks valid. */ | ||
| 177 | if (header_size <= 4 | ||
| 178 | || header_start[0] != 1 | ||
| 179 | || (void *)read_pointer(&ptr, end, header_start[1]) != table_start | ||
| 180 | || header_start[2] == DW_EH_PE_omit | ||
| 181 | || read_pointer(&ptr, end, header_start[2]) <= 0 | ||
| 182 | || header_start[3] == DW_EH_PE_omit) | ||
| 183 | header_start = NULL; | ||
| 184 | table->hdrsz = header_size; | ||
| 185 | smp_wmb(); | ||
| 186 | table->header = header_start; | ||
| 163 | table->link = NULL; | 187 | table->link = NULL; |
| 164 | table->name = name; | 188 | table->name = name; |
| 165 | } | 189 | } |
| @@ -169,7 +193,143 @@ void __init unwind_init(void) | |||
| 169 | init_unwind_table(&root_table, "kernel", | 193 | init_unwind_table(&root_table, "kernel", |
| 170 | _text, _end - _text, | 194 | _text, _end - _text, |
| 171 | NULL, 0, | 195 | NULL, 0, |
| 172 | __start_unwind, __end_unwind - __start_unwind); | 196 | __start_unwind, __end_unwind - __start_unwind, |
| 197 | __start_unwind_hdr, __end_unwind_hdr - __start_unwind_hdr); | ||
| 198 | } | ||
| 199 | |||
| 200 | static const u32 bad_cie, not_fde; | ||
| 201 | static const u32 *cie_for_fde(const u32 *fde, const struct unwind_table *); | ||
| 202 | static signed fde_pointer_type(const u32 *cie); | ||
| 203 | |||
| 204 | struct eh_frame_hdr_table_entry { | ||
| 205 | unsigned long start, fde; | ||
| 206 | }; | ||
| 207 | |||
| 208 | static int cmp_eh_frame_hdr_table_entries(const void *p1, const void *p2) | ||
| 209 | { | ||
| 210 | const struct eh_frame_hdr_table_entry *e1 = p1; | ||
| 211 | const struct eh_frame_hdr_table_entry *e2 = p2; | ||
| 212 | |||
| 213 | return (e1->start > e2->start) - (e1->start < e2->start); | ||
| 214 | } | ||
| 215 | |||
| 216 | static void swap_eh_frame_hdr_table_entries(void *p1, void *p2, int size) | ||
| 217 | { | ||
| 218 | struct eh_frame_hdr_table_entry *e1 = p1; | ||
| 219 | struct eh_frame_hdr_table_entry *e2 = p2; | ||
| 220 | unsigned long v; | ||
| 221 | |||
| 222 | v = e1->start; | ||
| 223 | e1->start = e2->start; | ||
| 224 | e2->start = v; | ||
| 225 | v = e1->fde; | ||
| 226 | e1->fde = e2->fde; | ||
| 227 | e2->fde = v; | ||
| 228 | } | ||
| 229 | |||
| 230 | static void __init setup_unwind_table(struct unwind_table *table, | ||
| 231 | void *(*alloc)(unsigned long)) | ||
| 232 | { | ||
| 233 | const u8 *ptr; | ||
| 234 | unsigned long tableSize = table->size, hdrSize; | ||
| 235 | unsigned n; | ||
| 236 | const u32 *fde; | ||
| 237 | struct { | ||
| 238 | u8 version; | ||
| 239 | u8 eh_frame_ptr_enc; | ||
| 240 | u8 fde_count_enc; | ||
| 241 | u8 table_enc; | ||
| 242 | unsigned long eh_frame_ptr; | ||
| 243 | unsigned int fde_count; | ||
| 244 | struct eh_frame_hdr_table_entry table[]; | ||
| 245 | } __attribute__((__packed__)) *header; | ||
| 246 | |||
| 247 | if (table->header) | ||
| 248 | return; | ||
| 249 | |||
| 250 | if (table->hdrsz) | ||
| 251 | printk(KERN_WARNING ".eh_frame_hdr for '%s' present but unusable\n", | ||
| 252 | table->name); | ||
| 253 | |||
| 254 | if (tableSize & (sizeof(*fde) - 1)) | ||
| 255 | return; | ||
| 256 | |||
| 257 | for (fde = table->address, n = 0; | ||
| 258 | tableSize > sizeof(*fde) && tableSize - sizeof(*fde) >= *fde; | ||
| 259 | tableSize -= sizeof(*fde) + *fde, fde += 1 + *fde / sizeof(*fde)) { | ||
| 260 | const u32 *cie = cie_for_fde(fde, table); | ||
| 261 | signed ptrType; | ||
| 262 | |||
| 263 | if (cie == ¬_fde) | ||
| 264 | continue; | ||
| 265 | if (cie == NULL | ||
| 266 | || cie == &bad_cie | ||
| 267 | || (ptrType = fde_pointer_type(cie)) < 0) | ||
| 268 | return; | ||
| 269 | ptr = (const u8 *)(fde + 2); | ||
| 270 | if (!read_pointer(&ptr, | ||
| 271 | (const u8 *)(fde + 1) + *fde, | ||
| 272 | ptrType)) | ||
| 273 | return; | ||
| 274 | ++n; | ||
| 275 | } | ||
| 276 | |||
| 277 | if (tableSize || !n) | ||
| 278 | return; | ||
| 279 | |||
| 280 | hdrSize = 4 + sizeof(unsigned long) + sizeof(unsigned int) | ||
| 281 | + 2 * n * sizeof(unsigned long); | ||
| 282 | header = alloc(hdrSize); | ||
| 283 | if (!header) | ||
| 284 | return; | ||
| 285 | header->version = 1; | ||
| 286 | header->eh_frame_ptr_enc = DW_EH_PE_abs|DW_EH_PE_native; | ||
| 287 | header->fde_count_enc = DW_EH_PE_abs|DW_EH_PE_data4; | ||
| 288 | header->table_enc = DW_EH_PE_abs|DW_EH_PE_native; | ||
| 289 | put_unaligned((unsigned long)table->address, &header->eh_frame_ptr); | ||
| 290 | BUILD_BUG_ON(offsetof(typeof(*header), fde_count) | ||
| 291 | % __alignof(typeof(header->fde_count))); | ||
| 292 | header->fde_count = n; | ||
| 293 | |||
| 294 | BUILD_BUG_ON(offsetof(typeof(*header), table) | ||
| 295 | % __alignof(typeof(*header->table))); | ||
| 296 | for (fde = table->address, tableSize = table->size, n = 0; | ||
| 297 | tableSize; | ||
| 298 | tableSize -= sizeof(*fde) + *fde, fde += 1 + *fde / sizeof(*fde)) { | ||
| 299 | const u32 *cie = fde + 1 - fde[1] / sizeof(*fde); | ||
| 300 | |||
| 301 | if (!fde[1]) | ||
| 302 | continue; /* this is a CIE */ | ||
| 303 | ptr = (const u8 *)(fde + 2); | ||
| 304 | header->table[n].start = read_pointer(&ptr, | ||
| 305 | (const u8 *)(fde + 1) + *fde, | ||
| 306 | fde_pointer_type(cie)); | ||
| 307 | header->table[n].fde = (unsigned long)fde; | ||
| 308 | ++n; | ||
| 309 | } | ||
| 310 | WARN_ON(n != header->fde_count); | ||
| 311 | |||
| 312 | sort(header->table, | ||
| 313 | n, | ||
| 314 | sizeof(*header->table), | ||
| 315 | cmp_eh_frame_hdr_table_entries, | ||
| 316 | swap_eh_frame_hdr_table_entries); | ||
| 317 | |||
| 318 | table->hdrsz = hdrSize; | ||
| 319 | smp_wmb(); | ||
| 320 | table->header = (const void *)header; | ||
| 321 | } | ||
| 322 | |||
| 323 | static void *__init balloc(unsigned long sz) | ||
| 324 | { | ||
| 325 | return __alloc_bootmem_nopanic(sz, | ||
| 326 | sizeof(unsigned int), | ||
| 327 | __pa(MAX_DMA_ADDRESS)); | ||
| 328 | } | ||
| 329 | |||
| 330 | void __init unwind_setup(void) | ||
| 331 | { | ||
| 332 | setup_unwind_table(&root_table, balloc); | ||
| 173 | } | 333 | } |
| 174 | 334 | ||
| 175 | #ifdef CONFIG_MODULES | 335 | #ifdef CONFIG_MODULES |
| @@ -193,7 +353,8 @@ void *unwind_add_table(struct module *module, | |||
| 193 | init_unwind_table(table, module->name, | 353 | init_unwind_table(table, module->name, |
| 194 | module->module_core, module->core_size, | 354 | module->module_core, module->core_size, |
| 195 | module->module_init, module->init_size, | 355 | module->module_init, module->init_size, |
| 196 | table_start, table_size); | 356 | table_start, table_size, |
| 357 | NULL, 0); | ||
| 197 | 358 | ||
| 198 | if (last_table) | 359 | if (last_table) |
| 199 | last_table->link = table; | 360 | last_table->link = table; |
| @@ -303,6 +464,26 @@ static sleb128_t get_sleb128(const u8 **pcur, const u8 *end) | |||
| 303 | return value; | 464 | return value; |
| 304 | } | 465 | } |
| 305 | 466 | ||
| 467 | static const u32 *cie_for_fde(const u32 *fde, const struct unwind_table *table) | ||
| 468 | { | ||
| 469 | const u32 *cie; | ||
| 470 | |||
| 471 | if (!*fde || (*fde & (sizeof(*fde) - 1))) | ||
| 472 | return &bad_cie; | ||
| 473 | if (!fde[1]) | ||
| 474 | return ¬_fde; /* this is a CIE */ | ||
| 475 | if ((fde[1] & (sizeof(*fde) - 1)) | ||
| 476 | || fde[1] > (unsigned long)(fde + 1) - (unsigned long)table->address) | ||
| 477 | return NULL; /* this is not a valid FDE */ | ||
| 478 | cie = fde + 1 - fde[1] / sizeof(*fde); | ||
| 479 | if (*cie <= sizeof(*cie) + 4 | ||
| 480 | || *cie >= fde[1] - sizeof(*fde) | ||
| 481 | || (*cie & (sizeof(*cie) - 1)) | ||
| 482 | || cie[1]) | ||
| 483 | return NULL; /* this is not a (valid) CIE */ | ||
| 484 | return cie; | ||
| 485 | } | ||
| 486 | |||
| 306 | static unsigned long read_pointer(const u8 **pLoc, | 487 | static unsigned long read_pointer(const u8 **pLoc, |
| 307 | const void *end, | 488 | const void *end, |
| 308 | signed ptrType) | 489 | signed ptrType) |
| @@ -610,49 +791,108 @@ int unwind(struct unwind_frame_info *frame) | |||
| 610 | unsigned i; | 791 | unsigned i; |
| 611 | signed ptrType = -1; | 792 | signed ptrType = -1; |
| 612 | uleb128_t retAddrReg = 0; | 793 | uleb128_t retAddrReg = 0; |
| 613 | struct unwind_table *table; | 794 | const struct unwind_table *table; |
| 614 | struct unwind_state state; | 795 | struct unwind_state state; |
| 615 | 796 | ||
| 616 | if (UNW_PC(frame) == 0) | 797 | if (UNW_PC(frame) == 0) |
| 617 | return -EINVAL; | 798 | return -EINVAL; |
| 618 | if ((table = find_table(pc)) != NULL | 799 | if ((table = find_table(pc)) != NULL |
| 619 | && !(table->size & (sizeof(*fde) - 1))) { | 800 | && !(table->size & (sizeof(*fde) - 1))) { |
| 620 | unsigned long tableSize = table->size; | 801 | const u8 *hdr = table->header; |
| 621 | 802 | unsigned long tableSize; | |
| 622 | for (fde = table->address; | 803 | |
| 623 | tableSize > sizeof(*fde) && tableSize - sizeof(*fde) >= *fde; | 804 | smp_rmb(); |
| 624 | tableSize -= sizeof(*fde) + *fde, | 805 | if (hdr && hdr[0] == 1) { |
| 625 | fde += 1 + *fde / sizeof(*fde)) { | 806 | switch(hdr[3] & DW_EH_PE_FORM) { |
| 626 | if (!*fde || (*fde & (sizeof(*fde) - 1))) | 807 | case DW_EH_PE_native: tableSize = sizeof(unsigned long); break; |
| 627 | break; | 808 | case DW_EH_PE_data2: tableSize = 2; break; |
| 628 | if (!fde[1]) | 809 | case DW_EH_PE_data4: tableSize = 4; break; |
| 629 | continue; /* this is a CIE */ | 810 | case DW_EH_PE_data8: tableSize = 8; break; |
| 630 | if ((fde[1] & (sizeof(*fde) - 1)) | 811 | default: tableSize = 0; break; |
| 631 | || fde[1] > (unsigned long)(fde + 1) | 812 | } |
| 632 | - (unsigned long)table->address) | 813 | ptr = hdr + 4; |
| 633 | continue; /* this is not a valid FDE */ | 814 | end = hdr + table->hdrsz; |
| 634 | cie = fde + 1 - fde[1] / sizeof(*fde); | 815 | if (tableSize |
| 635 | if (*cie <= sizeof(*cie) + 4 | 816 | && read_pointer(&ptr, end, hdr[1]) |
| 636 | || *cie >= fde[1] - sizeof(*fde) | 817 | == (unsigned long)table->address |
| 637 | || (*cie & (sizeof(*cie) - 1)) | 818 | && (i = read_pointer(&ptr, end, hdr[2])) > 0 |
| 638 | || cie[1] | 819 | && i == (end - ptr) / (2 * tableSize) |
| 639 | || (ptrType = fde_pointer_type(cie)) < 0) { | 820 | && !((end - ptr) % (2 * tableSize))) { |
| 640 | cie = NULL; /* this is not a (valid) CIE */ | 821 | do { |
| 641 | continue; | 822 | const u8 *cur = ptr + (i / 2) * (2 * tableSize); |
| 823 | |||
| 824 | startLoc = read_pointer(&cur, | ||
| 825 | cur + tableSize, | ||
| 826 | hdr[3]); | ||
| 827 | if (pc < startLoc) | ||
| 828 | i /= 2; | ||
| 829 | else { | ||
| 830 | ptr = cur - tableSize; | ||
| 831 | i = (i + 1) / 2; | ||
| 832 | } | ||
| 833 | } while (startLoc && i > 1); | ||
| 834 | if (i == 1 | ||
| 835 | && (startLoc = read_pointer(&ptr, | ||
| 836 | ptr + tableSize, | ||
| 837 | hdr[3])) != 0 | ||
| 838 | && pc >= startLoc) | ||
| 839 | fde = (void *)read_pointer(&ptr, | ||
| 840 | ptr + tableSize, | ||
| 841 | hdr[3]); | ||
| 642 | } | 842 | } |
| 843 | } | ||
| 844 | |||
| 845 | if (fde != NULL) { | ||
| 846 | cie = cie_for_fde(fde, table); | ||
| 643 | ptr = (const u8 *)(fde + 2); | 847 | ptr = (const u8 *)(fde + 2); |
| 644 | startLoc = read_pointer(&ptr, | 848 | if(cie != NULL |
| 645 | (const u8 *)(fde + 1) + *fde, | 849 | && cie != &bad_cie |
| 646 | ptrType); | 850 | && cie != ¬_fde |
| 647 | endLoc = startLoc | 851 | && (ptrType = fde_pointer_type(cie)) >= 0 |
| 648 | + read_pointer(&ptr, | 852 | && read_pointer(&ptr, |
| 649 | (const u8 *)(fde + 1) + *fde, | 853 | (const u8 *)(fde + 1) + *fde, |
| 650 | ptrType & DW_EH_PE_indirect | 854 | ptrType) == startLoc) { |
| 651 | ? ptrType | 855 | if (!(ptrType & DW_EH_PE_indirect)) |
| 652 | : ptrType & (DW_EH_PE_FORM|DW_EH_PE_signed)); | 856 | ptrType &= DW_EH_PE_FORM|DW_EH_PE_signed; |
| 653 | if (pc >= startLoc && pc < endLoc) | 857 | endLoc = startLoc |
| 654 | break; | 858 | + read_pointer(&ptr, |
| 655 | cie = NULL; | 859 | (const u8 *)(fde + 1) + *fde, |
| 860 | ptrType); | ||
| 861 | if(pc >= endLoc) | ||
| 862 | fde = NULL; | ||
| 863 | } else | ||
| 864 | fde = NULL; | ||
| 865 | } | ||
| 866 | if (fde == NULL) { | ||
| 867 | for (fde = table->address, tableSize = table->size; | ||
| 868 | cie = NULL, tableSize > sizeof(*fde) | ||
| 869 | && tableSize - sizeof(*fde) >= *fde; | ||
| 870 | tableSize -= sizeof(*fde) + *fde, | ||
| 871 | fde += 1 + *fde / sizeof(*fde)) { | ||
| 872 | cie = cie_for_fde(fde, table); | ||
| 873 | if (cie == &bad_cie) { | ||
| 874 | cie = NULL; | ||
| 875 | break; | ||
| 876 | } | ||
| 877 | if (cie == NULL | ||
| 878 | || cie == ¬_fde | ||
| 879 | || (ptrType = fde_pointer_type(cie)) < 0) | ||
| 880 | continue; | ||
| 881 | ptr = (const u8 *)(fde + 2); | ||
| 882 | startLoc = read_pointer(&ptr, | ||
| 883 | (const u8 *)(fde + 1) + *fde, | ||
| 884 | ptrType); | ||
| 885 | if (!startLoc) | ||
| 886 | continue; | ||
| 887 | if (!(ptrType & DW_EH_PE_indirect)) | ||
| 888 | ptrType &= DW_EH_PE_FORM|DW_EH_PE_signed; | ||
| 889 | endLoc = startLoc | ||
| 890 | + read_pointer(&ptr, | ||
| 891 | (const u8 *)(fde + 1) + *fde, | ||
| 892 | ptrType); | ||
| 893 | if (pc >= startLoc && pc < endLoc) | ||
| 894 | break; | ||
| 895 | } | ||
| 656 | } | 896 | } |
| 657 | } | 897 | } |
| 658 | if (cie != NULL) { | 898 | if (cie != NULL) { |
diff --git a/lib/cpumask.c b/lib/cpumask.c index 7a2a73f88d59..3a67dc5ada7d 100644 --- a/lib/cpumask.c +++ b/lib/cpumask.c | |||
| @@ -43,19 +43,3 @@ int __any_online_cpu(const cpumask_t *mask) | |||
| 43 | return cpu; | 43 | return cpu; |
| 44 | } | 44 | } |
| 45 | EXPORT_SYMBOL(__any_online_cpu); | 45 | EXPORT_SYMBOL(__any_online_cpu); |
| 46 | |||
| 47 | #if MAX_NUMNODES > 1 | ||
| 48 | /* | ||
| 49 | * Find the highest possible node id. | ||
| 50 | */ | ||
| 51 | int highest_possible_node_id(void) | ||
| 52 | { | ||
| 53 | unsigned int node; | ||
| 54 | unsigned int highest = 0; | ||
| 55 | |||
| 56 | for_each_node_mask(node, node_possible_map) | ||
| 57 | highest = node; | ||
| 58 | return highest; | ||
| 59 | } | ||
| 60 | EXPORT_SYMBOL(highest_possible_node_id); | ||
| 61 | #endif | ||
diff --git a/mm/Makefile b/mm/Makefile index 12b3a4eee88d..f3c077eb0b8e 100644 --- a/mm/Makefile +++ b/mm/Makefile | |||
| @@ -10,7 +10,8 @@ mmu-$(CONFIG_MMU) := fremap.o highmem.o madvise.o memory.o mincore.o \ | |||
| 10 | obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ | 10 | obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ |
| 11 | page_alloc.o page-writeback.o pdflush.o \ | 11 | page_alloc.o page-writeback.o pdflush.o \ |
| 12 | readahead.o swap.o truncate.o vmscan.o \ | 12 | readahead.o swap.o truncate.o vmscan.o \ |
| 13 | prio_tree.o util.o mmzone.o vmstat.o $(mmu-y) | 13 | prio_tree.o util.o mmzone.o vmstat.o backing-dev.o \ |
| 14 | $(mmu-y) | ||
| 14 | 15 | ||
| 15 | ifeq ($(CONFIG_MMU)$(CONFIG_BLOCK),yy) | 16 | ifeq ($(CONFIG_MMU)$(CONFIG_BLOCK),yy) |
| 16 | obj-y += bounce.o | 17 | obj-y += bounce.o |
diff --git a/mm/backing-dev.c b/mm/backing-dev.c new file mode 100644 index 000000000000..f50a2811f9dc --- /dev/null +++ b/mm/backing-dev.c | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | |||
| 2 | #include <linux/wait.h> | ||
| 3 | #include <linux/backing-dev.h> | ||
| 4 | #include <linux/fs.h> | ||
| 5 | #include <linux/sched.h> | ||
| 6 | #include <linux/module.h> | ||
| 7 | |||
| 8 | static wait_queue_head_t congestion_wqh[2] = { | ||
| 9 | __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[0]), | ||
| 10 | __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[1]) | ||
| 11 | }; | ||
| 12 | |||
| 13 | |||
| 14 | void clear_bdi_congested(struct backing_dev_info *bdi, int rw) | ||
| 15 | { | ||
| 16 | enum bdi_state bit; | ||
| 17 | wait_queue_head_t *wqh = &congestion_wqh[rw]; | ||
| 18 | |||
| 19 | bit = (rw == WRITE) ? BDI_write_congested : BDI_read_congested; | ||
| 20 | clear_bit(bit, &bdi->state); | ||
| 21 | smp_mb__after_clear_bit(); | ||
| 22 | if (waitqueue_active(wqh)) | ||
| 23 | wake_up(wqh); | ||
| 24 | } | ||
| 25 | EXPORT_SYMBOL(clear_bdi_congested); | ||
| 26 | |||
| 27 | void set_bdi_congested(struct backing_dev_info *bdi, int rw) | ||
| 28 | { | ||
| 29 | enum bdi_state bit; | ||
| 30 | |||
| 31 | bit = (rw == WRITE) ? BDI_write_congested : BDI_read_congested; | ||
| 32 | set_bit(bit, &bdi->state); | ||
| 33 | } | ||
| 34 | EXPORT_SYMBOL(set_bdi_congested); | ||
| 35 | |||
| 36 | /** | ||
| 37 | * congestion_wait - wait for a backing_dev to become uncongested | ||
| 38 | * @rw: READ or WRITE | ||
| 39 | * @timeout: timeout in jiffies | ||
| 40 | * | ||
| 41 | * Waits for up to @timeout jiffies for a backing_dev (any backing_dev) to exit | ||
| 42 | * write congestion. If no backing_devs are congested then just wait for the | ||
| 43 | * next write to be completed. | ||
| 44 | */ | ||
| 45 | long congestion_wait(int rw, long timeout) | ||
| 46 | { | ||
| 47 | long ret; | ||
| 48 | DEFINE_WAIT(wait); | ||
| 49 | wait_queue_head_t *wqh = &congestion_wqh[rw]; | ||
| 50 | |||
| 51 | prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE); | ||
| 52 | ret = io_schedule_timeout(timeout); | ||
| 53 | finish_wait(wqh, &wait); | ||
| 54 | return ret; | ||
| 55 | } | ||
| 56 | EXPORT_SYMBOL(congestion_wait); | ||
| 57 | |||
| 58 | /** | ||
| 59 | * congestion_end - wake up sleepers on a congested backing_dev_info | ||
| 60 | * @rw: READ or WRITE | ||
| 61 | */ | ||
| 62 | void congestion_end(int rw) | ||
| 63 | { | ||
| 64 | wait_queue_head_t *wqh = &congestion_wqh[rw]; | ||
| 65 | |||
| 66 | if (waitqueue_active(wqh)) | ||
| 67 | wake_up(wqh); | ||
| 68 | } | ||
| 69 | EXPORT_SYMBOL(congestion_end); | ||
diff --git a/mm/filemap.c b/mm/filemap.c index 3464b681f844..cb26e33fd0ff 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -75,8 +75,8 @@ generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, | |||
| 75 | * ->mmap_sem | 75 | * ->mmap_sem |
| 76 | * ->lock_page (access_process_vm) | 76 | * ->lock_page (access_process_vm) |
| 77 | * | 77 | * |
| 78 | * ->mmap_sem | 78 | * ->i_mutex (generic_file_buffered_write) |
| 79 | * ->i_mutex (msync) | 79 | * ->mmap_sem (fault_in_pages_readable->do_page_fault) |
| 80 | * | 80 | * |
| 81 | * ->i_mutex | 81 | * ->i_mutex |
| 82 | * ->i_alloc_sem (various) | 82 | * ->i_alloc_sem (various) |
| @@ -1884,11 +1884,10 @@ repeat: | |||
| 1884 | * if suid or (sgid and xgrp) | 1884 | * if suid or (sgid and xgrp) |
| 1885 | * remove privs | 1885 | * remove privs |
| 1886 | */ | 1886 | */ |
| 1887 | int remove_suid(struct dentry *dentry) | 1887 | int should_remove_suid(struct dentry *dentry) |
| 1888 | { | 1888 | { |
| 1889 | mode_t mode = dentry->d_inode->i_mode; | 1889 | mode_t mode = dentry->d_inode->i_mode; |
| 1890 | int kill = 0; | 1890 | int kill = 0; |
| 1891 | int result = 0; | ||
| 1892 | 1891 | ||
| 1893 | /* suid always must be killed */ | 1892 | /* suid always must be killed */ |
| 1894 | if (unlikely(mode & S_ISUID)) | 1893 | if (unlikely(mode & S_ISUID)) |
| @@ -1901,13 +1900,28 @@ int remove_suid(struct dentry *dentry) | |||
| 1901 | if (unlikely((mode & S_ISGID) && (mode & S_IXGRP))) | 1900 | if (unlikely((mode & S_ISGID) && (mode & S_IXGRP))) |
| 1902 | kill |= ATTR_KILL_SGID; | 1901 | kill |= ATTR_KILL_SGID; |
| 1903 | 1902 | ||
| 1904 | if (unlikely(kill && !capable(CAP_FSETID))) { | 1903 | if (unlikely(kill && !capable(CAP_FSETID))) |
| 1905 | struct iattr newattrs; | 1904 | return kill; |
| 1906 | 1905 | ||
| 1907 | newattrs.ia_valid = ATTR_FORCE | kill; | 1906 | return 0; |
| 1908 | result = notify_change(dentry, &newattrs); | 1907 | } |
| 1909 | } | 1908 | |
| 1910 | return result; | 1909 | int __remove_suid(struct dentry *dentry, int kill) |
| 1910 | { | ||
| 1911 | struct iattr newattrs; | ||
| 1912 | |||
| 1913 | newattrs.ia_valid = ATTR_FORCE | kill; | ||
| 1914 | return notify_change(dentry, &newattrs); | ||
| 1915 | } | ||
| 1916 | |||
| 1917 | int remove_suid(struct dentry *dentry) | ||
| 1918 | { | ||
| 1919 | int kill = should_remove_suid(dentry); | ||
| 1920 | |||
| 1921 | if (unlikely(kill)) | ||
| 1922 | return __remove_suid(dentry, kill); | ||
| 1923 | |||
| 1924 | return 0; | ||
| 1911 | } | 1925 | } |
| 1912 | EXPORT_SYMBOL(remove_suid); | 1926 | EXPORT_SYMBOL(remove_suid); |
| 1913 | 1927 | ||
| @@ -2222,7 +2236,7 @@ __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov, | |||
| 2222 | unsigned long nr_segs, loff_t *ppos) | 2236 | unsigned long nr_segs, loff_t *ppos) |
| 2223 | { | 2237 | { |
| 2224 | struct file *file = iocb->ki_filp; | 2238 | struct file *file = iocb->ki_filp; |
| 2225 | const struct address_space * mapping = file->f_mapping; | 2239 | struct address_space * mapping = file->f_mapping; |
| 2226 | size_t ocount; /* original count */ | 2240 | size_t ocount; /* original count */ |
| 2227 | size_t count; /* after file limit checks */ | 2241 | size_t count; /* after file limit checks */ |
| 2228 | struct inode *inode = mapping->host; | 2242 | struct inode *inode = mapping->host; |
| @@ -2275,8 +2289,11 @@ __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov, | |||
| 2275 | 2289 | ||
| 2276 | /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */ | 2290 | /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */ |
| 2277 | if (unlikely(file->f_flags & O_DIRECT)) { | 2291 | if (unlikely(file->f_flags & O_DIRECT)) { |
| 2278 | written = generic_file_direct_write(iocb, iov, | 2292 | loff_t endbyte; |
| 2279 | &nr_segs, pos, ppos, count, ocount); | 2293 | ssize_t written_buffered; |
| 2294 | |||
| 2295 | written = generic_file_direct_write(iocb, iov, &nr_segs, pos, | ||
| 2296 | ppos, count, ocount); | ||
| 2280 | if (written < 0 || written == count) | 2297 | if (written < 0 || written == count) |
| 2281 | goto out; | 2298 | goto out; |
| 2282 | /* | 2299 | /* |
| @@ -2285,10 +2302,46 @@ __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov, | |||
| 2285 | */ | 2302 | */ |
| 2286 | pos += written; | 2303 | pos += written; |
| 2287 | count -= written; | 2304 | count -= written; |
| 2288 | } | 2305 | written_buffered = generic_file_buffered_write(iocb, iov, |
| 2306 | nr_segs, pos, ppos, count, | ||
| 2307 | written); | ||
| 2308 | /* | ||
| 2309 | * If generic_file_buffered_write() retuned a synchronous error | ||
| 2310 | * then we want to return the number of bytes which were | ||
| 2311 | * direct-written, or the error code if that was zero. Note | ||
| 2312 | * that this differs from normal direct-io semantics, which | ||
| 2313 | * will return -EFOO even if some bytes were written. | ||
| 2314 | */ | ||
| 2315 | if (written_buffered < 0) { | ||
| 2316 | err = written_buffered; | ||
| 2317 | goto out; | ||
| 2318 | } | ||
| 2289 | 2319 | ||
| 2290 | written = generic_file_buffered_write(iocb, iov, nr_segs, | 2320 | /* |
| 2291 | pos, ppos, count, written); | 2321 | * We need to ensure that the page cache pages are written to |
| 2322 | * disk and invalidated to preserve the expected O_DIRECT | ||
| 2323 | * semantics. | ||
| 2324 | */ | ||
| 2325 | endbyte = pos + written_buffered - written - 1; | ||
| 2326 | err = do_sync_file_range(file, pos, endbyte, | ||
| 2327 | SYNC_FILE_RANGE_WAIT_BEFORE| | ||
| 2328 | SYNC_FILE_RANGE_WRITE| | ||
| 2329 | SYNC_FILE_RANGE_WAIT_AFTER); | ||
| 2330 | if (err == 0) { | ||
| 2331 | written = written_buffered; | ||
| 2332 | invalidate_mapping_pages(mapping, | ||
| 2333 | pos >> PAGE_CACHE_SHIFT, | ||
| 2334 | endbyte >> PAGE_CACHE_SHIFT); | ||
| 2335 | } else { | ||
| 2336 | /* | ||
| 2337 | * We don't know how much we wrote, so just return | ||
| 2338 | * the number of bytes which were direct-written | ||
| 2339 | */ | ||
| 2340 | } | ||
| 2341 | } else { | ||
| 2342 | written = generic_file_buffered_write(iocb, iov, nr_segs, | ||
| 2343 | pos, ppos, count, written); | ||
| 2344 | } | ||
| 2292 | out: | 2345 | out: |
| 2293 | current->backing_dev_info = NULL; | 2346 | current->backing_dev_info = NULL; |
| 2294 | return written ? written : err; | 2347 | return written ? written : err; |
diff --git a/mm/memory.c b/mm/memory.c index b5a4aadd961a..156861fcac43 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -1452,6 +1452,7 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo | |||
| 1452 | if (__copy_from_user_inatomic(kaddr, uaddr, PAGE_SIZE)) | 1452 | if (__copy_from_user_inatomic(kaddr, uaddr, PAGE_SIZE)) |
| 1453 | memset(kaddr, 0, PAGE_SIZE); | 1453 | memset(kaddr, 0, PAGE_SIZE); |
| 1454 | kunmap_atomic(kaddr, KM_USER0); | 1454 | kunmap_atomic(kaddr, KM_USER0); |
| 1455 | flush_dcache_page(dst); | ||
| 1455 | return; | 1456 | return; |
| 1456 | 1457 | ||
| 1457 | } | 1458 | } |
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 20f41b082e16..2e3ce3a928b9 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | * kernel subsystems and hints as to where to find out what things do. | 15 | * kernel subsystems and hints as to where to find out what things do. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/oom.h> | ||
| 18 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 19 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 20 | #include <linux/swap.h> | 21 | #include <linux/swap.h> |
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index a0f339057449..8d9b19f239c3 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
| @@ -222,7 +222,7 @@ static void balance_dirty_pages(struct address_space *mapping) | |||
| 222 | if (pages_written >= write_chunk) | 222 | if (pages_written >= write_chunk) |
| 223 | break; /* We've done our duty */ | 223 | break; /* We've done our duty */ |
| 224 | } | 224 | } |
| 225 | blk_congestion_wait(WRITE, HZ/10); | 225 | congestion_wait(WRITE, HZ/10); |
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | if (nr_reclaimable + global_page_state(NR_WRITEBACK) | 228 | if (nr_reclaimable + global_page_state(NR_WRITEBACK) |
| @@ -314,7 +314,7 @@ void throttle_vm_writeout(void) | |||
| 314 | if (global_page_state(NR_UNSTABLE_NFS) + | 314 | if (global_page_state(NR_UNSTABLE_NFS) + |
| 315 | global_page_state(NR_WRITEBACK) <= dirty_thresh) | 315 | global_page_state(NR_WRITEBACK) <= dirty_thresh) |
| 316 | break; | 316 | break; |
| 317 | blk_congestion_wait(WRITE, HZ/10); | 317 | congestion_wait(WRITE, HZ/10); |
| 318 | } | 318 | } |
| 319 | } | 319 | } |
| 320 | 320 | ||
| @@ -351,7 +351,7 @@ static void background_writeout(unsigned long _min_pages) | |||
| 351 | min_pages -= MAX_WRITEBACK_PAGES - wbc.nr_to_write; | 351 | min_pages -= MAX_WRITEBACK_PAGES - wbc.nr_to_write; |
| 352 | if (wbc.nr_to_write > 0 || wbc.pages_skipped > 0) { | 352 | if (wbc.nr_to_write > 0 || wbc.pages_skipped > 0) { |
| 353 | /* Wrote less than expected */ | 353 | /* Wrote less than expected */ |
| 354 | blk_congestion_wait(WRITE, HZ/10); | 354 | congestion_wait(WRITE, HZ/10); |
| 355 | if (!wbc.encountered_congestion) | 355 | if (!wbc.encountered_congestion) |
| 356 | break; | 356 | break; |
| 357 | } | 357 | } |
| @@ -422,7 +422,7 @@ static void wb_kupdate(unsigned long arg) | |||
| 422 | writeback_inodes(&wbc); | 422 | writeback_inodes(&wbc); |
| 423 | if (wbc.nr_to_write > 0) { | 423 | if (wbc.nr_to_write > 0) { |
| 424 | if (wbc.encountered_congestion) | 424 | if (wbc.encountered_congestion) |
| 425 | blk_congestion_wait(WRITE, HZ/10); | 425 | congestion_wait(WRITE, HZ/10); |
| 426 | else | 426 | else |
| 427 | break; /* All the old data is written */ | 427 | break; /* All the old data is written */ |
| 428 | } | 428 | } |
| @@ -956,15 +956,6 @@ int test_set_page_writeback(struct page *page) | |||
| 956 | EXPORT_SYMBOL(test_set_page_writeback); | 956 | EXPORT_SYMBOL(test_set_page_writeback); |
| 957 | 957 | ||
| 958 | /* | 958 | /* |
| 959 | * Wakes up tasks that are being throttled due to writeback congestion | ||
| 960 | */ | ||
| 961 | void writeback_congestion_end(void) | ||
| 962 | { | ||
| 963 | blk_congestion_end(WRITE); | ||
| 964 | } | ||
| 965 | EXPORT_SYMBOL(writeback_congestion_end); | ||
| 966 | |||
| 967 | /* | ||
| 968 | * Return true if any of the pages in the mapping are marged with the | 959 | * Return true if any of the pages in the mapping are marged with the |
| 969 | * passed tag. | 960 | * passed tag. |
| 970 | */ | 961 | */ |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 40db96a655d0..f5fc45472d5c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/stop_machine.h> | 39 | #include <linux/stop_machine.h> |
| 40 | #include <linux/sort.h> | 40 | #include <linux/sort.h> |
| 41 | #include <linux/pfn.h> | 41 | #include <linux/pfn.h> |
| 42 | #include <linux/backing-dev.h> | ||
| 42 | 43 | ||
| 43 | #include <asm/tlbflush.h> | 44 | #include <asm/tlbflush.h> |
| 44 | #include <asm/div64.h> | 45 | #include <asm/div64.h> |
| @@ -1050,7 +1051,7 @@ nofail_alloc: | |||
| 1050 | if (page) | 1051 | if (page) |
| 1051 | goto got_pg; | 1052 | goto got_pg; |
| 1052 | if (gfp_mask & __GFP_NOFAIL) { | 1053 | if (gfp_mask & __GFP_NOFAIL) { |
| 1053 | blk_congestion_wait(WRITE, HZ/50); | 1054 | congestion_wait(WRITE, HZ/50); |
| 1054 | goto nofail_alloc; | 1055 | goto nofail_alloc; |
| 1055 | } | 1056 | } |
| 1056 | } | 1057 | } |
| @@ -1113,7 +1114,7 @@ rebalance: | |||
| 1113 | do_retry = 1; | 1114 | do_retry = 1; |
| 1114 | } | 1115 | } |
| 1115 | if (do_retry) { | 1116 | if (do_retry) { |
| 1116 | blk_congestion_wait(WRITE, HZ/50); | 1117 | congestion_wait(WRITE, HZ/50); |
| 1117 | goto rebalance; | 1118 | goto rebalance; |
| 1118 | } | 1119 | } |
| 1119 | 1120 | ||
| @@ -1688,6 +1689,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, | |||
| 1688 | for (pfn = start_pfn; pfn < end_pfn; pfn++) { | 1689 | for (pfn = start_pfn; pfn < end_pfn; pfn++) { |
| 1689 | if (!early_pfn_valid(pfn)) | 1690 | if (!early_pfn_valid(pfn)) |
| 1690 | continue; | 1691 | continue; |
| 1692 | if (!early_pfn_in_nid(pfn, nid)) | ||
| 1693 | continue; | ||
| 1691 | page = pfn_to_page(pfn); | 1694 | page = pfn_to_page(pfn); |
| 1692 | set_page_links(page, zone, nid, pfn); | 1695 | set_page_links(page, zone, nid, pfn); |
| 1693 | init_page_count(page); | 1696 | init_page_count(page); |
| @@ -3119,3 +3122,19 @@ unsigned long page_to_pfn(struct page *page) | |||
| 3119 | EXPORT_SYMBOL(pfn_to_page); | 3122 | EXPORT_SYMBOL(pfn_to_page); |
| 3120 | EXPORT_SYMBOL(page_to_pfn); | 3123 | EXPORT_SYMBOL(page_to_pfn); |
| 3121 | #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */ | 3124 | #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */ |
| 3125 | |||
| 3126 | #if MAX_NUMNODES > 1 | ||
| 3127 | /* | ||
| 3128 | * Find the highest possible node id. | ||
| 3129 | */ | ||
| 3130 | int highest_possible_node_id(void) | ||
| 3131 | { | ||
| 3132 | unsigned int node; | ||
| 3133 | unsigned int highest = 0; | ||
| 3134 | |||
| 3135 | for_each_node_mask(node, node_possible_map) | ||
| 3136 | highest = node; | ||
| 3137 | return highest; | ||
| 3138 | } | ||
| 3139 | EXPORT_SYMBOL(highest_possible_node_id); | ||
| 3140 | #endif | ||
| @@ -21,27 +21,21 @@ | |||
| 21 | * Lock ordering in mm: | 21 | * Lock ordering in mm: |
| 22 | * | 22 | * |
| 23 | * inode->i_mutex (while writing or truncating, not reading or faulting) | 23 | * inode->i_mutex (while writing or truncating, not reading or faulting) |
| 24 | * inode->i_alloc_sem | 24 | * inode->i_alloc_sem (vmtruncate_range) |
| 25 | * | 25 | * mm->mmap_sem |
| 26 | * When a page fault occurs in writing from user to file, down_read | 26 | * page->flags PG_locked (lock_page) |
| 27 | * of mmap_sem nests within i_mutex; in sys_msync, i_mutex nests within | 27 | * mapping->i_mmap_lock |
| 28 | * down_read of mmap_sem; i_mutex and down_write of mmap_sem are never | 28 | * anon_vma->lock |
| 29 | * taken together; in truncation, i_mutex is taken outermost. | 29 | * mm->page_table_lock or pte_lock |
| 30 | * | 30 | * zone->lru_lock (in mark_page_accessed, isolate_lru_page) |
| 31 | * mm->mmap_sem | 31 | * swap_lock (in swap_duplicate, swap_info_get) |
| 32 | * page->flags PG_locked (lock_page) | 32 | * mmlist_lock (in mmput, drain_mmlist and others) |
| 33 | * mapping->i_mmap_lock | 33 | * mapping->private_lock (in __set_page_dirty_buffers) |
| 34 | * anon_vma->lock | 34 | * inode_lock (in set_page_dirty's __mark_inode_dirty) |
| 35 | * mm->page_table_lock or pte_lock | 35 | * sb_lock (within inode_lock in fs/fs-writeback.c) |
| 36 | * zone->lru_lock (in mark_page_accessed, isolate_lru_page) | 36 | * mapping->tree_lock (widely used, in set_page_dirty, |
| 37 | * swap_lock (in swap_duplicate, swap_info_get) | 37 | * in arch-dependent flush_dcache_mmap_lock, |
| 38 | * mmlist_lock (in mmput, drain_mmlist and others) | 38 | * within inode_lock in __sync_single_inode) |
| 39 | * mapping->private_lock (in __set_page_dirty_buffers) | ||
| 40 | * inode_lock (in set_page_dirty's __mark_inode_dirty) | ||
| 41 | * sb_lock (within inode_lock in fs/fs-writeback.c) | ||
| 42 | * mapping->tree_lock (widely used, in set_page_dirty, | ||
| 43 | * in arch-dependent flush_dcache_mmap_lock, | ||
| 44 | * within inode_lock in __sync_single_inode) | ||
| 45 | */ | 39 | */ |
| 46 | 40 | ||
| 47 | #include <linux/mm.h> | 41 | #include <linux/mm.h> |
diff --git a/mm/shmem.c b/mm/shmem.c index b378f66cf2f9..4959535fc14c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <linux/ctype.h> | 48 | #include <linux/ctype.h> |
| 49 | #include <linux/migrate.h> | 49 | #include <linux/migrate.h> |
| 50 | #include <linux/highmem.h> | 50 | #include <linux/highmem.h> |
| 51 | #include <linux/backing-dev.h> | ||
| 51 | 52 | ||
| 52 | #include <asm/uaccess.h> | 53 | #include <asm/uaccess.h> |
| 53 | #include <asm/div64.h> | 54 | #include <asm/div64.h> |
| @@ -1131,7 +1132,7 @@ repeat: | |||
| 1131 | page_cache_release(swappage); | 1132 | page_cache_release(swappage); |
| 1132 | if (error == -ENOMEM) { | 1133 | if (error == -ENOMEM) { |
| 1133 | /* let kswapd refresh zone for GFP_ATOMICs */ | 1134 | /* let kswapd refresh zone for GFP_ATOMICs */ |
| 1134 | blk_congestion_wait(WRITE, HZ/50); | 1135 | congestion_wait(WRITE, HZ/50); |
| 1135 | } | 1136 | } |
| 1136 | goto repeat; | 1137 | goto repeat; |
| 1137 | } | 1138 | } |
| @@ -3152,12 +3152,15 @@ void *fallback_alloc(struct kmem_cache *cache, gfp_t flags) | |||
| 3152 | struct zone **z; | 3152 | struct zone **z; |
| 3153 | void *obj = NULL; | 3153 | void *obj = NULL; |
| 3154 | 3154 | ||
| 3155 | for (z = zonelist->zones; *z && !obj; z++) | 3155 | for (z = zonelist->zones; *z && !obj; z++) { |
| 3156 | int nid = zone_to_nid(*z); | ||
| 3157 | |||
| 3156 | if (zone_idx(*z) <= ZONE_NORMAL && | 3158 | if (zone_idx(*z) <= ZONE_NORMAL && |
| 3157 | cpuset_zone_allowed(*z, flags)) | 3159 | cpuset_zone_allowed(*z, flags) && |
| 3160 | cache->nodelists[nid]) | ||
| 3158 | obj = __cache_alloc_node(cache, | 3161 | obj = __cache_alloc_node(cache, |
| 3159 | flags | __GFP_THISNODE, | 3162 | flags | __GFP_THISNODE, nid); |
| 3160 | zone_to_nid(*z)); | 3163 | } |
| 3161 | return obj; | 3164 | return obj; |
| 3162 | } | 3165 | } |
| 3163 | 3166 | ||
diff --git a/mm/vmscan.c b/mm/vmscan.c index af73c14f9d88..f05527bf792b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -1059,7 +1059,7 @@ unsigned long try_to_free_pages(struct zone **zones, gfp_t gfp_mask) | |||
| 1059 | 1059 | ||
| 1060 | /* Take a nap, wait for some writeback to complete */ | 1060 | /* Take a nap, wait for some writeback to complete */ |
| 1061 | if (sc.nr_scanned && priority < DEF_PRIORITY - 2) | 1061 | if (sc.nr_scanned && priority < DEF_PRIORITY - 2) |
| 1062 | blk_congestion_wait(WRITE, HZ/10); | 1062 | congestion_wait(WRITE, HZ/10); |
| 1063 | } | 1063 | } |
| 1064 | /* top priority shrink_caches still had more to do? don't OOM, then */ | 1064 | /* top priority shrink_caches still had more to do? don't OOM, then */ |
| 1065 | if (!sc.all_unreclaimable) | 1065 | if (!sc.all_unreclaimable) |
| @@ -1214,7 +1214,7 @@ scan: | |||
| 1214 | * another pass across the zones. | 1214 | * another pass across the zones. |
| 1215 | */ | 1215 | */ |
| 1216 | if (total_scanned && priority < DEF_PRIORITY - 2) | 1216 | if (total_scanned && priority < DEF_PRIORITY - 2) |
| 1217 | blk_congestion_wait(WRITE, HZ/10); | 1217 | congestion_wait(WRITE, HZ/10); |
| 1218 | 1218 | ||
| 1219 | /* | 1219 | /* |
| 1220 | * We do this so kswapd doesn't build up large priorities for | 1220 | * We do this so kswapd doesn't build up large priorities for |
| @@ -1458,7 +1458,7 @@ unsigned long shrink_all_memory(unsigned long nr_pages) | |||
| 1458 | goto out; | 1458 | goto out; |
| 1459 | 1459 | ||
| 1460 | if (sc.nr_scanned && prio < DEF_PRIORITY - 2) | 1460 | if (sc.nr_scanned && prio < DEF_PRIORITY - 2) |
| 1461 | blk_congestion_wait(WRITE, HZ / 10); | 1461 | congestion_wait(WRITE, HZ / 10); |
| 1462 | } | 1462 | } |
| 1463 | 1463 | ||
| 1464 | lru_pages = 0; | 1464 | lru_pages = 0; |
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 9a562cf7406b..66782010f82c 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c | |||
| @@ -507,12 +507,10 @@ static int hidp_session(void *arg) | |||
| 507 | 507 | ||
| 508 | hidp_del_timer(session); | 508 | hidp_del_timer(session); |
| 509 | 509 | ||
| 510 | if (intr_sk->sk_state != BT_CONNECTED) | ||
| 511 | wait_event_timeout(*(ctrl_sk->sk_sleep), (ctrl_sk->sk_state == BT_CLOSED), HZ); | ||
| 512 | |||
| 513 | fput(session->intr_sock->file); | 510 | fput(session->intr_sock->file); |
| 514 | 511 | ||
| 515 | wait_event_timeout(*(intr_sk->sk_sleep), (intr_sk->sk_state == BT_CLOSED), HZ); | 512 | wait_event_timeout(*(ctrl_sk->sk_sleep), |
| 513 | (ctrl_sk->sk_state == BT_CLOSED), msecs_to_jiffies(500)); | ||
| 516 | 514 | ||
| 517 | fput(session->ctrl_sock->file); | 515 | fput(session->ctrl_sock->file); |
| 518 | 516 | ||
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index ead5920c26d6..9308af060b44 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
| @@ -335,13 +335,13 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len) | |||
| 335 | memcpy(skb->data, msg, len); | 335 | memcpy(skb->data, msg, len); |
| 336 | skb->len += len; | 336 | skb->len += len; |
| 337 | 337 | ||
| 338 | udph = (struct udphdr *) skb_push(skb, sizeof(*udph)); | 338 | skb->h.uh = udph = (struct udphdr *) skb_push(skb, sizeof(*udph)); |
| 339 | udph->source = htons(np->local_port); | 339 | udph->source = htons(np->local_port); |
| 340 | udph->dest = htons(np->remote_port); | 340 | udph->dest = htons(np->remote_port); |
| 341 | udph->len = htons(udp_len); | 341 | udph->len = htons(udp_len); |
| 342 | udph->check = 0; | 342 | udph->check = 0; |
| 343 | 343 | ||
| 344 | iph = (struct iphdr *)skb_push(skb, sizeof(*iph)); | 344 | skb->nh.iph = iph = (struct iphdr *)skb_push(skb, sizeof(*iph)); |
| 345 | 345 | ||
| 346 | /* iph->version = 4; iph->ihl = 5; */ | 346 | /* iph->version = 4; iph->ihl = 5; */ |
| 347 | put_unaligned(0x45, (unsigned char *)iph); | 347 | put_unaligned(0x45, (unsigned char *)iph); |
| @@ -357,8 +357,8 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len) | |||
| 357 | iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); | 357 | iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); |
| 358 | 358 | ||
| 359 | eth = (struct ethhdr *) skb_push(skb, ETH_HLEN); | 359 | eth = (struct ethhdr *) skb_push(skb, ETH_HLEN); |
| 360 | 360 | skb->mac.raw = skb->data; | |
| 361 | eth->h_proto = htons(ETH_P_IP); | 361 | skb->protocol = eth->h_proto = htons(ETH_P_IP); |
| 362 | memcpy(eth->h_source, np->local_mac, 6); | 362 | memcpy(eth->h_source, np->local_mac, 6); |
| 363 | memcpy(eth->h_dest, np->remote_mac, 6); | 363 | memcpy(eth->h_dest, np->remote_mac, 6); |
| 364 | 364 | ||
diff --git a/net/core/wireless.c b/net/core/wireless.c index ffff0da46c6e..cb1b8728d7ee 100644 --- a/net/core/wireless.c +++ b/net/core/wireless.c | |||
| @@ -748,11 +748,39 @@ static int ioctl_standard_call(struct net_device * dev, | |||
| 748 | int extra_size; | 748 | int extra_size; |
| 749 | int user_length = 0; | 749 | int user_length = 0; |
| 750 | int err; | 750 | int err; |
| 751 | int essid_compat = 0; | ||
| 751 | 752 | ||
| 752 | /* Calculate space needed by arguments. Always allocate | 753 | /* Calculate space needed by arguments. Always allocate |
| 753 | * for max space. Easier, and won't last long... */ | 754 | * for max space. Easier, and won't last long... */ |
| 754 | extra_size = descr->max_tokens * descr->token_size; | 755 | extra_size = descr->max_tokens * descr->token_size; |
| 755 | 756 | ||
| 757 | /* Check need for ESSID compatibility for WE < 21 */ | ||
| 758 | switch (cmd) { | ||
| 759 | case SIOCSIWESSID: | ||
| 760 | case SIOCGIWESSID: | ||
| 761 | case SIOCSIWNICKN: | ||
| 762 | case SIOCGIWNICKN: | ||
| 763 | if (iwr->u.data.length == descr->max_tokens + 1) | ||
| 764 | essid_compat = 1; | ||
| 765 | else if (IW_IS_SET(cmd) && (iwr->u.data.length != 0)) { | ||
| 766 | char essid[IW_ESSID_MAX_SIZE + 1]; | ||
| 767 | |||
| 768 | err = copy_from_user(essid, iwr->u.data.pointer, | ||
| 769 | iwr->u.data.length * | ||
| 770 | descr->token_size); | ||
| 771 | if (err) | ||
| 772 | return -EFAULT; | ||
| 773 | |||
| 774 | if (essid[iwr->u.data.length - 1] == '\0') | ||
| 775 | essid_compat = 1; | ||
| 776 | } | ||
| 777 | break; | ||
| 778 | default: | ||
| 779 | break; | ||
| 780 | } | ||
| 781 | |||
| 782 | iwr->u.data.length -= essid_compat; | ||
| 783 | |||
| 756 | /* Check what user space is giving us */ | 784 | /* Check what user space is giving us */ |
| 757 | if(IW_IS_SET(cmd)) { | 785 | if(IW_IS_SET(cmd)) { |
| 758 | /* Check NULL pointer */ | 786 | /* Check NULL pointer */ |
| @@ -795,7 +823,8 @@ static int ioctl_standard_call(struct net_device * dev, | |||
| 795 | #endif /* WE_IOCTL_DEBUG */ | 823 | #endif /* WE_IOCTL_DEBUG */ |
| 796 | 824 | ||
| 797 | /* Create the kernel buffer */ | 825 | /* Create the kernel buffer */ |
| 798 | extra = kmalloc(extra_size, GFP_KERNEL); | 826 | /* kzalloc ensures NULL-termination for essid_compat */ |
| 827 | extra = kzalloc(extra_size, GFP_KERNEL); | ||
| 799 | if (extra == NULL) { | 828 | if (extra == NULL) { |
| 800 | return -ENOMEM; | 829 | return -ENOMEM; |
| 801 | } | 830 | } |
| @@ -819,6 +848,8 @@ static int ioctl_standard_call(struct net_device * dev, | |||
| 819 | /* Call the handler */ | 848 | /* Call the handler */ |
| 820 | ret = handler(dev, &info, &(iwr->u), extra); | 849 | ret = handler(dev, &info, &(iwr->u), extra); |
| 821 | 850 | ||
| 851 | iwr->u.data.length += essid_compat; | ||
| 852 | |||
| 822 | /* If we have something to return to the user */ | 853 | /* If we have something to return to the user */ |
| 823 | if (!ret && IW_IS_GET(cmd)) { | 854 | if (!ret && IW_IS_GET(cmd)) { |
| 824 | /* Check if there is enough buffer up there */ | 855 | /* Check if there is enough buffer up there */ |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 491429ce9394..23489f7232d2 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
| @@ -1275,7 +1275,6 @@ static int dn_route_input_slow(struct sk_buff *skb) | |||
| 1275 | goto e_inval; | 1275 | goto e_inval; |
| 1276 | 1276 | ||
| 1277 | res.type = RTN_LOCAL; | 1277 | res.type = RTN_LOCAL; |
| 1278 | flags |= RTCF_DIRECTSRC; | ||
| 1279 | } else { | 1278 | } else { |
| 1280 | __le16 src_map = fl.fld_src; | 1279 | __le16 src_map = fl.fld_src; |
| 1281 | free_res = 1; | 1280 | free_res = 1; |
| @@ -1346,7 +1345,7 @@ static int dn_route_input_slow(struct sk_buff *skb) | |||
| 1346 | goto make_route; | 1345 | goto make_route; |
| 1347 | 1346 | ||
| 1348 | /* Packet was intra-ethernet, so we know its on-link */ | 1347 | /* Packet was intra-ethernet, so we know its on-link */ |
| 1349 | if (cb->rt_flags | DN_RT_F_IE) { | 1348 | if (cb->rt_flags & DN_RT_F_IE) { |
| 1350 | gateway = cb->src; | 1349 | gateway = cb->src; |
| 1351 | flags |= RTCF_DIRECTSRC; | 1350 | flags |= RTCF_DIRECTSRC; |
| 1352 | goto make_route; | 1351 | goto make_route; |
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c index 589f6d2c548a..cf51c87a971d 100644 --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c | |||
| @@ -48,7 +48,7 @@ ieee80211softmac_assoc(struct ieee80211softmac_device *mac, struct ieee80211soft | |||
| 48 | dprintk(KERN_INFO PFX "sent association request!\n"); | 48 | dprintk(KERN_INFO PFX "sent association request!\n"); |
| 49 | 49 | ||
| 50 | spin_lock_irqsave(&mac->lock, flags); | 50 | spin_lock_irqsave(&mac->lock, flags); |
| 51 | mac->associated = 0; /* just to make sure */ | 51 | mac->associnfo.associated = 0; /* just to make sure */ |
| 52 | 52 | ||
| 53 | /* Set a timer for timeout */ | 53 | /* Set a timer for timeout */ |
| 54 | /* FIXME: make timeout configurable */ | 54 | /* FIXME: make timeout configurable */ |
| @@ -62,24 +62,22 @@ ieee80211softmac_assoc_timeout(void *d) | |||
| 62 | { | 62 | { |
| 63 | struct ieee80211softmac_device *mac = (struct ieee80211softmac_device *)d; | 63 | struct ieee80211softmac_device *mac = (struct ieee80211softmac_device *)d; |
| 64 | struct ieee80211softmac_network *n; | 64 | struct ieee80211softmac_network *n; |
| 65 | unsigned long flags; | ||
| 66 | 65 | ||
| 67 | spin_lock_irqsave(&mac->lock, flags); | 66 | mutex_lock(&mac->associnfo.mutex); |
| 68 | /* we might race against ieee80211softmac_handle_assoc_response, | 67 | /* we might race against ieee80211softmac_handle_assoc_response, |
| 69 | * so make sure only one of us does something */ | 68 | * so make sure only one of us does something */ |
| 70 | if (!mac->associnfo.associating) { | 69 | if (!mac->associnfo.associating) |
| 71 | spin_unlock_irqrestore(&mac->lock, flags); | 70 | goto out; |
| 72 | return; | ||
| 73 | } | ||
| 74 | mac->associnfo.associating = 0; | 71 | mac->associnfo.associating = 0; |
| 75 | mac->associnfo.bssvalid = 0; | 72 | mac->associnfo.bssvalid = 0; |
| 76 | mac->associated = 0; | 73 | mac->associnfo.associated = 0; |
| 77 | 74 | ||
| 78 | n = ieee80211softmac_get_network_by_bssid_locked(mac, mac->associnfo.bssid); | 75 | n = ieee80211softmac_get_network_by_bssid_locked(mac, mac->associnfo.bssid); |
| 79 | spin_unlock_irqrestore(&mac->lock, flags); | ||
| 80 | 76 | ||
| 81 | dprintk(KERN_INFO PFX "assoc request timed out!\n"); | 77 | dprintk(KERN_INFO PFX "assoc request timed out!\n"); |
| 82 | ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_TIMEOUT, n); | 78 | ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_TIMEOUT, n); |
| 79 | out: | ||
| 80 | mutex_unlock(&mac->associnfo.mutex); | ||
| 83 | } | 81 | } |
| 84 | 82 | ||
| 85 | void | 83 | void |
| @@ -93,7 +91,7 @@ ieee80211softmac_disassoc(struct ieee80211softmac_device *mac) | |||
| 93 | 91 | ||
| 94 | netif_carrier_off(mac->dev); | 92 | netif_carrier_off(mac->dev); |
| 95 | 93 | ||
| 96 | mac->associated = 0; | 94 | mac->associnfo.associated = 0; |
| 97 | mac->associnfo.bssvalid = 0; | 95 | mac->associnfo.bssvalid = 0; |
| 98 | mac->associnfo.associating = 0; | 96 | mac->associnfo.associating = 0; |
| 99 | ieee80211softmac_init_bss(mac); | 97 | ieee80211softmac_init_bss(mac); |
| @@ -107,7 +105,7 @@ ieee80211softmac_send_disassoc_req(struct ieee80211softmac_device *mac, u16 reas | |||
| 107 | { | 105 | { |
| 108 | struct ieee80211softmac_network *found; | 106 | struct ieee80211softmac_network *found; |
| 109 | 107 | ||
| 110 | if (mac->associnfo.bssvalid && mac->associated) { | 108 | if (mac->associnfo.bssvalid && mac->associnfo.associated) { |
| 111 | found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); | 109 | found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); |
| 112 | if (found) | 110 | if (found) |
| 113 | ieee80211softmac_send_mgt_frame(mac, found, IEEE80211_STYPE_DISASSOC, reason); | 111 | ieee80211softmac_send_mgt_frame(mac, found, IEEE80211_STYPE_DISASSOC, reason); |
| @@ -196,17 +194,18 @@ ieee80211softmac_assoc_work(void *d) | |||
| 196 | int bssvalid; | 194 | int bssvalid; |
| 197 | unsigned long flags; | 195 | unsigned long flags; |
| 198 | 196 | ||
| 197 | mutex_lock(&mac->associnfo.mutex); | ||
| 198 | |||
| 199 | if (!mac->associnfo.associating) | ||
| 200 | goto out; | ||
| 201 | |||
| 199 | /* ieee80211_disassoc might clear this */ | 202 | /* ieee80211_disassoc might clear this */ |
| 200 | bssvalid = mac->associnfo.bssvalid; | 203 | bssvalid = mac->associnfo.bssvalid; |
| 201 | 204 | ||
| 202 | /* meh */ | 205 | /* meh */ |
| 203 | if (mac->associated) | 206 | if (mac->associnfo.associated) |
| 204 | ieee80211softmac_send_disassoc_req(mac, WLAN_REASON_DISASSOC_STA_HAS_LEFT); | 207 | ieee80211softmac_send_disassoc_req(mac, WLAN_REASON_DISASSOC_STA_HAS_LEFT); |
| 205 | 208 | ||
| 206 | spin_lock_irqsave(&mac->lock, flags); | ||
| 207 | mac->associnfo.associating = 1; | ||
| 208 | spin_unlock_irqrestore(&mac->lock, flags); | ||
| 209 | |||
| 210 | /* try to find the requested network in our list, if we found one already */ | 209 | /* try to find the requested network in our list, if we found one already */ |
| 211 | if (bssvalid || mac->associnfo.bssfixed) | 210 | if (bssvalid || mac->associnfo.bssfixed) |
| 212 | found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); | 211 | found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); |
| @@ -260,10 +259,8 @@ ieee80211softmac_assoc_work(void *d) | |||
| 260 | 259 | ||
| 261 | if (!found) { | 260 | if (!found) { |
| 262 | if (mac->associnfo.scan_retry > 0) { | 261 | if (mac->associnfo.scan_retry > 0) { |
| 263 | spin_lock_irqsave(&mac->lock, flags); | ||
| 264 | mac->associnfo.scan_retry--; | 262 | mac->associnfo.scan_retry--; |
| 265 | spin_unlock_irqrestore(&mac->lock, flags); | 263 | |
| 266 | |||
| 267 | /* We know of no such network. Let's scan. | 264 | /* We know of no such network. Let's scan. |
| 268 | * NB: this also happens if we had no memory to copy the network info... | 265 | * NB: this also happens if we had no memory to copy the network info... |
| 269 | * Maybe we can hope to have more memory after scanning finishes ;) | 266 | * Maybe we can hope to have more memory after scanning finishes ;) |
| @@ -272,19 +269,17 @@ ieee80211softmac_assoc_work(void *d) | |||
| 272 | ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL); | 269 | ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL); |
| 273 | if (ieee80211softmac_start_scan(mac)) | 270 | if (ieee80211softmac_start_scan(mac)) |
| 274 | dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n"); | 271 | dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n"); |
| 275 | return; | 272 | goto out; |
| 276 | } else { | 273 | } else { |
| 277 | spin_lock_irqsave(&mac->lock, flags); | ||
| 278 | mac->associnfo.associating = 0; | 274 | mac->associnfo.associating = 0; |
| 279 | mac->associated = 0; | 275 | mac->associnfo.associated = 0; |
| 280 | spin_unlock_irqrestore(&mac->lock, flags); | ||
| 281 | 276 | ||
| 282 | dprintk(KERN_INFO PFX "Unable to find matching network after scan!\n"); | 277 | dprintk(KERN_INFO PFX "Unable to find matching network after scan!\n"); |
| 283 | /* reset the retry counter for the next user request since we | 278 | /* reset the retry counter for the next user request since we |
| 284 | * break out and don't reschedule ourselves after this point. */ | 279 | * break out and don't reschedule ourselves after this point. */ |
| 285 | mac->associnfo.scan_retry = IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT; | 280 | mac->associnfo.scan_retry = IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT; |
| 286 | ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND, NULL); | 281 | ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND, NULL); |
| 287 | return; | 282 | goto out; |
| 288 | } | 283 | } |
| 289 | } | 284 | } |
| 290 | 285 | ||
| @@ -297,7 +292,7 @@ ieee80211softmac_assoc_work(void *d) | |||
| 297 | /* copy the ESSID for displaying it */ | 292 | /* copy the ESSID for displaying it */ |
| 298 | mac->associnfo.associate_essid.len = found->essid.len; | 293 | mac->associnfo.associate_essid.len = found->essid.len; |
| 299 | memcpy(mac->associnfo.associate_essid.data, found->essid.data, IW_ESSID_MAX_SIZE + 1); | 294 | memcpy(mac->associnfo.associate_essid.data, found->essid.data, IW_ESSID_MAX_SIZE + 1); |
| 300 | 295 | ||
| 301 | /* we found a network! authenticate (if necessary) and associate to it. */ | 296 | /* we found a network! authenticate (if necessary) and associate to it. */ |
| 302 | if (found->authenticating) { | 297 | if (found->authenticating) { |
| 303 | dprintk(KERN_INFO PFX "Already requested authentication, waiting...\n"); | 298 | dprintk(KERN_INFO PFX "Already requested authentication, waiting...\n"); |
| @@ -305,7 +300,7 @@ ieee80211softmac_assoc_work(void *d) | |||
| 305 | mac->associnfo.assoc_wait = 1; | 300 | mac->associnfo.assoc_wait = 1; |
| 306 | ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify_auth, NULL, GFP_KERNEL); | 301 | ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify_auth, NULL, GFP_KERNEL); |
| 307 | } | 302 | } |
| 308 | return; | 303 | goto out; |
| 309 | } | 304 | } |
| 310 | if (!found->authenticated && !found->authenticating) { | 305 | if (!found->authenticated && !found->authenticating) { |
| 311 | /* This relies on the fact that _auth_req only queues the work, | 306 | /* This relies on the fact that _auth_req only queues the work, |
| @@ -321,11 +316,14 @@ ieee80211softmac_assoc_work(void *d) | |||
| 321 | mac->associnfo.assoc_wait = 0; | 316 | mac->associnfo.assoc_wait = 0; |
| 322 | ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_FAILED, found); | 317 | ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_FAILED, found); |
| 323 | } | 318 | } |
| 324 | return; | 319 | goto out; |
| 325 | } | 320 | } |
| 326 | /* finally! now we can start associating */ | 321 | /* finally! now we can start associating */ |
| 327 | mac->associnfo.assoc_wait = 0; | 322 | mac->associnfo.assoc_wait = 0; |
| 328 | ieee80211softmac_assoc(mac, found); | 323 | ieee80211softmac_assoc(mac, found); |
| 324 | |||
| 325 | out: | ||
| 326 | mutex_unlock(&mac->associnfo.mutex); | ||
| 329 | } | 327 | } |
| 330 | 328 | ||
| 331 | /* call this to do whatever is necessary when we're associated */ | 329 | /* call this to do whatever is necessary when we're associated */ |
| @@ -341,7 +339,7 @@ ieee80211softmac_associated(struct ieee80211softmac_device *mac, | |||
| 341 | mac->bssinfo.supported_rates = net->supported_rates; | 339 | mac->bssinfo.supported_rates = net->supported_rates; |
| 342 | ieee80211softmac_recalc_txrates(mac); | 340 | ieee80211softmac_recalc_txrates(mac); |
| 343 | 341 | ||
| 344 | mac->associated = 1; | 342 | mac->associnfo.associated = 1; |
| 345 | 343 | ||
| 346 | mac->associnfo.short_preamble_available = | 344 | mac->associnfo.short_preamble_available = |
| 347 | (cap & WLAN_CAPABILITY_SHORT_PREAMBLE) != 0; | 345 | (cap & WLAN_CAPABILITY_SHORT_PREAMBLE) != 0; |
| @@ -421,7 +419,7 @@ ieee80211softmac_handle_assoc_response(struct net_device * dev, | |||
| 421 | dprintk(KERN_INFO PFX "associating failed (reason: 0x%x)!\n", status); | 419 | dprintk(KERN_INFO PFX "associating failed (reason: 0x%x)!\n", status); |
| 422 | mac->associnfo.associating = 0; | 420 | mac->associnfo.associating = 0; |
| 423 | mac->associnfo.bssvalid = 0; | 421 | mac->associnfo.bssvalid = 0; |
| 424 | mac->associated = 0; | 422 | mac->associnfo.associated = 0; |
| 425 | ieee80211softmac_call_events_locked(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_FAILED, network); | 423 | ieee80211softmac_call_events_locked(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_FAILED, network); |
| 426 | } | 424 | } |
| 427 | 425 | ||
diff --git a/net/ieee80211/softmac/ieee80211softmac_io.c b/net/ieee80211/softmac/ieee80211softmac_io.c index 82bfddbf33a2..b96931001b43 100644 --- a/net/ieee80211/softmac/ieee80211softmac_io.c +++ b/net/ieee80211/softmac/ieee80211softmac_io.c | |||
| @@ -304,7 +304,7 @@ ieee80211softmac_auth(struct ieee80211_auth **pkt, | |||
| 304 | 2 + /* Auth Transaction Seq */ | 304 | 2 + /* Auth Transaction Seq */ |
| 305 | 2 + /* Status Code */ | 305 | 2 + /* Status Code */ |
| 306 | /* Challenge Text IE */ | 306 | /* Challenge Text IE */ |
| 307 | is_shared_response ? 0 : 1 + 1 + net->challenge_len | 307 | (is_shared_response ? 1 + 1 + net->challenge_len : 0) |
| 308 | ); | 308 | ); |
| 309 | if (unlikely((*pkt) == NULL)) | 309 | if (unlikely((*pkt) == NULL)) |
| 310 | return 0; | 310 | return 0; |
| @@ -475,8 +475,13 @@ int ieee80211softmac_handle_beacon(struct net_device *dev, | |||
| 475 | { | 475 | { |
| 476 | struct ieee80211softmac_device *mac = ieee80211_priv(dev); | 476 | struct ieee80211softmac_device *mac = ieee80211_priv(dev); |
| 477 | 477 | ||
| 478 | if (mac->associated && memcmp(network->bssid, mac->associnfo.bssid, ETH_ALEN) == 0) | 478 | /* This might race, but we don't really care and it's not worth |
| 479 | ieee80211softmac_process_erp(mac, network->erp_value); | 479 | * adding heavyweight locking in this fastpath. |
| 480 | */ | ||
| 481 | if (mac->associnfo.associated) { | ||
| 482 | if (memcmp(network->bssid, mac->associnfo.bssid, ETH_ALEN) == 0) | ||
| 483 | ieee80211softmac_process_erp(mac, network->erp_value); | ||
| 484 | } | ||
| 480 | 485 | ||
| 481 | return 0; | 486 | return 0; |
| 482 | } | 487 | } |
diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c index addea1cf73ae..33aff4f4a471 100644 --- a/net/ieee80211/softmac/ieee80211softmac_module.c +++ b/net/ieee80211/softmac/ieee80211softmac_module.c | |||
| @@ -57,6 +57,7 @@ struct net_device *alloc_ieee80211softmac(int sizeof_priv) | |||
| 57 | INIT_LIST_HEAD(&softmac->network_list); | 57 | INIT_LIST_HEAD(&softmac->network_list); |
| 58 | INIT_LIST_HEAD(&softmac->events); | 58 | INIT_LIST_HEAD(&softmac->events); |
| 59 | 59 | ||
| 60 | mutex_init(&softmac->associnfo.mutex); | ||
| 60 | INIT_WORK(&softmac->associnfo.work, ieee80211softmac_assoc_work, softmac); | 61 | INIT_WORK(&softmac->associnfo.work, ieee80211softmac_assoc_work, softmac); |
| 61 | INIT_WORK(&softmac->associnfo.timeout, ieee80211softmac_assoc_timeout, softmac); | 62 | INIT_WORK(&softmac->associnfo.timeout, ieee80211softmac_assoc_timeout, softmac); |
| 62 | softmac->start_scan = ieee80211softmac_start_scan_implementation; | 63 | softmac->start_scan = ieee80211softmac_start_scan_implementation; |
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c index 2aa779d18f38..23068a830f7d 100644 --- a/net/ieee80211/softmac/ieee80211softmac_wx.c +++ b/net/ieee80211/softmac/ieee80211softmac_wx.c | |||
| @@ -73,13 +73,14 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev, | |||
| 73 | struct ieee80211softmac_network *n; | 73 | struct ieee80211softmac_network *n; |
| 74 | struct ieee80211softmac_auth_queue_item *authptr; | 74 | struct ieee80211softmac_auth_queue_item *authptr; |
| 75 | int length = 0; | 75 | int length = 0; |
| 76 | unsigned long flags; | 76 | |
| 77 | mutex_lock(&sm->associnfo.mutex); | ||
| 77 | 78 | ||
| 78 | /* Check if we're already associating to this or another network | 79 | /* Check if we're already associating to this or another network |
| 79 | * If it's another network, cancel and start over with our new network | 80 | * If it's another network, cancel and start over with our new network |
| 80 | * If it's our network, ignore the change, we're already doing it! | 81 | * If it's our network, ignore the change, we're already doing it! |
| 81 | */ | 82 | */ |
| 82 | if((sm->associnfo.associating || sm->associated) && | 83 | if((sm->associnfo.associating || sm->associnfo.associated) && |
| 83 | (data->essid.flags && data->essid.length)) { | 84 | (data->essid.flags && data->essid.length)) { |
| 84 | /* Get the associating network */ | 85 | /* Get the associating network */ |
| 85 | n = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid); | 86 | n = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid); |
| @@ -87,10 +88,9 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev, | |||
| 87 | !memcmp(n->essid.data, extra, n->essid.len)) { | 88 | !memcmp(n->essid.data, extra, n->essid.len)) { |
| 88 | dprintk(KERN_INFO PFX "Already associating or associated to "MAC_FMT"\n", | 89 | dprintk(KERN_INFO PFX "Already associating or associated to "MAC_FMT"\n", |
| 89 | MAC_ARG(sm->associnfo.bssid)); | 90 | MAC_ARG(sm->associnfo.bssid)); |
| 90 | return 0; | 91 | goto out; |
| 91 | } else { | 92 | } else { |
| 92 | dprintk(KERN_INFO PFX "Canceling existing associate request!\n"); | 93 | dprintk(KERN_INFO PFX "Canceling existing associate request!\n"); |
| 93 | spin_lock_irqsave(&sm->lock,flags); | ||
| 94 | /* Cancel assoc work */ | 94 | /* Cancel assoc work */ |
| 95 | cancel_delayed_work(&sm->associnfo.work); | 95 | cancel_delayed_work(&sm->associnfo.work); |
| 96 | /* We don't have to do this, but it's a little cleaner */ | 96 | /* We don't have to do this, but it's a little cleaner */ |
| @@ -98,14 +98,13 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev, | |||
| 98 | cancel_delayed_work(&authptr->work); | 98 | cancel_delayed_work(&authptr->work); |
| 99 | sm->associnfo.bssvalid = 0; | 99 | sm->associnfo.bssvalid = 0; |
| 100 | sm->associnfo.bssfixed = 0; | 100 | sm->associnfo.bssfixed = 0; |
| 101 | spin_unlock_irqrestore(&sm->lock,flags); | ||
| 102 | flush_scheduled_work(); | 101 | flush_scheduled_work(); |
| 102 | sm->associnfo.associating = 0; | ||
| 103 | sm->associnfo.associated = 0; | ||
| 103 | } | 104 | } |
| 104 | } | 105 | } |
| 105 | 106 | ||
| 106 | 107 | ||
| 107 | spin_lock_irqsave(&sm->lock, flags); | ||
| 108 | |||
| 109 | sm->associnfo.static_essid = 0; | 108 | sm->associnfo.static_essid = 0; |
| 110 | sm->associnfo.assoc_wait = 0; | 109 | sm->associnfo.assoc_wait = 0; |
| 111 | 110 | ||
| @@ -121,10 +120,12 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev, | |||
| 121 | * If applicable, we have already copied the data in */ | 120 | * If applicable, we have already copied the data in */ |
| 122 | sm->associnfo.req_essid.len = length; | 121 | sm->associnfo.req_essid.len = length; |
| 123 | 122 | ||
| 123 | sm->associnfo.associating = 1; | ||
| 124 | /* queue lower level code to do work (if necessary) */ | 124 | /* queue lower level code to do work (if necessary) */ |
| 125 | schedule_work(&sm->associnfo.work); | 125 | schedule_work(&sm->associnfo.work); |
| 126 | out: | ||
| 127 | mutex_unlock(&sm->associnfo.mutex); | ||
| 126 | 128 | ||
| 127 | spin_unlock_irqrestore(&sm->lock, flags); | ||
| 128 | return 0; | 129 | return 0; |
| 129 | } | 130 | } |
| 130 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_essid); | 131 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_essid); |
| @@ -136,10 +137,8 @@ ieee80211softmac_wx_get_essid(struct net_device *net_dev, | |||
| 136 | char *extra) | 137 | char *extra) |
| 137 | { | 138 | { |
| 138 | struct ieee80211softmac_device *sm = ieee80211_priv(net_dev); | 139 | struct ieee80211softmac_device *sm = ieee80211_priv(net_dev); |
| 139 | unsigned long flags; | ||
| 140 | 140 | ||
| 141 | /* avoid getting inconsistent information */ | 141 | mutex_lock(&sm->associnfo.mutex); |
| 142 | spin_lock_irqsave(&sm->lock, flags); | ||
| 143 | /* If all fails, return ANY (empty) */ | 142 | /* If all fails, return ANY (empty) */ |
| 144 | data->essid.length = 0; | 143 | data->essid.length = 0; |
| 145 | data->essid.flags = 0; /* active */ | 144 | data->essid.flags = 0; /* active */ |
| @@ -152,12 +151,13 @@ ieee80211softmac_wx_get_essid(struct net_device *net_dev, | |||
| 152 | } | 151 | } |
| 153 | 152 | ||
| 154 | /* If we're associating/associated, return that */ | 153 | /* If we're associating/associated, return that */ |
| 155 | if (sm->associated || sm->associnfo.associating) { | 154 | if (sm->associnfo.associated || sm->associnfo.associating) { |
| 156 | data->essid.length = sm->associnfo.associate_essid.len; | 155 | data->essid.length = sm->associnfo.associate_essid.len; |
| 157 | data->essid.flags = 1; /* active */ | 156 | data->essid.flags = 1; /* active */ |
| 158 | memcpy(extra, sm->associnfo.associate_essid.data, sm->associnfo.associate_essid.len); | 157 | memcpy(extra, sm->associnfo.associate_essid.data, sm->associnfo.associate_essid.len); |
| 159 | } | 158 | } |
| 160 | spin_unlock_irqrestore(&sm->lock, flags); | 159 | mutex_unlock(&sm->associnfo.mutex); |
| 160 | |||
| 161 | return 0; | 161 | return 0; |
| 162 | } | 162 | } |
| 163 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_essid); | 163 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_essid); |
| @@ -322,15 +322,15 @@ ieee80211softmac_wx_get_wap(struct net_device *net_dev, | |||
| 322 | { | 322 | { |
| 323 | struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); | 323 | struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); |
| 324 | int err = 0; | 324 | int err = 0; |
| 325 | unsigned long flags; | ||
| 326 | 325 | ||
| 327 | spin_lock_irqsave(&mac->lock, flags); | 326 | mutex_lock(&mac->associnfo.mutex); |
| 328 | if (mac->associnfo.bssvalid) | 327 | if (mac->associnfo.bssvalid) |
| 329 | memcpy(data->ap_addr.sa_data, mac->associnfo.bssid, ETH_ALEN); | 328 | memcpy(data->ap_addr.sa_data, mac->associnfo.bssid, ETH_ALEN); |
| 330 | else | 329 | else |
| 331 | memset(data->ap_addr.sa_data, 0xff, ETH_ALEN); | 330 | memset(data->ap_addr.sa_data, 0xff, ETH_ALEN); |
| 332 | data->ap_addr.sa_family = ARPHRD_ETHER; | 331 | data->ap_addr.sa_family = ARPHRD_ETHER; |
| 333 | spin_unlock_irqrestore(&mac->lock, flags); | 332 | mutex_unlock(&mac->associnfo.mutex); |
| 333 | |||
| 334 | return err; | 334 | return err; |
| 335 | } | 335 | } |
| 336 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_wap); | 336 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_wap); |
| @@ -342,28 +342,27 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev, | |||
| 342 | char *extra) | 342 | char *extra) |
| 343 | { | 343 | { |
| 344 | struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); | 344 | struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); |
| 345 | unsigned long flags; | ||
| 346 | 345 | ||
| 347 | /* sanity check */ | 346 | /* sanity check */ |
| 348 | if (data->ap_addr.sa_family != ARPHRD_ETHER) { | 347 | if (data->ap_addr.sa_family != ARPHRD_ETHER) { |
| 349 | return -EINVAL; | 348 | return -EINVAL; |
| 350 | } | 349 | } |
| 351 | 350 | ||
| 352 | spin_lock_irqsave(&mac->lock, flags); | 351 | mutex_lock(&mac->associnfo.mutex); |
| 353 | if (is_broadcast_ether_addr(data->ap_addr.sa_data)) { | 352 | if (is_broadcast_ether_addr(data->ap_addr.sa_data)) { |
| 354 | /* the bssid we have is not to be fixed any longer, | 353 | /* the bssid we have is not to be fixed any longer, |
| 355 | * and we should reassociate to the best AP. */ | 354 | * and we should reassociate to the best AP. */ |
| 356 | mac->associnfo.bssfixed = 0; | 355 | mac->associnfo.bssfixed = 0; |
| 357 | /* force reassociation */ | 356 | /* force reassociation */ |
| 358 | mac->associnfo.bssvalid = 0; | 357 | mac->associnfo.bssvalid = 0; |
| 359 | if (mac->associated) | 358 | if (mac->associnfo.associated) |
| 360 | schedule_work(&mac->associnfo.work); | 359 | schedule_work(&mac->associnfo.work); |
| 361 | } else if (is_zero_ether_addr(data->ap_addr.sa_data)) { | 360 | } else if (is_zero_ether_addr(data->ap_addr.sa_data)) { |
| 362 | /* the bssid we have is no longer fixed */ | 361 | /* the bssid we have is no longer fixed */ |
| 363 | mac->associnfo.bssfixed = 0; | 362 | mac->associnfo.bssfixed = 0; |
| 364 | } else { | 363 | } else { |
| 365 | if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) { | 364 | if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) { |
| 366 | if (mac->associnfo.associating || mac->associated) { | 365 | if (mac->associnfo.associating || mac->associnfo.associated) { |
| 367 | /* bssid unchanged and associated or associating - just return */ | 366 | /* bssid unchanged and associated or associating - just return */ |
| 368 | goto out; | 367 | goto out; |
| 369 | } | 368 | } |
| @@ -378,7 +377,8 @@ ieee80211softmac_wx_set_wap(struct net_device *net_dev, | |||
| 378 | } | 377 | } |
| 379 | 378 | ||
| 380 | out: | 379 | out: |
| 381 | spin_unlock_irqrestore(&mac->lock, flags); | 380 | mutex_unlock(&mac->associnfo.mutex); |
| 381 | |||
| 382 | return 0; | 382 | return 0; |
| 383 | } | 383 | } |
| 384 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_wap); | 384 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_wap); |
| @@ -394,7 +394,8 @@ ieee80211softmac_wx_set_genie(struct net_device *dev, | |||
| 394 | int err = 0; | 394 | int err = 0; |
| 395 | char *buf; | 395 | char *buf; |
| 396 | int i; | 396 | int i; |
| 397 | 397 | ||
| 398 | mutex_lock(&mac->associnfo.mutex); | ||
| 398 | spin_lock_irqsave(&mac->lock, flags); | 399 | spin_lock_irqsave(&mac->lock, flags); |
| 399 | /* bleh. shouldn't be locked for that kmalloc... */ | 400 | /* bleh. shouldn't be locked for that kmalloc... */ |
| 400 | 401 | ||
| @@ -432,6 +433,8 @@ ieee80211softmac_wx_set_genie(struct net_device *dev, | |||
| 432 | 433 | ||
| 433 | out: | 434 | out: |
| 434 | spin_unlock_irqrestore(&mac->lock, flags); | 435 | spin_unlock_irqrestore(&mac->lock, flags); |
| 436 | mutex_unlock(&mac->associnfo.mutex); | ||
| 437 | |||
| 435 | return err; | 438 | return err; |
| 436 | } | 439 | } |
| 437 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_genie); | 440 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_genie); |
| @@ -446,7 +449,8 @@ ieee80211softmac_wx_get_genie(struct net_device *dev, | |||
| 446 | unsigned long flags; | 449 | unsigned long flags; |
| 447 | int err = 0; | 450 | int err = 0; |
| 448 | int space = wrqu->data.length; | 451 | int space = wrqu->data.length; |
| 449 | 452 | ||
| 453 | mutex_lock(&mac->associnfo.mutex); | ||
| 450 | spin_lock_irqsave(&mac->lock, flags); | 454 | spin_lock_irqsave(&mac->lock, flags); |
| 451 | 455 | ||
| 452 | wrqu->data.length = 0; | 456 | wrqu->data.length = 0; |
| @@ -459,6 +463,8 @@ ieee80211softmac_wx_get_genie(struct net_device *dev, | |||
| 459 | err = -E2BIG; | 463 | err = -E2BIG; |
| 460 | } | 464 | } |
| 461 | spin_unlock_irqrestore(&mac->lock, flags); | 465 | spin_unlock_irqrestore(&mac->lock, flags); |
| 466 | mutex_lock(&mac->associnfo.mutex); | ||
| 467 | |||
| 462 | return err; | 468 | return err; |
| 463 | } | 469 | } |
| 464 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_genie); | 470 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_genie); |
| @@ -473,10 +479,13 @@ ieee80211softmac_wx_set_mlme(struct net_device *dev, | |||
| 473 | struct iw_mlme *mlme = (struct iw_mlme *)extra; | 479 | struct iw_mlme *mlme = (struct iw_mlme *)extra; |
| 474 | u16 reason = cpu_to_le16(mlme->reason_code); | 480 | u16 reason = cpu_to_le16(mlme->reason_code); |
| 475 | struct ieee80211softmac_network *net; | 481 | struct ieee80211softmac_network *net; |
| 482 | int err = -EINVAL; | ||
| 483 | |||
| 484 | mutex_lock(&mac->associnfo.mutex); | ||
| 476 | 485 | ||
| 477 | if (memcmp(mac->associnfo.bssid, mlme->addr.sa_data, ETH_ALEN)) { | 486 | if (memcmp(mac->associnfo.bssid, mlme->addr.sa_data, ETH_ALEN)) { |
| 478 | printk(KERN_DEBUG PFX "wx_set_mlme: requested operation on net we don't use\n"); | 487 | printk(KERN_DEBUG PFX "wx_set_mlme: requested operation on net we don't use\n"); |
| 479 | return -EINVAL; | 488 | goto out; |
| 480 | } | 489 | } |
| 481 | 490 | ||
| 482 | switch (mlme->cmd) { | 491 | switch (mlme->cmd) { |
| @@ -484,14 +493,22 @@ ieee80211softmac_wx_set_mlme(struct net_device *dev, | |||
| 484 | net = ieee80211softmac_get_network_by_bssid_locked(mac, mlme->addr.sa_data); | 493 | net = ieee80211softmac_get_network_by_bssid_locked(mac, mlme->addr.sa_data); |
| 485 | if (!net) { | 494 | if (!net) { |
| 486 | printk(KERN_DEBUG PFX "wx_set_mlme: we should know the net here...\n"); | 495 | printk(KERN_DEBUG PFX "wx_set_mlme: we should know the net here...\n"); |
| 487 | return -EINVAL; | 496 | goto out; |
| 488 | } | 497 | } |
| 489 | return ieee80211softmac_deauth_req(mac, net, reason); | 498 | return ieee80211softmac_deauth_req(mac, net, reason); |
| 490 | case IW_MLME_DISASSOC: | 499 | case IW_MLME_DISASSOC: |
| 491 | ieee80211softmac_send_disassoc_req(mac, reason); | 500 | ieee80211softmac_send_disassoc_req(mac, reason); |
| 492 | return 0; | 501 | mac->associnfo.associated = 0; |
| 502 | mac->associnfo.associating = 0; | ||
| 503 | err = 0; | ||
| 504 | goto out; | ||
| 493 | default: | 505 | default: |
| 494 | return -EOPNOTSUPP; | 506 | err = -EOPNOTSUPP; |
| 495 | } | 507 | } |
| 508 | |||
| 509 | out: | ||
| 510 | mutex_unlock(&mac->associnfo.mutex); | ||
| 511 | |||
| 512 | return err; | ||
| 496 | } | 513 | } |
| 497 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_mlme); | 514 | EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_mlme); |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 9c399a70dd5d..af0190d8b6c0 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
| @@ -482,9 +482,7 @@ static int rtm_to_fib_config(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
| 482 | memset(cfg, 0, sizeof(*cfg)); | 482 | memset(cfg, 0, sizeof(*cfg)); |
| 483 | 483 | ||
| 484 | rtm = nlmsg_data(nlh); | 484 | rtm = nlmsg_data(nlh); |
| 485 | cfg->fc_family = rtm->rtm_family; | ||
| 486 | cfg->fc_dst_len = rtm->rtm_dst_len; | 485 | cfg->fc_dst_len = rtm->rtm_dst_len; |
| 487 | cfg->fc_src_len = rtm->rtm_src_len; | ||
| 488 | cfg->fc_tos = rtm->rtm_tos; | 486 | cfg->fc_tos = rtm->rtm_tos; |
| 489 | cfg->fc_table = rtm->rtm_table; | 487 | cfg->fc_table = rtm->rtm_table; |
| 490 | cfg->fc_protocol = rtm->rtm_protocol; | 488 | cfg->fc_protocol = rtm->rtm_protocol; |
| @@ -501,9 +499,6 @@ static int rtm_to_fib_config(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
| 501 | case RTA_DST: | 499 | case RTA_DST: |
| 502 | cfg->fc_dst = nla_get_be32(attr); | 500 | cfg->fc_dst = nla_get_be32(attr); |
| 503 | break; | 501 | break; |
| 504 | case RTA_SRC: | ||
| 505 | cfg->fc_src = nla_get_be32(attr); | ||
| 506 | break; | ||
| 507 | case RTA_OIF: | 502 | case RTA_OIF: |
| 508 | cfg->fc_oif = nla_get_u32(attr); | 503 | cfg->fc_oif = nla_get_u32(attr); |
| 509 | break; | 504 | break; |
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 78a44b01c035..4b90927619b8 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
| @@ -1932,6 +1932,9 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) | |||
| 1932 | { | 1932 | { |
| 1933 | int ret; | 1933 | int ret; |
| 1934 | 1934 | ||
| 1935 | if (!capable(CAP_NET_ADMIN)) | ||
| 1936 | return -EPERM; | ||
| 1937 | |||
| 1935 | switch (cmd) { | 1938 | switch (cmd) { |
| 1936 | case IPT_SO_GET_INFO: | 1939 | case IPT_SO_GET_INFO: |
| 1937 | ret = get_info(user, len, 1); | 1940 | ret = get_info(user, len, 1); |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 6bbd98575172..22ef8bd26620 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -373,7 +373,7 @@ void tcp_v4_err(struct sk_buff *skb, u32 info) | |||
| 373 | seq = ntohl(th->seq); | 373 | seq = ntohl(th->seq); |
| 374 | if (sk->sk_state != TCP_LISTEN && | 374 | if (sk->sk_state != TCP_LISTEN && |
| 375 | !between(seq, tp->snd_una, tp->snd_nxt)) { | 375 | !between(seq, tp->snd_una, tp->snd_nxt)) { |
| 376 | NET_INC_STATS(LINUX_MIB_OUTOFWINDOWICMPS); | 376 | NET_INC_STATS_BH(LINUX_MIB_OUTOFWINDOWICMPS); |
| 377 | goto out; | 377 | goto out; |
| 378 | } | 378 | } |
| 379 | 379 | ||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index f22536e32cb1..ca406157724c 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -1096,10 +1096,14 @@ static int tcp_tso_should_defer(struct sock *sk, struct tcp_sock *tp, struct sk_ | |||
| 1096 | u32 send_win, cong_win, limit, in_flight; | 1096 | u32 send_win, cong_win, limit, in_flight; |
| 1097 | 1097 | ||
| 1098 | if (TCP_SKB_CB(skb)->flags & TCPCB_FLAG_FIN) | 1098 | if (TCP_SKB_CB(skb)->flags & TCPCB_FLAG_FIN) |
| 1099 | return 0; | 1099 | goto send_now; |
| 1100 | 1100 | ||
| 1101 | if (icsk->icsk_ca_state != TCP_CA_Open) | 1101 | if (icsk->icsk_ca_state != TCP_CA_Open) |
| 1102 | return 0; | 1102 | goto send_now; |
| 1103 | |||
| 1104 | /* Defer for less than two clock ticks. */ | ||
| 1105 | if (!tp->tso_deferred && ((jiffies<<1)>>1) - (tp->tso_deferred>>1) > 1) | ||
| 1106 | goto send_now; | ||
| 1103 | 1107 | ||
| 1104 | in_flight = tcp_packets_in_flight(tp); | 1108 | in_flight = tcp_packets_in_flight(tp); |
| 1105 | 1109 | ||
| @@ -1115,7 +1119,7 @@ static int tcp_tso_should_defer(struct sock *sk, struct tcp_sock *tp, struct sk_ | |||
| 1115 | 1119 | ||
| 1116 | /* If a full-sized TSO skb can be sent, do it. */ | 1120 | /* If a full-sized TSO skb can be sent, do it. */ |
| 1117 | if (limit >= 65536) | 1121 | if (limit >= 65536) |
| 1118 | return 0; | 1122 | goto send_now; |
| 1119 | 1123 | ||
| 1120 | if (sysctl_tcp_tso_win_divisor) { | 1124 | if (sysctl_tcp_tso_win_divisor) { |
| 1121 | u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache); | 1125 | u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache); |
| @@ -1125,7 +1129,7 @@ static int tcp_tso_should_defer(struct sock *sk, struct tcp_sock *tp, struct sk_ | |||
| 1125 | */ | 1129 | */ |
| 1126 | chunk /= sysctl_tcp_tso_win_divisor; | 1130 | chunk /= sysctl_tcp_tso_win_divisor; |
| 1127 | if (limit >= chunk) | 1131 | if (limit >= chunk) |
| 1128 | return 0; | 1132 | goto send_now; |
| 1129 | } else { | 1133 | } else { |
| 1130 | /* Different approach, try not to defer past a single | 1134 | /* Different approach, try not to defer past a single |
| 1131 | * ACK. Receiver should ACK every other full sized | 1135 | * ACK. Receiver should ACK every other full sized |
| @@ -1133,11 +1137,17 @@ static int tcp_tso_should_defer(struct sock *sk, struct tcp_sock *tp, struct sk_ | |||
| 1133 | * then send now. | 1137 | * then send now. |
| 1134 | */ | 1138 | */ |
| 1135 | if (limit > tcp_max_burst(tp) * tp->mss_cache) | 1139 | if (limit > tcp_max_burst(tp) * tp->mss_cache) |
| 1136 | return 0; | 1140 | goto send_now; |
| 1137 | } | 1141 | } |
| 1138 | 1142 | ||
| 1139 | /* Ok, it looks like it is advisable to defer. */ | 1143 | /* Ok, it looks like it is advisable to defer. */ |
| 1144 | tp->tso_deferred = 1 | (jiffies<<1); | ||
| 1145 | |||
| 1140 | return 1; | 1146 | return 1; |
| 1147 | |||
| 1148 | send_now: | ||
| 1149 | tp->tso_deferred = 0; | ||
| 1150 | return 0; | ||
| 1141 | } | 1151 | } |
| 1142 | 1152 | ||
| 1143 | /* Create a new MTU probe if we are ready. | 1153 | /* Create a new MTU probe if we are ready. |
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index ef5eaad44851..6e48f52e197c 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig | |||
| @@ -175,9 +175,16 @@ config IPV6_TUNNEL | |||
| 175 | 175 | ||
| 176 | If unsure, say N. | 176 | If unsure, say N. |
| 177 | 177 | ||
| 178 | config IPV6_MULTIPLE_TABLES | ||
| 179 | bool "IPv6: Multiple Routing Tables" | ||
| 180 | depends on IPV6 && EXPERIMENTAL | ||
| 181 | select FIB_RULES | ||
| 182 | ---help--- | ||
| 183 | Support multiple routing tables. | ||
| 184 | |||
| 178 | config IPV6_SUBTREES | 185 | config IPV6_SUBTREES |
| 179 | bool "IPv6: source address based routing" | 186 | bool "IPv6: source address based routing" |
| 180 | depends on IPV6 && EXPERIMENTAL | 187 | depends on IPV6_MULTIPLE_TABLES |
| 181 | ---help--- | 188 | ---help--- |
| 182 | Enable routing by source address or prefix. | 189 | Enable routing by source address or prefix. |
| 183 | 190 | ||
| @@ -189,13 +196,6 @@ config IPV6_SUBTREES | |||
| 189 | 196 | ||
| 190 | If unsure, say N. | 197 | If unsure, say N. |
| 191 | 198 | ||
| 192 | config IPV6_MULTIPLE_TABLES | ||
| 193 | bool "IPv6: Multiple Routing Tables" | ||
| 194 | depends on IPV6 && EXPERIMENTAL | ||
| 195 | select FIB_RULES | ||
| 196 | ---help--- | ||
| 197 | Support multiple routing tables. | ||
| 198 | |||
| 199 | config IPV6_ROUTE_FWMARK | 199 | config IPV6_ROUTE_FWMARK |
| 200 | bool "IPv6: use netfilter MARK value as routing key" | 200 | bool "IPv6: use netfilter MARK value as routing key" |
| 201 | depends on IPV6_MULTIPLE_TABLES && NETFILTER | 201 | depends on IPV6_MULTIPLE_TABLES && NETFILTER |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index a1b0f075462e..c953466b7afd 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -141,6 +141,10 @@ struct rt6_info ip6_null_entry = { | |||
| 141 | 141 | ||
| 142 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES | 142 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES |
| 143 | 143 | ||
| 144 | static int ip6_pkt_prohibit(struct sk_buff *skb); | ||
| 145 | static int ip6_pkt_prohibit_out(struct sk_buff *skb); | ||
| 146 | static int ip6_pkt_blk_hole(struct sk_buff *skb); | ||
| 147 | |||
| 144 | struct rt6_info ip6_prohibit_entry = { | 148 | struct rt6_info ip6_prohibit_entry = { |
| 145 | .u = { | 149 | .u = { |
| 146 | .dst = { | 150 | .dst = { |
| @@ -150,8 +154,8 @@ struct rt6_info ip6_prohibit_entry = { | |||
| 150 | .obsolete = -1, | 154 | .obsolete = -1, |
| 151 | .error = -EACCES, | 155 | .error = -EACCES, |
| 152 | .metrics = { [RTAX_HOPLIMIT - 1] = 255, }, | 156 | .metrics = { [RTAX_HOPLIMIT - 1] = 255, }, |
| 153 | .input = ip6_pkt_discard, | 157 | .input = ip6_pkt_prohibit, |
| 154 | .output = ip6_pkt_discard_out, | 158 | .output = ip6_pkt_prohibit_out, |
| 155 | .ops = &ip6_dst_ops, | 159 | .ops = &ip6_dst_ops, |
| 156 | .path = (struct dst_entry*)&ip6_prohibit_entry, | 160 | .path = (struct dst_entry*)&ip6_prohibit_entry, |
| 157 | } | 161 | } |
| @@ -170,8 +174,8 @@ struct rt6_info ip6_blk_hole_entry = { | |||
| 170 | .obsolete = -1, | 174 | .obsolete = -1, |
| 171 | .error = -EINVAL, | 175 | .error = -EINVAL, |
| 172 | .metrics = { [RTAX_HOPLIMIT - 1] = 255, }, | 176 | .metrics = { [RTAX_HOPLIMIT - 1] = 255, }, |
| 173 | .input = ip6_pkt_discard, | 177 | .input = ip6_pkt_blk_hole, |
| 174 | .output = ip6_pkt_discard_out, | 178 | .output = ip6_pkt_blk_hole, |
| 175 | .ops = &ip6_dst_ops, | 179 | .ops = &ip6_dst_ops, |
| 176 | .path = (struct dst_entry*)&ip6_blk_hole_entry, | 180 | .path = (struct dst_entry*)&ip6_blk_hole_entry, |
| 177 | } | 181 | } |
| @@ -484,7 +488,7 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len, | |||
| 484 | do { \ | 488 | do { \ |
| 485 | if (rt == &ip6_null_entry) { \ | 489 | if (rt == &ip6_null_entry) { \ |
| 486 | struct fib6_node *pn; \ | 490 | struct fib6_node *pn; \ |
| 487 | while (fn) { \ | 491 | while (1) { \ |
| 488 | if (fn->fn_flags & RTN_TL_ROOT) \ | 492 | if (fn->fn_flags & RTN_TL_ROOT) \ |
| 489 | goto out; \ | 493 | goto out; \ |
| 490 | pn = fn->parent; \ | 494 | pn = fn->parent; \ |
| @@ -618,8 +622,6 @@ static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort, struct in6_addr *d | |||
| 618 | ipv6_addr_copy(&rt->rt6i_dst.addr, daddr); | 622 | ipv6_addr_copy(&rt->rt6i_dst.addr, daddr); |
| 619 | rt->rt6i_dst.plen = 128; | 623 | rt->rt6i_dst.plen = 128; |
| 620 | rt->rt6i_flags |= RTF_CACHE; | 624 | rt->rt6i_flags |= RTF_CACHE; |
| 621 | if (rt->rt6i_flags & RTF_REJECT) | ||
| 622 | rt->u.dst.error = ort->u.dst.error; | ||
| 623 | rt->u.dst.flags |= DST_HOST; | 625 | rt->u.dst.flags |= DST_HOST; |
| 624 | rt->rt6i_nexthop = neigh_clone(ort->rt6i_nexthop); | 626 | rt->rt6i_nexthop = neigh_clone(ort->rt6i_nexthop); |
| 625 | } | 627 | } |
| @@ -1540,6 +1542,7 @@ static struct rt6_info * ip6_rt_copy(struct rt6_info *ort) | |||
| 1540 | rt->u.dst.output = ort->u.dst.output; | 1542 | rt->u.dst.output = ort->u.dst.output; |
| 1541 | 1543 | ||
| 1542 | memcpy(rt->u.dst.metrics, ort->u.dst.metrics, RTAX_MAX*sizeof(u32)); | 1544 | memcpy(rt->u.dst.metrics, ort->u.dst.metrics, RTAX_MAX*sizeof(u32)); |
| 1545 | rt->u.dst.error = ort->u.dst.error; | ||
| 1543 | rt->u.dst.dev = ort->u.dst.dev; | 1546 | rt->u.dst.dev = ort->u.dst.dev; |
| 1544 | if (rt->u.dst.dev) | 1547 | if (rt->u.dst.dev) |
| 1545 | dev_hold(rt->u.dst.dev); | 1548 | dev_hold(rt->u.dst.dev); |
| @@ -1743,24 +1746,50 @@ int ipv6_route_ioctl(unsigned int cmd, void __user *arg) | |||
| 1743 | * Drop the packet on the floor | 1746 | * Drop the packet on the floor |
| 1744 | */ | 1747 | */ |
| 1745 | 1748 | ||
| 1746 | static int ip6_pkt_discard(struct sk_buff *skb) | 1749 | static inline int ip6_pkt_drop(struct sk_buff *skb, int code) |
| 1747 | { | 1750 | { |
| 1748 | int type = ipv6_addr_type(&skb->nh.ipv6h->daddr); | 1751 | int type = ipv6_addr_type(&skb->nh.ipv6h->daddr); |
| 1749 | if (type == IPV6_ADDR_ANY || type == IPV6_ADDR_RESERVED) | 1752 | if (type == IPV6_ADDR_ANY || type == IPV6_ADDR_RESERVED) |
| 1750 | IP6_INC_STATS(IPSTATS_MIB_INADDRERRORS); | 1753 | IP6_INC_STATS(IPSTATS_MIB_INADDRERRORS); |
| 1751 | 1754 | ||
| 1752 | IP6_INC_STATS(IPSTATS_MIB_OUTNOROUTES); | 1755 | IP6_INC_STATS(IPSTATS_MIB_OUTNOROUTES); |
| 1753 | icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_NOROUTE, 0, skb->dev); | 1756 | icmpv6_send(skb, ICMPV6_DEST_UNREACH, code, 0, skb->dev); |
| 1754 | kfree_skb(skb); | 1757 | kfree_skb(skb); |
| 1755 | return 0; | 1758 | return 0; |
| 1756 | } | 1759 | } |
| 1757 | 1760 | ||
| 1761 | static int ip6_pkt_discard(struct sk_buff *skb) | ||
| 1762 | { | ||
| 1763 | return ip6_pkt_drop(skb, ICMPV6_NOROUTE); | ||
| 1764 | } | ||
| 1765 | |||
| 1758 | static int ip6_pkt_discard_out(struct sk_buff *skb) | 1766 | static int ip6_pkt_discard_out(struct sk_buff *skb) |
| 1759 | { | 1767 | { |
| 1760 | skb->dev = skb->dst->dev; | 1768 | skb->dev = skb->dst->dev; |
| 1761 | return ip6_pkt_discard(skb); | 1769 | return ip6_pkt_discard(skb); |
| 1762 | } | 1770 | } |
| 1763 | 1771 | ||
| 1772 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
| 1773 | |||
| 1774 | static int ip6_pkt_prohibit(struct sk_buff *skb) | ||
| 1775 | { | ||
| 1776 | return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED); | ||
| 1777 | } | ||
| 1778 | |||
| 1779 | static int ip6_pkt_prohibit_out(struct sk_buff *skb) | ||
| 1780 | { | ||
| 1781 | skb->dev = skb->dst->dev; | ||
| 1782 | return ip6_pkt_prohibit(skb); | ||
| 1783 | } | ||
| 1784 | |||
| 1785 | static int ip6_pkt_blk_hole(struct sk_buff *skb) | ||
| 1786 | { | ||
| 1787 | kfree_skb(skb); | ||
| 1788 | return 0; | ||
| 1789 | } | ||
| 1790 | |||
| 1791 | #endif | ||
| 1792 | |||
| 1764 | /* | 1793 | /* |
| 1765 | * Allocate a dst for local (unicast / anycast) address. | 1794 | * Allocate a dst for local (unicast / anycast) address. |
| 1766 | */ | 1795 | */ |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 73cee2ec07e8..d400f8fae129 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
| @@ -25,12 +25,14 @@ | |||
| 25 | static struct dst_ops xfrm6_dst_ops; | 25 | static struct dst_ops xfrm6_dst_ops; |
| 26 | static struct xfrm_policy_afinfo xfrm6_policy_afinfo; | 26 | static struct xfrm_policy_afinfo xfrm6_policy_afinfo; |
| 27 | 27 | ||
| 28 | static int xfrm6_dst_lookup(struct xfrm_dst **dst, struct flowi *fl) | 28 | static int xfrm6_dst_lookup(struct xfrm_dst **xdst, struct flowi *fl) |
| 29 | { | 29 | { |
| 30 | int err = 0; | 30 | struct dst_entry *dst = ip6_route_output(NULL, fl); |
| 31 | *dst = (struct xfrm_dst*)ip6_route_output(NULL, fl); | 31 | int err = dst->error; |
| 32 | if (!*dst) | 32 | if (!err) |
| 33 | err = -ENETUNREACH; | 33 | *xdst = (struct xfrm_dst *) dst; |
| 34 | else | ||
| 35 | dst_release(dst); | ||
| 34 | return err; | 36 | return err; |
| 35 | } | 37 | } |
| 36 | 38 | ||
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 249e5033c1a8..78071c6e6cf1 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c | |||
| @@ -215,17 +215,17 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc, | |||
| 215 | } | 215 | } |
| 216 | 216 | ||
| 217 | dst = ip6_route_output(NULL, &fl); | 217 | dst = ip6_route_output(NULL, &fl); |
| 218 | if (dst) { | 218 | if (!dst->error) { |
| 219 | struct rt6_info *rt; | 219 | struct rt6_info *rt; |
| 220 | rt = (struct rt6_info *)dst; | 220 | rt = (struct rt6_info *)dst; |
| 221 | SCTP_DEBUG_PRINTK( | 221 | SCTP_DEBUG_PRINTK( |
| 222 | "rt6_dst:" NIP6_FMT " rt6_src:" NIP6_FMT "\n", | 222 | "rt6_dst:" NIP6_FMT " rt6_src:" NIP6_FMT "\n", |
| 223 | NIP6(rt->rt6i_dst.addr), NIP6(rt->rt6i_src.addr)); | 223 | NIP6(rt->rt6i_dst.addr), NIP6(rt->rt6i_src.addr)); |
| 224 | } else { | 224 | return dst; |
| 225 | SCTP_DEBUG_PRINTK("NO ROUTE\n"); | ||
| 226 | } | 225 | } |
| 227 | 226 | SCTP_DEBUG_PRINTK("NO ROUTE\n"); | |
| 228 | return dst; | 227 | dst_release(dst); |
| 228 | return NULL; | ||
| 229 | } | 229 | } |
| 230 | 230 | ||
| 231 | /* Returns the number of consecutive initial bits that match in the 2 ipv6 | 231 | /* Returns the number of consecutive initial bits that match in the 2 ipv6 |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 9deec4391187..9f34dec6ff8e 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -821,7 +821,7 @@ out: | |||
| 821 | * addrs is a pointer to an array of one or more socket addresses. Each | 821 | * addrs is a pointer to an array of one or more socket addresses. Each |
| 822 | * address is contained in its appropriate structure (i.e. struct | 822 | * address is contained in its appropriate structure (i.e. struct |
| 823 | * sockaddr_in or struct sockaddr_in6) the family of the address type | 823 | * sockaddr_in or struct sockaddr_in6) the family of the address type |
| 824 | * must be used to distengish the address length (note that this | 824 | * must be used to distinguish the address length (note that this |
| 825 | * representation is termed a "packed array" of addresses). The caller | 825 | * representation is termed a "packed array" of addresses). The caller |
| 826 | * specifies the number of addresses in the array with addrcnt. | 826 | * specifies the number of addresses in the array with addrcnt. |
| 827 | * | 827 | * |
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c index 919d5ba7ca0a..e52afab413de 100644 --- a/net/sunrpc/pmap_clnt.c +++ b/net/sunrpc/pmap_clnt.c | |||
| @@ -101,11 +101,13 @@ void rpc_getport(struct rpc_task *task) | |||
| 101 | /* Autobind on cloned rpc clients is discouraged */ | 101 | /* Autobind on cloned rpc clients is discouraged */ |
| 102 | BUG_ON(clnt->cl_parent != clnt); | 102 | BUG_ON(clnt->cl_parent != clnt); |
| 103 | 103 | ||
| 104 | if (xprt_test_and_set_binding(xprt)) { | 104 | /* Put self on queue before sending rpcbind request, in case |
| 105 | task->tk_status = -EACCES; /* tell caller to check again */ | 105 | * pmap_getport_done completes before we return from rpc_run_task */ |
| 106 | rpc_sleep_on(&xprt->binding, task, NULL, NULL); | 106 | rpc_sleep_on(&xprt->binding, task, NULL, NULL); |
| 107 | return; | 107 | |
| 108 | } | 108 | status = -EACCES; /* tell caller to check again */ |
| 109 | if (xprt_test_and_set_binding(xprt)) | ||
| 110 | goto bailout_nofree; | ||
| 109 | 111 | ||
| 110 | /* Someone else may have bound if we slept */ | 112 | /* Someone else may have bound if we slept */ |
| 111 | status = 0; | 113 | status = 0; |
| @@ -134,8 +136,6 @@ void rpc_getport(struct rpc_task *task) | |||
| 134 | goto bailout; | 136 | goto bailout; |
| 135 | rpc_release_task(child); | 137 | rpc_release_task(child); |
| 136 | 138 | ||
| 137 | rpc_sleep_on(&xprt->binding, task, NULL, NULL); | ||
| 138 | |||
| 139 | task->tk_xprt->stat.bind_count++; | 139 | task->tk_xprt->stat.bind_count++; |
| 140 | return; | 140 | return; |
| 141 | 141 | ||
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 61e307cca13d..96521f16342b 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
| @@ -973,7 +973,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) | |||
| 973 | return 0; | 973 | return 0; |
| 974 | } | 974 | } |
| 975 | 975 | ||
| 976 | if (test_bit(SK_CONN, &svsk->sk_flags)) { | 976 | if (svsk->sk_sk->sk_state == TCP_LISTEN) { |
| 977 | svc_tcp_accept(svsk); | 977 | svc_tcp_accept(svsk); |
| 978 | svc_sock_received(svsk); | 978 | svc_sock_received(svsk); |
| 979 | return 0; | 979 | return 0; |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 28100e019225..757fc91ef25d 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
| @@ -1366,7 +1366,7 @@ int xs_setup_udp(struct rpc_xprt *xprt, struct rpc_timeout *to) | |||
| 1366 | if (xprt->slot == NULL) | 1366 | if (xprt->slot == NULL) |
| 1367 | return -ENOMEM; | 1367 | return -ENOMEM; |
| 1368 | 1368 | ||
| 1369 | if (ntohs(addr->sin_port != 0)) | 1369 | if (ntohs(addr->sin_port) != 0) |
| 1370 | xprt_set_bound(xprt); | 1370 | xprt_set_bound(xprt); |
| 1371 | xprt->port = xs_get_random_port(); | 1371 | xprt->port = xs_get_random_port(); |
| 1372 | 1372 | ||
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 75a5968c2139..39744a33bd36 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * net/tipc/bearer.c: TIPC bearer code | 2 | * net/tipc/bearer.c: TIPC bearer code |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 1996-2006, Ericsson AB | 4 | * Copyright (c) 1996-2006, Ericsson AB |
| 5 | * Copyright (c) 2004-2005, Wind River Systems | 5 | * Copyright (c) 2004-2006, Wind River Systems |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| 7 | * | 7 | * |
| 8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
| @@ -191,14 +191,14 @@ void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a) | |||
| 191 | if ((i < media_count) && (m_ptr->addr2str != NULL)) { | 191 | if ((i < media_count) && (m_ptr->addr2str != NULL)) { |
| 192 | char addr_str[MAX_ADDR_STR]; | 192 | char addr_str[MAX_ADDR_STR]; |
| 193 | 193 | ||
| 194 | tipc_printf(pb, "%s(%s) ", m_ptr->name, | 194 | tipc_printf(pb, "%s(%s)", m_ptr->name, |
| 195 | m_ptr->addr2str(a, addr_str, sizeof(addr_str))); | 195 | m_ptr->addr2str(a, addr_str, sizeof(addr_str))); |
| 196 | } else { | 196 | } else { |
| 197 | unchar *addr = (unchar *)&a->dev_addr; | 197 | unchar *addr = (unchar *)&a->dev_addr; |
| 198 | 198 | ||
| 199 | tipc_printf(pb, "UNKNOWN(%u):", media_type); | 199 | tipc_printf(pb, "UNKNOWN(%u)", media_type); |
| 200 | for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++) { | 200 | for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++) { |
| 201 | tipc_printf(pb, "%02x ", addr[i]); | 201 | tipc_printf(pb, "-%02x", addr[i]); |
| 202 | } | 202 | } |
| 203 | } | 203 | } |
| 204 | } | 204 | } |
diff --git a/net/tipc/config.c b/net/tipc/config.c index 285e1bc2d880..ed1351ed05e1 100644 --- a/net/tipc/config.c +++ b/net/tipc/config.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * net/tipc/config.c: TIPC configuration management code | 2 | * net/tipc/config.c: TIPC configuration management code |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2002-2006, Ericsson AB | 4 | * Copyright (c) 2002-2006, Ericsson AB |
| 5 | * Copyright (c) 2004-2005, Wind River Systems | 5 | * Copyright (c) 2004-2006, Wind River Systems |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| 7 | * | 7 | * |
| 8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
| @@ -613,7 +613,8 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area | |||
| 613 | rep_tlv_buf = tipc_cfg_reply_unsigned(tipc_net_id); | 613 | rep_tlv_buf = tipc_cfg_reply_unsigned(tipc_net_id); |
| 614 | break; | 614 | break; |
| 615 | default: | 615 | default: |
| 616 | rep_tlv_buf = NULL; | 616 | rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED |
| 617 | " (unknown command)"); | ||
| 617 | break; | 618 | break; |
| 618 | } | 619 | } |
| 619 | 620 | ||
diff --git a/net/tipc/core.c b/net/tipc/core.c index 0539a8362858..6f5b7ee31180 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
| @@ -57,7 +57,7 @@ void tipc_socket_stop(void); | |||
| 57 | int tipc_netlink_start(void); | 57 | int tipc_netlink_start(void); |
| 58 | void tipc_netlink_stop(void); | 58 | void tipc_netlink_stop(void); |
| 59 | 59 | ||
| 60 | #define TIPC_MOD_VER "1.6.1" | 60 | #define TIPC_MOD_VER "1.6.2" |
| 61 | 61 | ||
| 62 | #ifndef CONFIG_TIPC_ZONES | 62 | #ifndef CONFIG_TIPC_ZONES |
| 63 | #define CONFIG_TIPC_ZONES 3 | 63 | #define CONFIG_TIPC_ZONES 3 |
| @@ -90,7 +90,7 @@ int tipc_random; | |||
| 90 | atomic_t tipc_user_count = ATOMIC_INIT(0); | 90 | atomic_t tipc_user_count = ATOMIC_INIT(0); |
| 91 | 91 | ||
| 92 | const char tipc_alphabet[] = | 92 | const char tipc_alphabet[] = |
| 93 | "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"; | 93 | "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_."; |
| 94 | 94 | ||
| 95 | /* configurable TIPC parameters */ | 95 | /* configurable TIPC parameters */ |
| 96 | 96 | ||
diff --git a/net/tipc/core.h b/net/tipc/core.h index 762aac2572be..4638947c2326 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | #define assert(i) BUG_ON(!(i)) | 65 | #define assert(i) BUG_ON(!(i)) |
| 66 | 66 | ||
| 67 | struct tipc_msg; | 67 | struct tipc_msg; |
| 68 | extern struct print_buf *TIPC_CONS, *TIPC_LOG; | 68 | extern struct print_buf *TIPC_NULL, *TIPC_CONS, *TIPC_LOG; |
| 69 | extern struct print_buf *TIPC_TEE(struct print_buf *, struct print_buf *); | 69 | extern struct print_buf *TIPC_TEE(struct print_buf *, struct print_buf *); |
| 70 | void tipc_msg_print(struct print_buf*,struct tipc_msg *,const char*); | 70 | void tipc_msg_print(struct print_buf*,struct tipc_msg *,const char*); |
| 71 | void tipc_printf(struct print_buf *, const char *fmt, ...); | 71 | void tipc_printf(struct print_buf *, const char *fmt, ...); |
| @@ -83,9 +83,9 @@ void tipc_dump(struct print_buf*,const char *fmt, ...); | |||
| 83 | #define warn(fmt, arg...) tipc_printf(TIPC_OUTPUT, KERN_WARNING "TIPC: " fmt, ## arg) | 83 | #define warn(fmt, arg...) tipc_printf(TIPC_OUTPUT, KERN_WARNING "TIPC: " fmt, ## arg) |
| 84 | #define info(fmt, arg...) tipc_printf(TIPC_OUTPUT, KERN_NOTICE "TIPC: " fmt, ## arg) | 84 | #define info(fmt, arg...) tipc_printf(TIPC_OUTPUT, KERN_NOTICE "TIPC: " fmt, ## arg) |
| 85 | 85 | ||
| 86 | #define dbg(fmt, arg...) do {if (DBG_OUTPUT) tipc_printf(DBG_OUTPUT, fmt, ## arg);} while(0) | 86 | #define dbg(fmt, arg...) do {if (DBG_OUTPUT != TIPC_NULL) tipc_printf(DBG_OUTPUT, fmt, ## arg);} while(0) |
| 87 | #define msg_dbg(msg, txt) do {if (DBG_OUTPUT) tipc_msg_print(DBG_OUTPUT, msg, txt);} while(0) | 87 | #define msg_dbg(msg, txt) do {if (DBG_OUTPUT != TIPC_NULL) tipc_msg_print(DBG_OUTPUT, msg, txt);} while(0) |
| 88 | #define dump(fmt, arg...) do {if (DBG_OUTPUT) tipc_dump(DBG_OUTPUT, fmt, ##arg);} while(0) | 88 | #define dump(fmt, arg...) do {if (DBG_OUTPUT != TIPC_NULL) tipc_dump(DBG_OUTPUT, fmt, ##arg);} while(0) |
| 89 | 89 | ||
| 90 | 90 | ||
| 91 | /* | 91 | /* |
| @@ -94,11 +94,11 @@ void tipc_dump(struct print_buf*,const char *fmt, ...); | |||
| 94 | * here, or on a per .c file basis, by redefining these symbols. The following | 94 | * here, or on a per .c file basis, by redefining these symbols. The following |
| 95 | * print buffer options are available: | 95 | * print buffer options are available: |
| 96 | * | 96 | * |
| 97 | * NULL : Output to null print buffer (i.e. print nowhere) | 97 | * TIPC_NULL : null buffer (i.e. print nowhere) |
| 98 | * TIPC_CONS : Output to system console | 98 | * TIPC_CONS : system console |
| 99 | * TIPC_LOG : Output to TIPC log buffer | 99 | * TIPC_LOG : TIPC log buffer |
| 100 | * &buf : Output to user-defined buffer (struct print_buf *) | 100 | * &buf : user-defined buffer (struct print_buf *) |
| 101 | * TIPC_TEE(&buf_a,&buf_b) : Output to two print buffers (eg. TIPC_TEE(TIPC_CONS,TIPC_LOG) ) | 101 | * TIPC_TEE(&buf_a,&buf_b) : list of buffers (eg. TIPC_TEE(TIPC_CONS,TIPC_LOG)) |
| 102 | */ | 102 | */ |
| 103 | 103 | ||
| 104 | #ifndef TIPC_OUTPUT | 104 | #ifndef TIPC_OUTPUT |
| @@ -106,7 +106,7 @@ void tipc_dump(struct print_buf*,const char *fmt, ...); | |||
| 106 | #endif | 106 | #endif |
| 107 | 107 | ||
| 108 | #ifndef DBG_OUTPUT | 108 | #ifndef DBG_OUTPUT |
| 109 | #define DBG_OUTPUT NULL | 109 | #define DBG_OUTPUT TIPC_NULL |
| 110 | #endif | 110 | #endif |
| 111 | 111 | ||
| 112 | #else | 112 | #else |
| @@ -136,7 +136,7 @@ void tipc_dump(struct print_buf*,const char *fmt, ...); | |||
| 136 | #define TIPC_OUTPUT TIPC_CONS | 136 | #define TIPC_OUTPUT TIPC_CONS |
| 137 | 137 | ||
| 138 | #undef DBG_OUTPUT | 138 | #undef DBG_OUTPUT |
| 139 | #define DBG_OUTPUT NULL | 139 | #define DBG_OUTPUT TIPC_NULL |
| 140 | 140 | ||
| 141 | #endif | 141 | #endif |
| 142 | 142 | ||
| @@ -275,11 +275,15 @@ static inline void k_term_timer(struct timer_list *timer) | |||
| 275 | /* | 275 | /* |
| 276 | * TIPC message buffer code | 276 | * TIPC message buffer code |
| 277 | * | 277 | * |
| 278 | * TIPC message buffer headroom leaves room for 14 byte Ethernet header, | 278 | * TIPC message buffer headroom reserves space for a link-level header |
| 279 | * (in case the message is sent off-node), | ||
| 279 | * while ensuring TIPC header is word aligned for quicker access | 280 | * while ensuring TIPC header is word aligned for quicker access |
| 281 | * | ||
| 282 | * The largest header currently supported is 18 bytes, which is used when | ||
| 283 | * the standard 14 byte Ethernet header has 4 added bytes for VLAN info | ||
| 280 | */ | 284 | */ |
| 281 | 285 | ||
| 282 | #define BUF_HEADROOM 16u | 286 | #define BUF_HEADROOM 20u |
| 283 | 287 | ||
| 284 | struct tipc_skb_cb { | 288 | struct tipc_skb_cb { |
| 285 | void *handle; | 289 | void *handle; |
diff --git a/net/tipc/dbg.c b/net/tipc/dbg.c index 55130655e1ed..d8af4c28695d 100644 --- a/net/tipc/dbg.c +++ b/net/tipc/dbg.c | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * net/tipc/dbg.c: TIPC print buffer routines for debuggign | 2 | * net/tipc/dbg.c: TIPC print buffer routines for debugging |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 1996-2006, Ericsson AB | 4 | * Copyright (c) 1996-2006, Ericsson AB |
| 5 | * Copyright (c) 2005, Wind River Systems | 5 | * Copyright (c) 2005-2006, Wind River Systems |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| 7 | * | 7 | * |
| 8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
| @@ -38,11 +38,12 @@ | |||
| 38 | #include "config.h" | 38 | #include "config.h" |
| 39 | #include "dbg.h" | 39 | #include "dbg.h" |
| 40 | 40 | ||
| 41 | #define MAX_STRING 512 | 41 | static char print_string[TIPC_PB_MAX_STR]; |
| 42 | |||
| 43 | static char print_string[MAX_STRING]; | ||
| 44 | static DEFINE_SPINLOCK(print_lock); | 42 | static DEFINE_SPINLOCK(print_lock); |
| 45 | 43 | ||
| 44 | static struct print_buf null_buf = { NULL, 0, NULL, NULL }; | ||
| 45 | struct print_buf *TIPC_NULL = &null_buf; | ||
| 46 | |||
| 46 | static struct print_buf cons_buf = { NULL, 0, NULL, NULL }; | 47 | static struct print_buf cons_buf = { NULL, 0, NULL, NULL }; |
| 47 | struct print_buf *TIPC_CONS = &cons_buf; | 48 | struct print_buf *TIPC_CONS = &cons_buf; |
| 48 | 49 | ||
| @@ -62,68 +63,83 @@ struct print_buf *TIPC_LOG = &log_buf; | |||
| 62 | /* | 63 | /* |
| 63 | * Locking policy when using print buffers. | 64 | * Locking policy when using print buffers. |
| 64 | * | 65 | * |
| 65 | * 1) Routines of the form printbuf_XXX() rely on the caller to prevent | 66 | * The following routines use 'print_lock' for protection: |
| 66 | * simultaneous use of the print buffer(s) being manipulated. | 67 | * 1) tipc_printf() - to protect its print buffer(s) and 'print_string' |
| 67 | * 2) tipc_printf() uses 'print_lock' to prevent simultaneous use of | 68 | * 2) TIPC_TEE() - to protect its print buffer(s) |
| 68 | * 'print_string' and to protect its print buffer(s). | 69 | * 3) tipc_dump() - to protect its print buffer(s) and 'print_string' |
| 69 | * 3) TIPC_TEE() uses 'print_lock' to protect its print buffer(s). | 70 | * 4) tipc_log_XXX() - to protect TIPC_LOG |
| 70 | * 4) Routines of the form log_XXX() uses 'print_lock' to protect TIPC_LOG. | 71 | * |
| 72 | * All routines of the form tipc_printbuf_XXX() rely on the caller to prevent | ||
| 73 | * simultaneous use of the print buffer(s) being manipulated. | ||
| 71 | */ | 74 | */ |
| 72 | 75 | ||
| 73 | /** | 76 | /** |
| 74 | * tipc_printbuf_init - initialize print buffer to empty | 77 | * tipc_printbuf_init - initialize print buffer to empty |
| 78 | * @pb: pointer to print buffer structure | ||
| 79 | * @raw: pointer to character array used by print buffer | ||
| 80 | * @size: size of character array | ||
| 81 | * | ||
| 82 | * Makes the print buffer a null device that discards anything written to it | ||
| 83 | * if the character array is too small (or absent). | ||
| 75 | */ | 84 | */ |
| 76 | 85 | ||
| 77 | void tipc_printbuf_init(struct print_buf *pb, char *raw, u32 sz) | 86 | void tipc_printbuf_init(struct print_buf *pb, char *raw, u32 size) |
| 78 | { | 87 | { |
| 79 | if (!pb || !raw || (sz < (MAX_STRING + 1))) | 88 | pb->buf = raw; |
| 80 | return; | 89 | pb->crs = raw; |
| 81 | 90 | pb->size = size; | |
| 82 | pb->crs = pb->buf = raw; | ||
| 83 | pb->size = sz; | ||
| 84 | pb->next = NULL; | 91 | pb->next = NULL; |
| 85 | pb->buf[0] = 0; | 92 | |
| 86 | pb->buf[sz-1] = ~0; | 93 | if (size < TIPC_PB_MIN_SIZE) { |
| 94 | pb->buf = NULL; | ||
| 95 | } else if (raw) { | ||
| 96 | pb->buf[0] = 0; | ||
| 97 | pb->buf[size-1] = ~0; | ||
| 98 | } | ||
| 87 | } | 99 | } |
| 88 | 100 | ||
| 89 | /** | 101 | /** |
| 90 | * tipc_printbuf_reset - reinitialize print buffer to empty state | 102 | * tipc_printbuf_reset - reinitialize print buffer to empty state |
| 103 | * @pb: pointer to print buffer structure | ||
| 91 | */ | 104 | */ |
| 92 | 105 | ||
| 93 | void tipc_printbuf_reset(struct print_buf *pb) | 106 | void tipc_printbuf_reset(struct print_buf *pb) |
| 94 | { | 107 | { |
| 95 | if (pb && pb->buf) | 108 | tipc_printbuf_init(pb, pb->buf, pb->size); |
| 96 | tipc_printbuf_init(pb, pb->buf, pb->size); | ||
| 97 | } | 109 | } |
| 98 | 110 | ||
| 99 | /** | 111 | /** |
| 100 | * tipc_printbuf_empty - test if print buffer is in empty state | 112 | * tipc_printbuf_empty - test if print buffer is in empty state |
| 113 | * @pb: pointer to print buffer structure | ||
| 114 | * | ||
| 115 | * Returns non-zero if print buffer is empty. | ||
| 101 | */ | 116 | */ |
| 102 | 117 | ||
| 103 | int tipc_printbuf_empty(struct print_buf *pb) | 118 | int tipc_printbuf_empty(struct print_buf *pb) |
| 104 | { | 119 | { |
| 105 | return (!pb || !pb->buf || (pb->crs == pb->buf)); | 120 | return (!pb->buf || (pb->crs == pb->buf)); |
| 106 | } | 121 | } |
| 107 | 122 | ||
| 108 | /** | 123 | /** |
| 109 | * tipc_printbuf_validate - check for print buffer overflow | 124 | * tipc_printbuf_validate - check for print buffer overflow |
| 125 | * @pb: pointer to print buffer structure | ||
| 110 | * | 126 | * |
| 111 | * Verifies that a print buffer has captured all data written to it. | 127 | * Verifies that a print buffer has captured all data written to it. |
| 112 | * If data has been lost, linearize buffer and prepend an error message | 128 | * If data has been lost, linearize buffer and prepend an error message |
| 113 | * | 129 | * |
| 114 | * Returns length of print buffer data string (including trailing NULL) | 130 | * Returns length of print buffer data string (including trailing NUL) |
| 115 | */ | 131 | */ |
| 116 | 132 | ||
| 117 | int tipc_printbuf_validate(struct print_buf *pb) | 133 | int tipc_printbuf_validate(struct print_buf *pb) |
| 118 | { | 134 | { |
| 119 | char *err = " *** PRINT BUFFER WRAPPED AROUND ***\n"; | 135 | char *err = "\n\n*** PRINT BUFFER OVERFLOW ***\n\n"; |
| 120 | char *cp_buf; | 136 | char *cp_buf; |
| 121 | struct print_buf cb; | 137 | struct print_buf cb; |
| 122 | 138 | ||
| 123 | if (!pb || !pb->buf) | 139 | if (!pb->buf) |
| 124 | return 0; | 140 | return 0; |
| 125 | 141 | ||
| 126 | if (pb->buf[pb->size - 1] == '\0') { | 142 | if (pb->buf[pb->size - 1] == 0) { |
| 127 | cp_buf = kmalloc(pb->size, GFP_ATOMIC); | 143 | cp_buf = kmalloc(pb->size, GFP_ATOMIC); |
| 128 | if (cp_buf != NULL){ | 144 | if (cp_buf != NULL){ |
| 129 | tipc_printbuf_init(&cb, cp_buf, pb->size); | 145 | tipc_printbuf_init(&cb, cp_buf, pb->size); |
| @@ -141,6 +157,8 @@ int tipc_printbuf_validate(struct print_buf *pb) | |||
| 141 | 157 | ||
| 142 | /** | 158 | /** |
| 143 | * tipc_printbuf_move - move print buffer contents to another print buffer | 159 | * tipc_printbuf_move - move print buffer contents to another print buffer |
| 160 | * @pb_to: pointer to destination print buffer structure | ||
| 161 | * @pb_from: pointer to source print buffer structure | ||
| 144 | * | 162 | * |
| 145 | * Current contents of destination print buffer (if any) are discarded. | 163 | * Current contents of destination print buffer (if any) are discarded. |
| 146 | * Source print buffer becomes empty if a successful move occurs. | 164 | * Source print buffer becomes empty if a successful move occurs. |
| @@ -152,21 +170,22 @@ void tipc_printbuf_move(struct print_buf *pb_to, struct print_buf *pb_from) | |||
| 152 | 170 | ||
| 153 | /* Handle the cases where contents can't be moved */ | 171 | /* Handle the cases where contents can't be moved */ |
| 154 | 172 | ||
| 155 | if (!pb_to || !pb_to->buf) | 173 | if (!pb_to->buf) |
| 156 | return; | 174 | return; |
| 157 | 175 | ||
| 158 | if (!pb_from || !pb_from->buf) { | 176 | if (!pb_from->buf) { |
| 159 | tipc_printbuf_reset(pb_to); | 177 | tipc_printbuf_reset(pb_to); |
| 160 | return; | 178 | return; |
| 161 | } | 179 | } |
| 162 | 180 | ||
| 163 | if (pb_to->size < pb_from->size) { | 181 | if (pb_to->size < pb_from->size) { |
| 164 | tipc_printbuf_reset(pb_to); | 182 | tipc_printbuf_reset(pb_to); |
| 165 | tipc_printf(pb_to, "*** PRINT BUFFER OVERFLOW ***"); | 183 | tipc_printf(pb_to, "*** PRINT BUFFER MOVE ERROR ***"); |
| 166 | return; | 184 | return; |
| 167 | } | 185 | } |
| 168 | 186 | ||
| 169 | /* Copy data from char after cursor to end (if used) */ | 187 | /* Copy data from char after cursor to end (if used) */ |
| 188 | |||
| 170 | len = pb_from->buf + pb_from->size - pb_from->crs - 2; | 189 | len = pb_from->buf + pb_from->size - pb_from->crs - 2; |
| 171 | if ((pb_from->buf[pb_from->size-1] == 0) && (len > 0)) { | 190 | if ((pb_from->buf[pb_from->size-1] == 0) && (len > 0)) { |
| 172 | strcpy(pb_to->buf, pb_from->crs + 1); | 191 | strcpy(pb_to->buf, pb_from->crs + 1); |
| @@ -175,6 +194,7 @@ void tipc_printbuf_move(struct print_buf *pb_to, struct print_buf *pb_from) | |||
| 175 | pb_to->crs = pb_to->buf; | 194 | pb_to->crs = pb_to->buf; |
| 176 | 195 | ||
| 177 | /* Copy data from start to cursor (always) */ | 196 | /* Copy data from start to cursor (always) */ |
| 197 | |||
| 178 | len = pb_from->crs - pb_from->buf; | 198 | len = pb_from->crs - pb_from->buf; |
| 179 | strcpy(pb_to->crs, pb_from->buf); | 199 | strcpy(pb_to->crs, pb_from->buf); |
| 180 | pb_to->crs += len; | 200 | pb_to->crs += len; |
| @@ -184,6 +204,8 @@ void tipc_printbuf_move(struct print_buf *pb_to, struct print_buf *pb_from) | |||
| 184 | 204 | ||
| 185 | /** | 205 | /** |
| 186 | * tipc_printf - append formatted output to print buffer chain | 206 | * tipc_printf - append formatted output to print buffer chain |
| 207 | * @pb: pointer to chain of print buffers (may be NULL) | ||
| 208 | * @fmt: formatted info to be printed | ||
| 187 | */ | 209 | */ |
| 188 | 210 | ||
| 189 | void tipc_printf(struct print_buf *pb, const char *fmt, ...) | 211 | void tipc_printf(struct print_buf *pb, const char *fmt, ...) |
| @@ -195,8 +217,8 @@ void tipc_printf(struct print_buf *pb, const char *fmt, ...) | |||
| 195 | 217 | ||
| 196 | spin_lock_bh(&print_lock); | 218 | spin_lock_bh(&print_lock); |
| 197 | FORMAT(print_string, chars_to_add, fmt); | 219 | FORMAT(print_string, chars_to_add, fmt); |
| 198 | if (chars_to_add >= MAX_STRING) | 220 | if (chars_to_add >= TIPC_PB_MAX_STR) |
| 199 | strcpy(print_string, "*** STRING TOO LONG ***"); | 221 | strcpy(print_string, "*** PRINT BUFFER STRING TOO LONG ***"); |
| 200 | 222 | ||
| 201 | while (pb) { | 223 | while (pb) { |
| 202 | if (pb == TIPC_CONS) | 224 | if (pb == TIPC_CONS) |
| @@ -206,6 +228,10 @@ void tipc_printf(struct print_buf *pb, const char *fmt, ...) | |||
| 206 | if (chars_to_add <= chars_left) { | 228 | if (chars_to_add <= chars_left) { |
| 207 | strcpy(pb->crs, print_string); | 229 | strcpy(pb->crs, print_string); |
| 208 | pb->crs += chars_to_add; | 230 | pb->crs += chars_to_add; |
| 231 | } else if (chars_to_add >= (pb->size - 1)) { | ||
| 232 | strcpy(pb->buf, print_string + chars_to_add + 1 | ||
| 233 | - pb->size); | ||
| 234 | pb->crs = pb->buf + pb->size - 1; | ||
| 209 | } else { | 235 | } else { |
| 210 | strcpy(pb->buf, print_string + chars_left); | 236 | strcpy(pb->buf, print_string + chars_left); |
| 211 | save_char = print_string[chars_left]; | 237 | save_char = print_string[chars_left]; |
| @@ -224,6 +250,10 @@ void tipc_printf(struct print_buf *pb, const char *fmt, ...) | |||
| 224 | 250 | ||
| 225 | /** | 251 | /** |
| 226 | * TIPC_TEE - perform next output operation on both print buffers | 252 | * TIPC_TEE - perform next output operation on both print buffers |
| 253 | * @b0: pointer to chain of print buffers (may be NULL) | ||
| 254 | * @b1: pointer to print buffer to add to chain | ||
| 255 | * | ||
| 256 | * Returns pointer to print buffer chain. | ||
| 227 | */ | 257 | */ |
| 228 | 258 | ||
| 229 | struct print_buf *TIPC_TEE(struct print_buf *b0, struct print_buf *b1) | 259 | struct print_buf *TIPC_TEE(struct print_buf *b0, struct print_buf *b1) |
| @@ -232,8 +262,6 @@ struct print_buf *TIPC_TEE(struct print_buf *b0, struct print_buf *b1) | |||
| 232 | 262 | ||
| 233 | if (!b0 || (b0 == b1)) | 263 | if (!b0 || (b0 == b1)) |
| 234 | return b1; | 264 | return b1; |
| 235 | if (!b1) | ||
| 236 | return b0; | ||
| 237 | 265 | ||
| 238 | spin_lock_bh(&print_lock); | 266 | spin_lock_bh(&print_lock); |
| 239 | while (pb->next) { | 267 | while (pb->next) { |
| @@ -256,7 +284,7 @@ static void print_to_console(char *crs, int len) | |||
| 256 | int rest = len; | 284 | int rest = len; |
| 257 | 285 | ||
| 258 | while (rest > 0) { | 286 | while (rest > 0) { |
| 259 | int sz = rest < MAX_STRING ? rest : MAX_STRING; | 287 | int sz = rest < TIPC_PB_MAX_STR ? rest : TIPC_PB_MAX_STR; |
| 260 | char c = crs[sz]; | 288 | char c = crs[sz]; |
| 261 | 289 | ||
| 262 | crs[sz] = 0; | 290 | crs[sz] = 0; |
| @@ -275,36 +303,48 @@ static void printbuf_dump(struct print_buf *pb) | |||
| 275 | { | 303 | { |
| 276 | int len; | 304 | int len; |
| 277 | 305 | ||
| 306 | if (!pb->buf) { | ||
| 307 | printk("*** PRINT BUFFER NOT ALLOCATED ***"); | ||
| 308 | return; | ||
| 309 | } | ||
| 310 | |||
| 278 | /* Dump print buffer from char after cursor to end (if used) */ | 311 | /* Dump print buffer from char after cursor to end (if used) */ |
| 312 | |||
| 279 | len = pb->buf + pb->size - pb->crs - 2; | 313 | len = pb->buf + pb->size - pb->crs - 2; |
| 280 | if ((pb->buf[pb->size - 1] == 0) && (len > 0)) | 314 | if ((pb->buf[pb->size - 1] == 0) && (len > 0)) |
| 281 | print_to_console(pb->crs + 1, len); | 315 | print_to_console(pb->crs + 1, len); |
| 282 | 316 | ||
| 283 | /* Dump print buffer from start to cursor (always) */ | 317 | /* Dump print buffer from start to cursor (always) */ |
| 318 | |||
| 284 | len = pb->crs - pb->buf; | 319 | len = pb->crs - pb->buf; |
| 285 | print_to_console(pb->buf, len); | 320 | print_to_console(pb->buf, len); |
| 286 | } | 321 | } |
| 287 | 322 | ||
| 288 | /** | 323 | /** |
| 289 | * tipc_dump - dump non-console print buffer(s) to console | 324 | * tipc_dump - dump non-console print buffer(s) to console |
| 325 | * @pb: pointer to chain of print buffers | ||
| 290 | */ | 326 | */ |
| 291 | 327 | ||
| 292 | void tipc_dump(struct print_buf *pb, const char *fmt, ...) | 328 | void tipc_dump(struct print_buf *pb, const char *fmt, ...) |
| 293 | { | 329 | { |
| 330 | struct print_buf *pb_next; | ||
| 294 | int len; | 331 | int len; |
| 295 | 332 | ||
| 296 | spin_lock_bh(&print_lock); | 333 | spin_lock_bh(&print_lock); |
| 297 | FORMAT(TIPC_CONS->buf, len, fmt); | 334 | FORMAT(print_string, len, fmt); |
| 298 | printk(TIPC_CONS->buf); | 335 | printk(print_string); |
| 299 | 336 | ||
| 300 | for (; pb; pb = pb->next) { | 337 | for (; pb; pb = pb->next) { |
| 301 | if (pb == TIPC_CONS) | 338 | if (pb != TIPC_CONS) { |
| 302 | continue; | 339 | printk("\n---- Start of %s log dump ----\n\n", |
| 303 | printk("\n---- Start of dump,%s log ----\n\n", | 340 | (pb == TIPC_LOG) ? "global" : "local"); |
| 304 | (pb == TIPC_LOG) ? "global" : "local"); | 341 | printbuf_dump(pb); |
| 305 | printbuf_dump(pb); | 342 | tipc_printbuf_reset(pb); |
| 306 | tipc_printbuf_reset(pb); | 343 | printk("\n---- End of dump ----\n"); |
| 307 | printk("\n-------- End of dump --------\n"); | 344 | } |
| 345 | pb_next = pb->next; | ||
| 346 | pb->next = NULL; | ||
| 347 | pb = pb_next; | ||
| 308 | } | 348 | } |
| 309 | spin_unlock_bh(&print_lock); | 349 | spin_unlock_bh(&print_lock); |
| 310 | } | 350 | } |
| @@ -324,7 +364,8 @@ void tipc_log_stop(void) | |||
| 324 | } | 364 | } |
| 325 | 365 | ||
| 326 | /** | 366 | /** |
| 327 | * tipc_log_reinit - set TIPC log print buffer to specified size | 367 | * tipc_log_reinit - (re)initialize TIPC log print buffer |
| 368 | * @log_size: print buffer size to use | ||
| 328 | */ | 369 | */ |
| 329 | 370 | ||
| 330 | void tipc_log_reinit(int log_size) | 371 | void tipc_log_reinit(int log_size) |
| @@ -332,10 +373,11 @@ void tipc_log_reinit(int log_size) | |||
| 332 | tipc_log_stop(); | 373 | tipc_log_stop(); |
| 333 | 374 | ||
| 334 | if (log_size) { | 375 | if (log_size) { |
| 335 | if (log_size <= MAX_STRING) | 376 | if (log_size < TIPC_PB_MIN_SIZE) |
| 336 | log_size = MAX_STRING + 1; | 377 | log_size = TIPC_PB_MIN_SIZE; |
| 337 | spin_lock_bh(&print_lock); | 378 | spin_lock_bh(&print_lock); |
| 338 | tipc_printbuf_init(TIPC_LOG, kmalloc(log_size, GFP_ATOMIC), log_size); | 379 | tipc_printbuf_init(TIPC_LOG, kmalloc(log_size, GFP_ATOMIC), |
| 380 | log_size); | ||
| 339 | spin_unlock_bh(&print_lock); | 381 | spin_unlock_bh(&print_lock); |
| 340 | } | 382 | } |
| 341 | } | 383 | } |
diff --git a/net/tipc/dbg.h b/net/tipc/dbg.h index 227f050d2a52..467c0bc78a79 100644 --- a/net/tipc/dbg.h +++ b/net/tipc/dbg.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * net/tipc/dbg.h: Include file for TIPC print buffer routines | 2 | * net/tipc/dbg.h: Include file for TIPC print buffer routines |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 1997-2006, Ericsson AB | 4 | * Copyright (c) 1997-2006, Ericsson AB |
| 5 | * Copyright (c) 2005, Wind River Systems | 5 | * Copyright (c) 2005-2006, Wind River Systems |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| 7 | * | 7 | * |
| 8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
| @@ -37,6 +37,14 @@ | |||
| 37 | #ifndef _TIPC_DBG_H | 37 | #ifndef _TIPC_DBG_H |
| 38 | #define _TIPC_DBG_H | 38 | #define _TIPC_DBG_H |
| 39 | 39 | ||
| 40 | /** | ||
| 41 | * struct print_buf - TIPC print buffer structure | ||
| 42 | * @buf: pointer to character array containing print buffer contents | ||
| 43 | * @size: size of character array | ||
| 44 | * @crs: pointer to first unused space in character array (i.e. final NUL) | ||
| 45 | * @next: used to link print buffers when printing to more than one at a time | ||
| 46 | */ | ||
| 47 | |||
| 40 | struct print_buf { | 48 | struct print_buf { |
| 41 | char *buf; | 49 | char *buf; |
| 42 | u32 size; | 50 | u32 size; |
| @@ -44,7 +52,10 @@ struct print_buf { | |||
| 44 | struct print_buf *next; | 52 | struct print_buf *next; |
| 45 | }; | 53 | }; |
| 46 | 54 | ||
| 47 | void tipc_printbuf_init(struct print_buf *pb, char *buf, u32 sz); | 55 | #define TIPC_PB_MIN_SIZE 64 /* minimum size for a print buffer's array */ |
| 56 | #define TIPC_PB_MAX_STR 512 /* max printable string (with trailing NUL) */ | ||
| 57 | |||
| 58 | void tipc_printbuf_init(struct print_buf *pb, char *buf, u32 size); | ||
| 48 | void tipc_printbuf_reset(struct print_buf *pb); | 59 | void tipc_printbuf_reset(struct print_buf *pb); |
| 49 | int tipc_printbuf_empty(struct print_buf *pb); | 60 | int tipc_printbuf_empty(struct print_buf *pb); |
| 50 | int tipc_printbuf_validate(struct print_buf *pb); | 61 | int tipc_printbuf_validate(struct print_buf *pb); |
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index ee94de92ae99..3b0cd12f37da 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c | |||
| @@ -132,6 +132,28 @@ static struct sk_buff *tipc_disc_init_msg(u32 type, | |||
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | /** | 134 | /** |
| 135 | * disc_dupl_alert - issue node address duplication alert | ||
| 136 | * @b_ptr: pointer to bearer detecting duplication | ||
| 137 | * @node_addr: duplicated node address | ||
| 138 | * @media_addr: media address advertised by duplicated node | ||
| 139 | */ | ||
| 140 | |||
| 141 | static void disc_dupl_alert(struct bearer *b_ptr, u32 node_addr, | ||
| 142 | struct tipc_media_addr *media_addr) | ||
| 143 | { | ||
| 144 | char node_addr_str[16]; | ||
| 145 | char media_addr_str[64]; | ||
| 146 | struct print_buf pb; | ||
| 147 | |||
| 148 | addr_string_fill(node_addr_str, node_addr); | ||
| 149 | tipc_printbuf_init(&pb, media_addr_str, sizeof(media_addr_str)); | ||
| 150 | tipc_media_addr_printf(&pb, media_addr); | ||
| 151 | tipc_printbuf_validate(&pb); | ||
| 152 | warn("Duplicate %s using %s seen on <%s>\n", | ||
| 153 | node_addr_str, media_addr_str, b_ptr->publ.name); | ||
| 154 | } | ||
| 155 | |||
| 156 | /** | ||
| 135 | * tipc_disc_recv_msg - handle incoming link setup message (request or response) | 157 | * tipc_disc_recv_msg - handle incoming link setup message (request or response) |
| 136 | * @buf: buffer containing message | 158 | * @buf: buffer containing message |
| 137 | */ | 159 | */ |
| @@ -157,8 +179,11 @@ void tipc_disc_recv_msg(struct sk_buff *buf) | |||
| 157 | return; | 179 | return; |
| 158 | if (!tipc_addr_node_valid(orig)) | 180 | if (!tipc_addr_node_valid(orig)) |
| 159 | return; | 181 | return; |
| 160 | if (orig == tipc_own_addr) | 182 | if (orig == tipc_own_addr) { |
| 183 | if (memcmp(&media_addr, &b_ptr->publ.addr, sizeof(media_addr))) | ||
| 184 | disc_dupl_alert(b_ptr, tipc_own_addr, &media_addr); | ||
| 161 | return; | 185 | return; |
| 186 | } | ||
| 162 | if (!in_scope(dest, tipc_own_addr)) | 187 | if (!in_scope(dest, tipc_own_addr)) |
| 163 | return; | 188 | return; |
| 164 | if (is_slave(tipc_own_addr) && is_slave(orig)) | 189 | if (is_slave(tipc_own_addr) && is_slave(orig)) |
| @@ -170,7 +195,8 @@ void tipc_disc_recv_msg(struct sk_buff *buf) | |||
| 170 | struct sk_buff *rbuf; | 195 | struct sk_buff *rbuf; |
| 171 | struct tipc_media_addr *addr; | 196 | struct tipc_media_addr *addr; |
| 172 | struct node *n_ptr = tipc_node_find(orig); | 197 | struct node *n_ptr = tipc_node_find(orig); |
| 173 | int link_up; | 198 | int link_fully_up; |
| 199 | |||
| 174 | dbg(" in own cluster\n"); | 200 | dbg(" in own cluster\n"); |
| 175 | if (n_ptr == NULL) { | 201 | if (n_ptr == NULL) { |
| 176 | n_ptr = tipc_node_create(orig); | 202 | n_ptr = tipc_node_create(orig); |
| @@ -190,14 +216,19 @@ void tipc_disc_recv_msg(struct sk_buff *buf) | |||
| 190 | } | 216 | } |
| 191 | addr = &link->media_addr; | 217 | addr = &link->media_addr; |
| 192 | if (memcmp(addr, &media_addr, sizeof(*addr))) { | 218 | if (memcmp(addr, &media_addr, sizeof(*addr))) { |
| 219 | if (tipc_link_is_up(link) || (!link->started)) { | ||
| 220 | disc_dupl_alert(b_ptr, orig, &media_addr); | ||
| 221 | spin_unlock_bh(&n_ptr->lock); | ||
| 222 | return; | ||
| 223 | } | ||
| 193 | warn("Resetting link <%s>, peer interface address changed\n", | 224 | warn("Resetting link <%s>, peer interface address changed\n", |
| 194 | link->name); | 225 | link->name); |
| 195 | memcpy(addr, &media_addr, sizeof(*addr)); | 226 | memcpy(addr, &media_addr, sizeof(*addr)); |
| 196 | tipc_link_reset(link); | 227 | tipc_link_reset(link); |
| 197 | } | 228 | } |
| 198 | link_up = tipc_link_is_up(link); | 229 | link_fully_up = (link->state == WORKING_WORKING); |
| 199 | spin_unlock_bh(&n_ptr->lock); | 230 | spin_unlock_bh(&n_ptr->lock); |
| 200 | if ((type == DSC_RESP_MSG) || link_up) | 231 | if ((type == DSC_RESP_MSG) || link_fully_up) |
| 201 | return; | 232 | return; |
| 202 | rbuf = tipc_disc_init_msg(DSC_RESP_MSG, 1, orig, b_ptr); | 233 | rbuf = tipc_disc_init_msg(DSC_RESP_MSG, 1, orig, b_ptr); |
| 203 | if (rbuf != NULL) { | 234 | if (rbuf != NULL) { |
diff --git a/net/tipc/link.c b/net/tipc/link.c index 53bc8cb5adbc..1bb983c8130b 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
| @@ -132,7 +132,7 @@ static void link_print(struct link *l_ptr, struct print_buf *buf, | |||
| 132 | * allow the output from multiple links to be intermixed. For this reason | 132 | * allow the output from multiple links to be intermixed. For this reason |
| 133 | * routines of the form "dbg_link_XXX()" have been created that will capture | 133 | * routines of the form "dbg_link_XXX()" have been created that will capture |
| 134 | * debug info into a link's personal print buffer, which can then be dumped | 134 | * debug info into a link's personal print buffer, which can then be dumped |
| 135 | * into the TIPC system log (LOG) upon request. | 135 | * into the TIPC system log (TIPC_LOG) upon request. |
| 136 | * | 136 | * |
| 137 | * To enable per-link debugging, use LINK_LOG_BUF_SIZE to specify the size | 137 | * To enable per-link debugging, use LINK_LOG_BUF_SIZE to specify the size |
| 138 | * of the print buffer used by each link. If LINK_LOG_BUF_SIZE is set to 0, | 138 | * of the print buffer used by each link. If LINK_LOG_BUF_SIZE is set to 0, |
| @@ -141,7 +141,7 @@ static void link_print(struct link *l_ptr, struct print_buf *buf, | |||
| 141 | * when there is only a single link in the system being debugged. | 141 | * when there is only a single link in the system being debugged. |
| 142 | * | 142 | * |
| 143 | * Notes: | 143 | * Notes: |
| 144 | * - When enabled, LINK_LOG_BUF_SIZE should be set to at least 1000 (bytes) | 144 | * - When enabled, LINK_LOG_BUF_SIZE should be set to at least TIPC_PB_MIN_SIZE |
| 145 | * - "l_ptr" must be valid when using dbg_link_XXX() macros | 145 | * - "l_ptr" must be valid when using dbg_link_XXX() macros |
| 146 | */ | 146 | */ |
| 147 | 147 | ||
| @@ -159,13 +159,13 @@ static void link_print(struct link *l_ptr, struct print_buf *buf, | |||
| 159 | 159 | ||
| 160 | static void dbg_print_link(struct link *l_ptr, const char *str) | 160 | static void dbg_print_link(struct link *l_ptr, const char *str) |
| 161 | { | 161 | { |
| 162 | if (DBG_OUTPUT) | 162 | if (DBG_OUTPUT != TIPC_NULL) |
| 163 | link_print(l_ptr, DBG_OUTPUT, str); | 163 | link_print(l_ptr, DBG_OUTPUT, str); |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | static void dbg_print_buf_chain(struct sk_buff *root_buf) | 166 | static void dbg_print_buf_chain(struct sk_buff *root_buf) |
| 167 | { | 167 | { |
| 168 | if (DBG_OUTPUT) { | 168 | if (DBG_OUTPUT != TIPC_NULL) { |
| 169 | struct sk_buff *buf = root_buf; | 169 | struct sk_buff *buf = root_buf; |
| 170 | 170 | ||
| 171 | while (buf) { | 171 | while (buf) { |
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index f0b063bcc2a9..03bd659c43ca 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c | |||
| @@ -122,7 +122,7 @@ void tipc_named_publish(struct publication *publ) | |||
| 122 | struct sk_buff *buf; | 122 | struct sk_buff *buf; |
| 123 | struct distr_item *item; | 123 | struct distr_item *item; |
| 124 | 124 | ||
| 125 | list_add(&publ->local_list, &publ_root); | 125 | list_add_tail(&publ->local_list, &publ_root); |
| 126 | publ_cnt++; | 126 | publ_cnt++; |
| 127 | 127 | ||
| 128 | buf = named_prepare_buf(PUBLICATION, ITEM_SIZE, 0); | 128 | buf = named_prepare_buf(PUBLICATION, ITEM_SIZE, 0); |
diff --git a/net/tipc/node.c b/net/tipc/node.c index fc6d09630ccd..886bda5e88db 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
| @@ -648,7 +648,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space) | |||
| 648 | return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE | 648 | return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE |
| 649 | " (network address)"); | 649 | " (network address)"); |
| 650 | 650 | ||
| 651 | if (!tipc_nodes) | 651 | if (tipc_mode != TIPC_NET_MODE) |
| 652 | return tipc_cfg_reply_none(); | 652 | return tipc_cfg_reply_none(); |
| 653 | 653 | ||
| 654 | /* Get space for all unicast links + multicast link */ | 654 | /* Get space for all unicast links + multicast link */ |
diff --git a/net/tipc/port.c b/net/tipc/port.c index b9c8c6b9e94f..c1a1a76759b5 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c | |||
| @@ -505,8 +505,13 @@ static void port_timeout(unsigned long ref) | |||
| 505 | struct port *p_ptr = tipc_port_lock(ref); | 505 | struct port *p_ptr = tipc_port_lock(ref); |
| 506 | struct sk_buff *buf = NULL; | 506 | struct sk_buff *buf = NULL; |
| 507 | 507 | ||
| 508 | if (!p_ptr || !p_ptr->publ.connected) | 508 | if (!p_ptr) |
| 509 | return; | ||
| 510 | |||
| 511 | if (!p_ptr->publ.connected) { | ||
| 512 | tipc_port_unlock(p_ptr); | ||
| 509 | return; | 513 | return; |
| 514 | } | ||
| 510 | 515 | ||
| 511 | /* Last probe answered ? */ | 516 | /* Last probe answered ? */ |
| 512 | if (p_ptr->probing_state == PROBING) { | 517 | if (p_ptr->probing_state == PROBING) { |
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index acfb852e7c98..2a6a5a6b4c12 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * net/tipc/socket.c: TIPC socket API | 2 | * net/tipc/socket.c: TIPC socket API |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2001-2006, Ericsson AB | 4 | * Copyright (c) 2001-2006, Ericsson AB |
| 5 | * Copyright (c) 2004-2005, Wind River Systems | 5 | * Copyright (c) 2004-2006, Wind River Systems |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| 7 | * | 7 | * |
| 8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
| @@ -629,6 +629,9 @@ static int send_stream(struct kiocb *iocb, struct socket *sock, | |||
| 629 | return -ENOTCONN; | 629 | return -ENOTCONN; |
| 630 | } | 630 | } |
| 631 | 631 | ||
| 632 | if (unlikely(m->msg_name)) | ||
| 633 | return -EISCONN; | ||
| 634 | |||
| 632 | /* | 635 | /* |
| 633 | * Send each iovec entry using one or more messages | 636 | * Send each iovec entry using one or more messages |
| 634 | * | 637 | * |
| @@ -641,6 +644,8 @@ static int send_stream(struct kiocb *iocb, struct socket *sock, | |||
| 641 | curr_iovlen = m->msg_iovlen; | 644 | curr_iovlen = m->msg_iovlen; |
| 642 | my_msg.msg_iov = &my_iov; | 645 | my_msg.msg_iov = &my_iov; |
| 643 | my_msg.msg_iovlen = 1; | 646 | my_msg.msg_iovlen = 1; |
| 647 | my_msg.msg_flags = m->msg_flags; | ||
| 648 | my_msg.msg_name = NULL; | ||
| 644 | bytes_sent = 0; | 649 | bytes_sent = 0; |
| 645 | 650 | ||
| 646 | while (curr_iovlen--) { | 651 | while (curr_iovlen--) { |
| @@ -1203,7 +1208,8 @@ static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf) | |||
| 1203 | atomic_inc(&tipc_queue_size); | 1208 | atomic_inc(&tipc_queue_size); |
| 1204 | skb_queue_tail(&sock->sk->sk_receive_queue, buf); | 1209 | skb_queue_tail(&sock->sk->sk_receive_queue, buf); |
| 1205 | 1210 | ||
| 1206 | wake_up_interruptible(sock->sk->sk_sleep); | 1211 | if (waitqueue_active(sock->sk->sk_sleep)) |
| 1212 | wake_up_interruptible(sock->sk->sk_sleep); | ||
| 1207 | return TIPC_OK; | 1213 | return TIPC_OK; |
| 1208 | } | 1214 | } |
| 1209 | 1215 | ||
| @@ -1218,7 +1224,8 @@ static void wakeupdispatch(struct tipc_port *tport) | |||
| 1218 | { | 1224 | { |
| 1219 | struct tipc_sock *tsock = (struct tipc_sock *)tport->usr_handle; | 1225 | struct tipc_sock *tsock = (struct tipc_sock *)tport->usr_handle; |
| 1220 | 1226 | ||
| 1221 | wake_up_interruptible(tsock->sk.sk_sleep); | 1227 | if (waitqueue_active(tsock->sk.sk_sleep)) |
| 1228 | wake_up_interruptible(tsock->sk.sk_sleep); | ||
| 1222 | } | 1229 | } |
| 1223 | 1230 | ||
| 1224 | /** | 1231 | /** |
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c index c51600ba5f4a..7a918f12a5df 100644 --- a/net/tipc/subscr.c +++ b/net/tipc/subscr.c | |||
| @@ -155,7 +155,7 @@ void tipc_subscr_report_overlap(struct subscription *sub, | |||
| 155 | sub->seq.upper, found_lower, found_upper); | 155 | sub->seq.upper, found_lower, found_upper); |
| 156 | if (!tipc_subscr_overlap(sub, found_lower, found_upper)) | 156 | if (!tipc_subscr_overlap(sub, found_lower, found_upper)) |
| 157 | return; | 157 | return; |
| 158 | if (!must && (sub->filter != TIPC_SUB_PORTS)) | 158 | if (!must && !(sub->filter & TIPC_SUB_PORTS)) |
| 159 | return; | 159 | return; |
| 160 | subscr_send_event(sub, found_lower, found_upper, event, port_ref, node); | 160 | subscr_send_event(sub, found_lower, found_upper, event, port_ref, node); |
| 161 | } | 161 | } |
| @@ -176,6 +176,13 @@ static void subscr_timeout(struct subscription *sub) | |||
| 176 | if (subscriber == NULL) | 176 | if (subscriber == NULL) |
| 177 | return; | 177 | return; |
| 178 | 178 | ||
| 179 | /* Validate timeout (in case subscription is being cancelled) */ | ||
| 180 | |||
| 181 | if (sub->timeout == TIPC_WAIT_FOREVER) { | ||
| 182 | tipc_ref_unlock(subscriber_ref); | ||
| 183 | return; | ||
| 184 | } | ||
| 185 | |||
| 179 | /* Unlink subscription from name table */ | 186 | /* Unlink subscription from name table */ |
| 180 | 187 | ||
| 181 | tipc_nametbl_unsubscribe(sub); | 188 | tipc_nametbl_unsubscribe(sub); |
| @@ -199,6 +206,20 @@ static void subscr_timeout(struct subscription *sub) | |||
| 199 | } | 206 | } |
| 200 | 207 | ||
| 201 | /** | 208 | /** |
| 209 | * subscr_del - delete a subscription within a subscription list | ||
| 210 | * | ||
| 211 | * Called with subscriber locked. | ||
| 212 | */ | ||
| 213 | |||
| 214 | static void subscr_del(struct subscription *sub) | ||
| 215 | { | ||
| 216 | tipc_nametbl_unsubscribe(sub); | ||
| 217 | list_del(&sub->subscription_list); | ||
| 218 | kfree(sub); | ||
| 219 | atomic_dec(&topsrv.subscription_count); | ||
| 220 | } | ||
| 221 | |||
| 222 | /** | ||
| 202 | * subscr_terminate - terminate communication with a subscriber | 223 | * subscr_terminate - terminate communication with a subscriber |
| 203 | * | 224 | * |
| 204 | * Called with subscriber locked. Routine must temporarily release this lock | 225 | * Called with subscriber locked. Routine must temporarily release this lock |
| @@ -227,12 +248,9 @@ static void subscr_terminate(struct subscriber *subscriber) | |||
| 227 | k_cancel_timer(&sub->timer); | 248 | k_cancel_timer(&sub->timer); |
| 228 | k_term_timer(&sub->timer); | 249 | k_term_timer(&sub->timer); |
| 229 | } | 250 | } |
| 230 | tipc_nametbl_unsubscribe(sub); | 251 | dbg("Term: Removing sub %u,%u,%u from subscriber %x list\n", |
| 231 | list_del(&sub->subscription_list); | ||
| 232 | dbg("Term: Removed sub %u,%u,%u from subscriber %x list\n", | ||
| 233 | sub->seq.type, sub->seq.lower, sub->seq.upper, subscriber); | 252 | sub->seq.type, sub->seq.lower, sub->seq.upper, subscriber); |
| 234 | kfree(sub); | 253 | subscr_del(sub); |
| 235 | atomic_dec(&topsrv.subscription_count); | ||
| 236 | } | 254 | } |
| 237 | 255 | ||
| 238 | /* Sever connection to subscriber */ | 256 | /* Sever connection to subscriber */ |
| @@ -253,6 +271,49 @@ static void subscr_terminate(struct subscriber *subscriber) | |||
| 253 | } | 271 | } |
| 254 | 272 | ||
| 255 | /** | 273 | /** |
| 274 | * subscr_cancel - handle subscription cancellation request | ||
| 275 | * | ||
| 276 | * Called with subscriber locked. Routine must temporarily release this lock | ||
| 277 | * to enable the subscription timeout routine to finish without deadlocking; | ||
| 278 | * the lock is then reclaimed to allow caller to release it upon return. | ||
| 279 | * | ||
| 280 | * Note that fields of 's' use subscriber's endianness! | ||
| 281 | */ | ||
| 282 | |||
| 283 | static void subscr_cancel(struct tipc_subscr *s, | ||
| 284 | struct subscriber *subscriber) | ||
| 285 | { | ||
| 286 | struct subscription *sub; | ||
| 287 | struct subscription *sub_temp; | ||
| 288 | int found = 0; | ||
| 289 | |||
| 290 | /* Find first matching subscription, exit if not found */ | ||
| 291 | |||
| 292 | list_for_each_entry_safe(sub, sub_temp, &subscriber->subscription_list, | ||
| 293 | subscription_list) { | ||
| 294 | if (!memcmp(s, &sub->evt.s, sizeof(struct tipc_subscr))) { | ||
| 295 | found = 1; | ||
| 296 | break; | ||
| 297 | } | ||
| 298 | } | ||
| 299 | if (!found) | ||
| 300 | return; | ||
| 301 | |||
| 302 | /* Cancel subscription timer (if used), then delete subscription */ | ||
| 303 | |||
| 304 | if (sub->timeout != TIPC_WAIT_FOREVER) { | ||
| 305 | sub->timeout = TIPC_WAIT_FOREVER; | ||
| 306 | spin_unlock_bh(subscriber->lock); | ||
| 307 | k_cancel_timer(&sub->timer); | ||
| 308 | k_term_timer(&sub->timer); | ||
| 309 | spin_lock_bh(subscriber->lock); | ||
| 310 | } | ||
| 311 | dbg("Cancel: removing sub %u,%u,%u from subscriber %x list\n", | ||
| 312 | sub->seq.type, sub->seq.lower, sub->seq.upper, subscriber); | ||
| 313 | subscr_del(sub); | ||
| 314 | } | ||
| 315 | |||
| 316 | /** | ||
| 256 | * subscr_subscribe - create subscription for subscriber | 317 | * subscr_subscribe - create subscription for subscriber |
| 257 | * | 318 | * |
| 258 | * Called with subscriber locked | 319 | * Called with subscriber locked |
| @@ -263,6 +324,21 @@ static void subscr_subscribe(struct tipc_subscr *s, | |||
| 263 | { | 324 | { |
| 264 | struct subscription *sub; | 325 | struct subscription *sub; |
| 265 | 326 | ||
| 327 | /* Determine/update subscriber's endianness */ | ||
| 328 | |||
| 329 | if (s->filter & (TIPC_SUB_PORTS | TIPC_SUB_SERVICE)) | ||
| 330 | subscriber->swap = 0; | ||
| 331 | else | ||
| 332 | subscriber->swap = 1; | ||
| 333 | |||
| 334 | /* Detect & process a subscription cancellation request */ | ||
| 335 | |||
| 336 | if (s->filter & htohl(TIPC_SUB_CANCEL, subscriber->swap)) { | ||
| 337 | s->filter &= ~htohl(TIPC_SUB_CANCEL, subscriber->swap); | ||
| 338 | subscr_cancel(s, subscriber); | ||
| 339 | return; | ||
| 340 | } | ||
| 341 | |||
| 266 | /* Refuse subscription if global limit exceeded */ | 342 | /* Refuse subscription if global limit exceeded */ |
| 267 | 343 | ||
| 268 | if (atomic_read(&topsrv.subscription_count) >= tipc_max_subscriptions) { | 344 | if (atomic_read(&topsrv.subscription_count) >= tipc_max_subscriptions) { |
| @@ -281,13 +357,6 @@ static void subscr_subscribe(struct tipc_subscr *s, | |||
| 281 | return; | 357 | return; |
| 282 | } | 358 | } |
| 283 | 359 | ||
| 284 | /* Determine/update subscriber's endianness */ | ||
| 285 | |||
| 286 | if ((s->filter == TIPC_SUB_PORTS) || (s->filter == TIPC_SUB_SERVICE)) | ||
| 287 | subscriber->swap = 0; | ||
| 288 | else | ||
| 289 | subscriber->swap = 1; | ||
| 290 | |||
| 291 | /* Initialize subscription object */ | 360 | /* Initialize subscription object */ |
| 292 | 361 | ||
| 293 | memset(sub, 0, sizeof(*sub)); | 362 | memset(sub, 0, sizeof(*sub)); |
| @@ -296,8 +365,8 @@ static void subscr_subscribe(struct tipc_subscr *s, | |||
| 296 | sub->seq.upper = htohl(s->seq.upper, subscriber->swap); | 365 | sub->seq.upper = htohl(s->seq.upper, subscriber->swap); |
| 297 | sub->timeout = htohl(s->timeout, subscriber->swap); | 366 | sub->timeout = htohl(s->timeout, subscriber->swap); |
| 298 | sub->filter = htohl(s->filter, subscriber->swap); | 367 | sub->filter = htohl(s->filter, subscriber->swap); |
| 299 | if ((((sub->filter != TIPC_SUB_PORTS) | 368 | if ((!(sub->filter & TIPC_SUB_PORTS) |
| 300 | && (sub->filter != TIPC_SUB_SERVICE))) | 369 | == !(sub->filter & TIPC_SUB_SERVICE)) |
| 301 | || (sub->seq.lower > sub->seq.upper)) { | 370 | || (sub->seq.lower > sub->seq.upper)) { |
| 302 | warn("Subscription rejected, illegal request\n"); | 371 | warn("Subscription rejected, illegal request\n"); |
| 303 | kfree(sub); | 372 | kfree(sub); |