aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-11-03Merge branch 'fix/asoc' into for-linusTakashi Iwai7-18/+34
2011-11-03Merge branch 'next' of git://github.com/kernelslacker/cpufreqLinus Torvalds3-32/+268
* 'next' of git://github.com/kernelslacker/cpufreq: [CPUFREQ] db8500: support all frequencies [CPUFREQ] db8500: remove unneeded for loop iteration over freq_table [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders [CPUFREQ] ARM: ux500: send cpufreq notification for all cpus [CPUFREQ] e_powersaver: Allow user to lower maximum voltage [CPUFREQ] e_powersaver: Check BIOS limit for CPU frequency [CPUFREQ] e_powersaver: Additional checks [CPUFREQ] exynos4210: Show list of available frequencies
2011-11-03Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6Linus Torvalds74-2730/+6038
* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits) mfd: Fix missing abx500 header file updates mfd: Add missing <linux/io.h> include to intel_msic x86, mrst: add platform support for MSIC MFD driver mfd: Expose TurnOnStatus in ab8500 sysfs mfd: Remove support for early drop ab8500 chip mfd: Add support for ab8500 v3.3 mfd: Add ab8500 interrupt disable hook mfd: Convert db8500-prcmu panic() into pr_crit() mfd: Refactor db8500-prcmu request_clock() function mfd: Rename db8500-prcmu init function mfd: Fix db5500-prcmu defines mfd: db8500-prcmu voltage domain consumers additions mfd: db8500-prcmu reset code retrieval mfd: db8500-prcmu tweak for modem wakeup mfd: Add db8500-pcmu watchdog accessor functions for watchdog mfd: hwacc power state db8500-prcmu accessor mfd: Add db8500-prcmu accessors for PLL and SGA clock mfd: Move to the new db500 PRCMU API mfd: Create a common interface for dbx500 PRCMU drivers mfd: Initialize DB8500 PRCMU regs ... Fix up trivial conflicts in arch/arm/mach-imx/mach-mx31moboard.c arch/arm/mach-omap2/board-omap3beagle.c arch/arm/mach-u300/include/mach/irqs.h drivers/mfd/wm831x-spi.c
2011-11-03ceph: clear parent D_COMPLETE flag when on dentry pruneSage Weil2-0/+41
When the VFS prunes a dentry from the cache, clear the D_COMPLETE flag on the parent dentry. Do this for the live and snapshotted namespaces. Do not bother for the .snap dir contents, since we do not cache that. Signed-off-by: Sage Weil <[email protected]>
2011-11-03ALSA: hda/realtek - Skip invalid digital out pinsTakashi Iwai1-5/+7
Some BIOS report invalid pins as digital output pins. The driver checks the connection but it doesn't do it fully correctly, and it leaves some undefined value as the audio-out widget, which makes the driver spewing warnings. This patch fixes the issue. Reference: https://bugzilla.novell.com/show_bug.cgi?id=727348 Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-03Merge branch 'sh-latest' of git://github.com/pmundt/linux-shLinus Torvalds29-42/+117
* 'sh-latest' of git://github.com/pmundt/linux-sh: sh: Add default uImage rule for sh7757lcr sh: modify the asm/sh_eth.h to linux/sh_eth.h in sh7757lcr sh: userimask.c needs linux/stat.h sh: pfc: Add GPIO IRQ support sh: modify the asm/sh_eth.h to linux/sh_eth.h in some boards sh: pfc: Remove unused gpio_in_use member sh: add parameters for EHCI and RIIC in clock-sh7757.c sh: kexec: Add PHYSICAL_START SH: irq: Remove IRQF_DISABLED sh: pfc: get_config_reg() shift clean up sh: intc: Add IRQ trigger bit field check sh: drop unused Kconfig symbol sh: Fix implicit declaration of function numa_node_id sh: kexec: Register crashk_res sh: ecovec: add renesas_usbhs DMAEngine support
2011-11-03Merge branch 'for-linus' of ↵Linus Torvalds11-226/+516
git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock: hwspinlock: add MAINTAINERS entries hwspinlock/omap: omap_hwspinlock_remove should be __devexit hwspinlock/u8500: add hwspinlock driver hwspinlock/core: register a bank of hwspinlocks in a single API call hwspinlock/core: remove stubs for register/unregister hwspinlock/core: use a mutex to protect the radix tree hwspinlock/core/omap: fix id issues on multiple hwspinlock devices hwspinlock/omap: simplify allocation scheme hwspinlock/core: simplify 'owner' handling hwspinlock/core: simplify Kconfig Fix up trivial conflicts (addition of omap_hwspinlock_pdata, removal of omap_spinlock_latency) in arch/arm/mach-omap2/hwspinlock.c Also, do an "evil merge" to fix a compile error in omap_hsmmc.c which for some reason was reported in the same email thread as the "please pull hwspinlock changes".
2011-11-03Merge branch 'for-linus' of ↵Linus Torvalds5-52/+33
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: Revert "HID: multitouch: decide if hid-multitouch needs to handle mt devices" HID: drivers/hid/hid-roccat.c: eliminate a null pointer dereference HID: hid-apple: add device ID of another wireless aluminium HID: Add device IDs for Macbook Pro 8 keyboards
2011-11-03Revert "perf: Add PM notifiers to fix CPU hotplug races"Linus Torvalds1-95/+2
This reverts commit 144060fee07e9c22e179d00819c83c86fbcbf82c. It causes a resume regression for Andi on his Acer Aspire 1830T post 3.1. The screen just stays black after wakeup. Also, it really looks like the wrong way to suspend and resume perf events: I think they should be done as part of the CPU suspend and resume, rather than as a notifier that does smp_call_function(). Reported-by: Andi Kleen <[email protected]> Acked-by: Ingo Molnar <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-11-03perf top: Fix live annotation in the --stdio interfaceArnaldo Carvalho de Melo1-1/+2
In the old --stdio interface the annotation is done just after one selects a symbol, while in --tui, now the default when the required libs are installed, we annotate all symbols with samples so that when annotation is asked we see what happened recently on that symbol. To achieve that the --stdio variant checks if the hist_entry being processed is the one selected by the user via the 's' hotkey. What happens now that we share the hist_entry abstractions with 'perf report' is that for minimizing locking contention multiple rb_trees are used, one for collecting the samples and other to browse/show them after resorting it by number of samples and decay them, which is done periodically. So the simple test in record_precise_ip doesn't work as we move hist_entries between those rb_trees. To fix it just check that the underlying struct symbol associated with those hist_entries is the same. Reported-by: Mike Galbraith <[email protected]> Tested-by: Mike Galbraith <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2011-11-03staging: Move media drivers to staging/mediaMauro Carvalho Chehab83-22/+48
In practice, it is being hard to distinguish when a patch should go to staging tree or to the media tree. Better to distinguish it, by putting the media drivers at a separate staging directory. Newer staging drivers that include anything with "dvb*.h", "v4l2*.h" or "videodev2.h" should go to the drivers/staging/media tree. Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] move cx25821 out of stagingMauro Carvalho Chehab29-9/+3
This driver had the major issues already fixed. Move it out of staging. Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Remove conditional compilation based on kernel versionSylwester Nawrocki3-82/+1
Remove #if's related to kernel version and the code not applicable to 3.2+ kernels. Cc: Devin Heitmueller <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Unconditionally compile code dependent on DVB_CORESylwester Nawrocki4-23/+1
The driver depends on DVB_CORE so there is no need for conditional compilation of parts of the code depending on CONFIG_DVB_CORE as the driver is never compiled with CONFIG_DVB_CORE* disabled. Cc: Devin Heitmueller <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Add nBox Tuner Dongle supportPiotr Chmura2-0/+7
Add support for nBox Tuner Dongle based on the same chip. Cc: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Enable compilationPiotr Chmura3-2/+5
Fix compilation errors in the USB driver by replacing usb_buffer_free(), usb_buffer_alloc() with usb_free_coherent() and usb_alloc_coherent(). Add entries for the driver in parent Makefile and Kconfig. [[email protected]: minor edit to changelog] Cc: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Convert the comments to kernel-doc styleSylwester Nawrocki4-117/+106
Also amend some mismatched comments. Cc: Devin Heitmueller <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Remove non-linux headers inclusionPiotr Chmura4-67/+4
Remove inclusion of Windows and other not linux related headers. [[email protected]: edited changelog, folded long line in Makefile] Cc: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix licensing oversightPierrick Hascoet2-36/+36
Fix a couple of files which were supposed by be relicensed as GPL but were overlooked. Signed-off-by: Pierrick Hascoet <[email protected]> Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Properly handle multiple product namesDevin Heitmueller5-4/+35
Properly handle the case where the driver can be associated with multiple different products (as opposed to always saying the device is named after the value in a #define). Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Add Elgato EyeTV DTT DeluxeDevin Heitmueller2-0/+6
Add support for the Elgato EyeTV DTT Deluxe. Note that the product name field has not yet been abstracted out, so it will still identify itself as a PCTV 74e. The driver was originally built by the chipset manufacturer so that the product vendor can specify the device name via a #define, but wasn't setup to support multiple products from the same build of the driver. Thanks to Joerg Unglaub for suggesting this change. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as10x_cmd_cfg.cDevin Heitmueller1-132/+130
Fix Linux kernel coding style (whitespace and indentation) errors in file as10x_cmd_cfg.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as102_usb_drv.cDevin Heitmueller2-49/+72
Fix Linux kernel coding style (whitespace and indentation) errors in file as102_usb_drv.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as102_fe.cDevin Heitmueller1-224/+252
Fix Linux kernel coding style (whitespace and indentation) errors in file as102_fe.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as10x_cmd_stream.cDevin Heitmueller1-144/+136
Fix Linux kernel coding style (whitespace and indentation) errors in file as10x_cmd_stream.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as10x_cmd.cDevin Heitmueller1-285/+288
Fix Linux kernel coding style (whitespace and indentation) errors in file as10x_cmd.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as102_fw.cDevin Heitmueller1-43/+58
Fix Linux kernel coding style (whitespace and indentation) errors in file as102_fw.c. No functional changes. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Fix CodingStyle errors in file as102_drv.cDevin Heitmueller1-48/+52
Fix Linux kernel coding style (whitespace and indentation) errors in file as102_drv.c. Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] staging: as102: Initial import from AbilisPierrick Hascoet15-0/+3694
Changes by Devin Heitmueller: Import the original Abilis Systems as102 driver. The source is unmodified, with the only changes I've made so far were that I created a Kconfig and Makefile so that the code builds in a standard v4l-dvb tree. This driver requires firmware (which Abilis has provided with redistribution terms which will allow it to be bundled in the Linux distributions). The firmware can be downloaded from here: Thanks to Rainer Miethling from PCTV Systems for working to get the driver released (for use with the PCTV 74e) and Pierrick Hascoet from Abilis for authoring the driver. Changes by Piotr Chmura: - moved the driver from media/dvb to staging/media - removed Makefile/Kconfig - compilation fails in current tree [[email protected]: edited changelog] Signed-off-by: Pierrick Hascoet <[email protected]> Signed-off-by: Devin Heitmueller <[email protected]> Signed-off-by: Piotr Chmura <[email protected]> Signed-off-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] mxl111sf: update demod_ops.info.name to "MaxLinear MxL111SF DVB-T ↵Michael Krufky1-5/+5
demodulator" Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] mxl111sf: disable snr / ber calculations for DVB-TMichael Krufky1-0/+10
Leaving this code enabled breaks the build on some architectures, and we shouldn't have any floating point math in the kernel, anyway. These macros need to be re-written, but it's harmless to simply return zero for now. Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] mxl111sf: add DVB-T supportMichael Krufky1-3/+225
Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] DVB: add MaxLinear MxL111SF DVB-T demodulator driverMichael Krufky4-1/+661
Signed-off-by: Michael Krufky <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] cx18: Fix FM radioAndy Walls1-0/+2
The cx18 driver was not setting up the analog tuner driver to enable FM radio. This change fixes that. Thanks go to Ian Armstrong for reporting and fixing the analogous problem in ivtv. Signed-off-by: Andy Walls <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03[media] ivtv: Fix radio supportIan Armstrong1-0/+2
Although the ivtv driver reports radio support through the V4L2 API, it fails to actually enable it. This patch fixes that. Signed-off-by: Ian Armstrong <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-11-03ALSA: hda/sigmatel - Automatically retrieve digital I/O widgetsCharles Chin1-13/+26
Revise stac92xx_parse_auto_config to automatically scan for digital input and output converters. Signed-off-by: Charles Chin <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-03[SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdevAnton Blanchard1-0/+1
When looking at memory consumption issues I noticed quite a lot of memory in the kmalloc-2048 bucket: OBJS ACTIVE USE OBJ SIZE SLABS OBJ/SLAB CACHE SIZE NAME 6561 6471 98% 2.30K 243 27 15552K kmalloc-2048 Over 15MB. slub debug shows that cfq is responsible for almost all of it: # sort -nr /sys/kernel/slab/kmalloc-2048/alloc_calls 6402 .cfq_init_queue+0xec/0x460 age=43423/43564/43655 pid=1 cpus=4,11,13 In scsi_alloc_sdev we do scsi_alloc_queue but if slave_alloc fails we don't free it with scsi_free_queue. The patch below fixes the issue: OBJS ACTIVE USE OBJ SIZE SLABS OBJ/SLAB CACHE SIZE NAME 135 72 53% 2.30K 5 27 320K kmalloc-2048 # cat /sys/kernel/slab/kmalloc-2048/alloc_calls 3 .cfq_init_queue+0xec/0x460 age=3811/3876/3925 pid=1 cpus=4,11,13 Signed-off-by: Anton Blanchard <[email protected]> Cc: <[email protected]> #2.6.38+ Signed-off-by: James Bottomley <[email protected]>
2011-11-03[SCSI] scsi_dh_alua: Fix the time inteval for alua rtpg commandsMoger, Babu1-1/+2
This patch corrects the retry interval for alua rtpg command. Purpose was to retry the commands in seconds. But that was not happening. Reason is msleep takes argument in milliseconds. Also added minor text after successful attach. Signed-off-by: Babu Moger <[email protected]> Acked-by: Hannes Reinecke <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2011-11-03[SCSI] scsi_transport_iscsi: Fix documentation os parameterMarcos Paulo de Souza1-1/+1
Fixes documentation of a parameter of iscsi_bsg_host_add function to silence to make htmldocs Signed-off-by: Marcos Paulo de Souza <[email protected]> Reviewed-by: Mike Christie <[email protected]> Signed-off-by: James Bottomley <[email protected]>
2011-11-02Merge branch 'osd-devel' into nfs-for-nextTrond Myklebust7798-326884/+496195
2011-11-02pnfs-obj: Support for RAID5 read-4-write interface.Boaz Harrosh1-0/+38
The ore need suplied a r4w_get_page/r4w_put_page API from Filesystem so it can get cache pages to read-into when writing parial stripes. Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-11-02pnfs-obj: move to ore 03: Remove old raid engineBoaz Harrosh1-504/+0
Finally remove all the old raid engine, which is by now dead code. Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-11-02pnfs-obj: move to ore 02: move to OREBoaz Harrosh2-75/+60
In this patch we are actually moving to the ORE. (Object Raid Engine). objio_state holds a pointer to an ore_io_state. Once we have an ore_io_state at hand we can call the ore for reading/writing. We register on the done path to kick off the nfs io_done mechanism. Again for Ease of reviewing the old code is "#if 0" but is not removed so the diff command works better. The old code will be removed in the next patch. fs/exofs/Kconfig::ORE is modified to also be auto-included if PNFS_OBJLAYOUT is set. Since we now depend on ORE. (See comments in fs/exofs/Kconfig) Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-11-02pnfs-obj: move to ore 01: ore_layout & ore_componentsBoaz Harrosh1-144/+128
For Ease of reviewing I split the move to ore into 3 parts move to ore 01: ore_layout & ore_components move to ore 02: move to ORE move to ore 03: Remove old raid engine This patch modifies the objio_lseg, layout-segment level and devices and components arrays to use the ORE types. Though it will be removed soon, also the raid engine is modified to actually compile, possibly run, with the new types. So it is the same old raid engine but with some new ORE types. For Ease of reviewing, some of the old code is "#if 0" but is not removed so the diff command works better. The old code will be removed in the 3rd patch. Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-11-02pnfs-obj: Rename objlayout_io_state => objlayout_io_resBoaz Harrosh3-47/+48
* All instances of objlayout_io_state => objlayout_io_res * All instances of state => oir; * All instances of ol_state => oir; Big but nothing to it Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-11-02pnfs-obj: Get rid of objlayout_{alloc,free}_io_stateBoaz Harrosh3-142/+112
This is part of moving objio_osd to use the ORE. objlayout_io_state had two functions: 1. It was used in the error reporting mechanism at layout_return. This function is kept intact. (Later patch will rename objlayout_io_state => objlayout_io_res) 2. Carrier of rw io members into the objio_read/write_paglist API. This is removed in this patch. The {r,w}data received from NFS are passed directly to the objio_{read,write}_paglist API. The io_engine is now allocating it's own IO state as part of the read/write. The minimal functionality that was part of the generic allocation is passed to the io_engine. So part of this patch is rename of: ios->ol_state.foo => ios->foo At objlayout_{read,write}_done an objlayout_io_state is passed that denotes the result of the IO. (Hence the later name change). If the IO is successful objlayout calls an objio_free_result() API immediately (Which for objio_osd causes the release of the io_state). If the IO ended in an error it is hanged onto until reported in layout_return and is released later through the objio_free_result() API. (All this is not new just renamed and cleaned) Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-11-02pnfs-obj: Return PNFS_NOT_ATTEMPTED in case of read/write_pagelistBoaz Harrosh3-35/+37
objlayout driver was always returning PNFS_ATTEMPTED from it's read/write_pagelist operations. Even on error. Fix that. Start by establishing an error return API from io-engine, by not returning ssize_t (length-or-error) but returning "int" 0=OK, 0>Error. And clean up all return types in io-engine. Then if io-engine returned error return PNFS_NOT_ATTEMPTED to generic layer. (With a dprint) Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-11-02pnfs-obj: Remove redundant EOF from objlayout_io_stateBoaz Harrosh2-10/+7
The EOF calculation was done on .read_pagelist(), cached in objlayout_io_state->eof, and set in objlayout_read_done() into nfs_read_data->res.eof. So set it directly into nfs_read_data->res.eof and avoid the extra member. Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-11-02nfs: Remove unused variable from write.cRakib Mullick1-2/+1
When CONFIG_NFS=y and CONFIG_NFS_V3_{,V4}=n we get the following warning. fs/nfs/write.c: In function ‘nfs_writeback_done’: fs/nfs/write.c:1246:21: warning: unused variable ‘server’ Remove the variable 'server' to fix the above warning. Signed-off-by: Rakib Mullick <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-11-02nfs: Fix unused variable warning from file.cRakib Mullick1-6/+3
Fix the following unused variable warning. fs/nfs/file.c: In function ‘nfs_file_release’: fs/nfs/file.c:140:17: warning: unused variable ‘dentry’ fs/nfs/file.c: In function ‘nfs_file_read’: fs/nfs/file.c:237:9: warning: unused variable ‘count’ Signed-off-by: Rakib Mullick <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>