summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ARM: dts: fix omap3 dss clock handle namesTomi Valkeinen2014-03-192-6/+6
| | | | | | | | | | | | | | | | | | | | The DSS fclk and iclk handles are named differently on OMAP3430 ES1 than on later OMAP revisions. The ES1 has handles 'dss1_alwon_fck_3430es1' and 'dss_ick_3430es1', whereas later revisions have similar names but ending with 'es2'. This means we don't have one clock handle to which we could refer to when defining the DSS clocks. However, as the namespaces are separate for ES1 and ES2+ OMAPs, we can just rename the handles to 'dss1_alwon_fck' and 'dss_ick' for both ES1 and ES2+, removing the issue. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Tested-by: Christoph Fritz <chf.fritz@googlemail.com> Tested-by: Marek Belisko <marek@goldelico.com> Acked-by: Tero Kristo <t-kristo@ti.com> Acked-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530Stefan Roese2014-03-121-0/+36
| | | | | | | | | | Add support for the MMC2/SDIO WiFi Libertas (Marvell) module available on the CM-T3530 SOM. Cc: Dmitry Lifshitz <lifshitz@compulab.co.il> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: am335x-evmsk: enable DMA controller for USBYegor Yefremov2014-03-121-0/+4
| | | | | | | Enable DMA controller for USB Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: OMAP5: Add IOMMU nodesSuman Anna2014-03-121-0/+15
| | | | | | | | | The IOMMU DT nodes have been added for the DSP and IPU subsystems. The MMUs in OMAP5 are identical to those in OMAP4, including the bus error back capability on IPU. Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: OMAP4: Add IOMMU nodesFlorian Vaussard2014-03-121-0/+15
| | | | | | | | | | | Add the IOMMU nodes for the DSP and IPU subsystems. The MMU within the IPU sub-system also supports a bus error back capability, not available on the DSP MMU. Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> [s-anna@ti.com: IPU bus error back addition] Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: OMAP3: Add IVA IOMMU nodeFlorian Vaussard2014-03-121-0/+8
| | | | | | | | | | | Add the DT node for the IOMMU within the DSP subsystem. The entry is disabled to keep in line with the hwmod usage as intended by the deprecated CONFIG_OMAP_IOMMU_IVA2 flag. Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> [s-anna@ti.com: split the entry and disable the node] Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: OMAP3: Update ISP IOMMU nodeFlorian Vaussard2014-03-121-3/+4
| | | | | | | | | | Update the IOMMU node for the camera subsystem as per the OMAP IOMMU bindings. Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> [s-anna@ti.com: corrected interrupt number] Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: OMAP2+: extend iommu pdata-quirks to OMAP5Suman Anna2014-03-121-0/+4
| | | | | | | | OMAP5 has the same iommus as OMAP4, so extend the OMAP4 iommu pdata quirks for OMAP5 as well. Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: OMAP5: hwmod data: add mmu data for ipu & dspSuman Anna2014-03-121-0/+83
| | | | | | | | | | | | A new MMU hwmod class and data structures are created to represent the MMUs within the IPU and DSP processor subsystems in OMAP5. The MMUs in OMAP5 are identical to those in OMAP4. Cc: Benoit Cousson <bcousson@baylibre.com> Signed-off-by: Suman Anna <s-anna@ti.com> Acked-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: OMAP2+: use pdata quirks for iommu reset linesSuman Anna2014-03-121-0/+20
| | | | | | | | | | | | | | | | The OMAP iommu driver performs the reset management for the iommu instances in processor sub-systems using the omap_device API which are currently supplied as platform data ops. Use pdata quirks to maintain the functionality as the OMAP iommu driver gets converted to use DT nodes, until the reset portions are decoupled from omap_hwmod/omap_device into a separate reset driver. This patch adds the pdata quirks for the reset management of iommus within the DSP (OMAP3 & OMAP4) and IPU subsystems (OMAP4). Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: OMAP2+: change the ISP device archdata MMU name for DTSuman Anna2014-03-121-0/+3
| | | | | | | | | | | | The IOMMU DT adaptation support uses the device name instead of an iommu object name. Fixup the ISP device archdata MMU name at runtime if using DT-boot. This allows the OMAP3 camera to be functional in both legacy and DT boots. The iommu object names should eventually vanish when all the IOMMU users have been converted to DT nodes. Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: OMAP3: fix iva mmu programming issuesSuman Anna2014-03-122-1/+5
| | | | | | | | | | | | | The IVA MMU is not functional when used through the hwmod and omap_device layers. Add fixes to clockdomain and hwmod data to have it functional. The hwmod changes are needed to enable the clock, and the SWSUP change is needed to wakeup the domain because the power domain is programmed to be in RET, and there is no automatic power domain switching to ON. Signed-off-by: Suman Anna <s-anna@ti.com> Acked-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2Florian Vaussard2014-03-122-11/+0
| | | | | | | | | | | | | | | | CONFIG_OMAP_IOMMU_IVA2 was defined originally to avoid conflicting usage by tidspbridge and other iommu users. The same can be achieved by marking the DT node disabled, so remove this obsolete flag and the corresponding hwmod data can be enabled. Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> [s-anna@ti.com: revise commit log] Signed-off-by: Suman Anna <s-anna@ti.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: am335x-evmsk: enable dual_emac modeYegor Yefremov2014-03-051-0/+3
| | | | | | | | EVM board provides two Ethernet ports, this patch sets them into dual_emac mode to provide two independent network interfaces. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: DRA7: Add device nodes for ABBNishanth Menon2014-03-051-0/+132
| | | | | | | | | Add ABB device nodes for DRA7 family of devices. Data is based on DRA7 Technical Reference Manual revision I (Sept 2013) Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: OMAP4: Add device nodes for ABBAndrii.Tseglytskyi2014-03-053-0/+89
| | | | | | | | | | | | | | | | Add ABB device nodes for OMAP443x family of devices. abb_iva is populated, but disabled as it is not used on current OMAP443x family, but the node is used on OMAP446x family. Data is based on OMAP443x Technical Reference Manual revision AN (April 2013). ABB device nodes for OMAP4460 device Data is based on OMAP4460 Technical Reference Manual revision Z (April 2013) [nm@ti.com: co-developer] Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Andrii.Tseglytskyi <andrii.tseglytskyi@ti.com> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: OMAP36xx: Add device node for ABBAndrii.Tseglytskyi2014-03-051-0/+20
| | | | | | | | | | | Add ABB device node for OMAP36xx family of devices. Data is based on OMAP36XX Technical Reference Manual revision AB (Dec 2012). [nm@ti.com: co-developer] Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Andrii.Tseglytskyi <andrii.tseglytskyi@ti.com> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: am43x-epos-evm: add SD card hotplug supportBalaji T K2014-03-052-0/+10
| | | | | | | | Add card detect gpio for SD card slot and include dt gpio header. Signed-off-by: Balaji T K <balajitk@ti.com> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: am335x-evm: add SD card hotplug supportBalaji T K2014-03-051-0/+9
| | | | | | | | Add card detect gpio for SD card slot Signed-off-by: Balaji T K <balajitk@ti.com> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: am437x gp-evm: add sd card dt nodesBalaji T K2014-03-051-0/+27
| | | | | | | | enable sd card slot on am437x-gp-evm Signed-off-by: Balaji T K <balajitk@ti.com> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: omap5: added dt properties to adapt to the new phy framworkKishon Vijay Abraham I2014-03-051-1/+4
| | | | | | | | | Added device tree bindings for dwc3, usb2 and usb3 PHYs. The documentation of these can be found at Documentation/devicetree/bindings/phy/phy-bindings.txt and Documentation/devicetree/bindings/phy/ti-phy.txt. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSKImre Kaloz2014-03-042-0/+50
| | | | | | | Enable the WiLink6 connected to mmc2. Signed-off-by: Imre Kaloz <kaloz@openwrt.org Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: Update echi-omap DT binding example usageRoger Quadros2014-03-042-2/+2
| | | | | | | | | | Remove non-compatible id from examples. CC: Alan Stern <stern@rowland.harvard.edu> CC: Nishant Menon <nm@ti.com> CC: Kevin Hilman <khilman@linaro.org> Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: Get rid of incompatible ids for hci-omap USB host nodesRoger Quadros2014-03-043-6/+6
| | | | | | | | | | | | The OMAP EHCI and OHCI controllers are not compatible with drivers other than "ti,ehci-omap" and "ti,ohci-omap3" respectively, so get rid of the incompatible ids. CC: Alan Stern <stern@rowland.harvard.edu> CC: Nishant Menon <nm@ti.com> CC: Kevin Hilman <khilman@linaro.org> Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: OMAP2+: Remove legacy_init_ehci_clk()Roger Quadros2014-03-043-28/+4
| | | | | | | | | | | The necessary clock phandle for the EHCI clock is now provided via device tree so we no longer need this legacy method. Update the omap4-panda and omap5-uevm board DTS to provide the necessary EHCI PHY clock information. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* ARM: dts: Add support for OMAP4 Gumstix DuoVero/ParlorFlorian Vaussard2014-03-044-0/+402
| | | | | | | | | | | | | | | Gumstix DuoVero is an OMAP4430-based Computer On Module. Parlor is one of the available expansion board. Tested features: - GPMC ethernet - HSUSB2 and OTG - Audio out - WiFi and Bluetooth (w2cbw0015 SDIO module) - LED and button Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> Signed-off-by: Tony Lindgren <tony@atomide.com>
* Merge tag 'for_3.15/dts_signed' of ↵Tony Lindgren2014-03-02746-4072/+9822
|\ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt Add craneboard devices Add more N900 devices Add am43x-epos-evm and am437x-gp-evm devices Add OMAP4 DMM devices Conflicts: arch/arm/boot/dts/am43x-epos-evm.dts arch/arm/boot/dts/dra7.dtsi
| * ARM: dts: omap4+: Add DMM bindingsArchit Taneja2014-03-024-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | Add Dynamic Memory Manager (DMM) bindings for OMAP4 and OMAP5 and DRA7x devices. DMM only requires address and irq information. Add documentation for the DMM bindings. Originally worked on by Andy Gross <andygro@gmail.com> Cc: Andy Gross <andygro@gmail.com> Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: am43x-gp-evm: Add matrix gpio keys.Sourav Poddar2014-03-021-0/+21
| | | | | | | | | | | | | | Add gpio keys node for am43x gp evm. Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: am437x-gp-evm: Enable gpio.Sourav Poddar2014-03-021-0/+8
| | | | | | | | | | | | | | | | Enable gpio3, gpio4, it will be used by gpio matrix keys. Also, can be used by othe peripherals. Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: am437x-gp-evm: Add pwm backlight support.Sourav Poddar2014-03-021-0/+24
| | | | | | | | | | | | | | Add pwm backlight support for gp evm. Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: am437x-gp-evm: Add gp dts.Lokesh Vutla2014-03-023-0/+51
| | | | | | | | | | | | | | | | | | | | AM437x GP EVM DTS with pinmux information to make I2C on EVM usable. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Afzal Mohammed <afzal@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: am43x-epos-evm: Add SPI data.Sourav Poddar2014-03-021-0/+30
| | | | | | | | | | | | | | Add SPI dts data. Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: am43x-epos-evm: Add I2C2 data.Sourav Poddar2014-03-021-0/+13
| | | | | | | | | | | | | | Add I2C2 dts data. Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * pinctrl: am43xx: dt-bindings: add MUX_MODE8Darren Etheridge2014-03-021-0/+1
| | | | | | | | | | | | | | | | | | AM43xx devices have an extra MUX_MODE for certain pins. Updating dt include to have MUX_MODE8 which maps to 0x8. Signed-off-by: Darren Etheridge <detheridge@ti.com> Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: am43x-epos-evm: Add pwm backlight support.Sourav Poddar2014-03-021-0/+24
| | | | | | | | | | | | | | Add pwm backlight support for am43x epos evm. Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: am4372: Add pwm-cells property for ecap device.Sourav Poddar2014-03-021-0/+9
| | | | | | | | | | | | | | Add "pwm-cells" node for all ecap, ehrpwm in am43x dtsi files. Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: OMAP3-N900: Add bq24150a supportSebastian Reichel2014-03-021-0/+14
| | | | | | | | | | | | | | | | This adds support for the bq24150a chip to the Nokia N900 DTS file. Signed-off-by: Sebastian Reichel <sre@debian.org> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: OMAP3-N900: Add isp1704 supportSebastian Reichel2014-03-021-0/+5
| | | | | | | | | | | | | | | | This adds support for the isp1704 chip to the Nokia N900 DTS file. Signed-off-by: Sebastian Reichel <sre@debian.org> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: OMAP3-N900: Add tpa6130a2 supportSebastian Reichel2014-03-021-0/+9
| | | | | | | | | | | | | | | | This adds support for the N900's headphone amplifier to the N900 DTS file. Signed-off-by: Sebastian Reichel <sre@debian.org> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: OMAP3-N900: Add support for tsl2563Sebastian Reichel2014-03-021-0/+7
| | | | | | | | | | | | | | Add support for tsl2563 light sensor to the Nokia N900. Signed-off-by: Sebastian Reichel <sre@debian.org> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: OMAP3-N900: Add TWL4030 Keypad MatrixSebastian Reichel2014-03-021-0/+55
| | | | | | | | | | | | | | | | | | Add Keyboard Matrix information to N900's DTS file. This patch maps the keys exactly as the original board code. Signed-off-by: Sebastian Reichel <sre@debian.org> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: TWL4030: Add keypad nodeSebastian Reichel2014-03-021-0/+7
| | | | | | | | | | | | | | | | Add keypad node to twl4030, so that board DTS files can just add the keymap. Signed-off-by: Sebastian Reichel <sre@debian.org> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: omap3430-sdp: add dip switch information for MMC operationNishanth Menon2014-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | MMC 8 bit mode operation depends on dip switch setting which is not obvious - The current board file has this description. However, with removal of the board file in the future, this information will be lost and has to be rediscovered. Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * ARM: dts: Add basic devices for AM3517-craneboardNishanth Menon2014-03-022-0/+175
| | | | | | | | | | | | | | | | | | | | | | | | Craneboard is a hardware development platform based on the Sitara AM3517 ARM Cortex - A8 microprocessor device - see [1] for more details. Add basic devices for craneboard as replacement for the board file scheduled for removal as part of device tree conversion [1] http://craneboard.org Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
| * Linux 3.14-rc3v3.14-rc3Linus Torvalds2014-02-161-1/+1
| |
| * Merge branch 'for-linus' of ↵Linus Torvalds2014-02-167-23/+28
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fixes from Chris Mason: "We have a small collection of fixes in my for-linus branch. The big thing that stands out is a revert of a new ioctl. Users haven't shipped yet in btrfs-progs, and Dave Sterba found a better way to export the information" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: use right clone root offset for compressed extents btrfs: fix null pointer deference at btrfs_sysfs_add_one+0x105 Btrfs: unset DCACHE_DISCONNECTED when mounting default subvol Btrfs: fix max_inline mount option Btrfs: fix a lockdep warning when cleaning up aborted transaction Revert "btrfs: add ioctl to export size of global metadata reservation"
| | * Btrfs: use right clone root offset for compressed extentsFilipe David Borba Manana2014-02-151-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For non compressed extents, iterate_extent_inodes() gives us offsets that take into account the data offset from the file extent items, while for compressed extents it doesn't. Therefore we have to adjust them before placing them in a send clone instruction. Not doing this adjustment leads to the receiving end requesting for a wrong a file range to the clone ioctl, which results in different file content from the one in the original send root. Issue reproducible with the following excerpt from the test I made for xfstests: _scratch_mkfs _scratch_mount "-o compress-force=lzo" $XFS_IO_PROG -f -c "truncate 118811" $SCRATCH_MNT/foo $XFS_IO_PROG -c "pwrite -S 0x0d -b 39987 92267 39987" $SCRATCH_MNT/foo $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap1 $XFS_IO_PROG -c "pwrite -S 0x3e -b 80000 200000 80000" $SCRATCH_MNT/foo $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT $XFS_IO_PROG -c "pwrite -S 0xdc -b 10000 250000 10000" $SCRATCH_MNT/foo $XFS_IO_PROG -c "pwrite -S 0xff -b 10000 300000 10000" $SCRATCH_MNT/foo # will be used for incremental send to be able to issue clone operations $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/clones_snap $BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap2 $FSSUM_PROG -A -f -w $tmp/1.fssum $SCRATCH_MNT/mysnap1 $FSSUM_PROG -A -f -w $tmp/2.fssum -x $SCRATCH_MNT/mysnap2/mysnap1 \ -x $SCRATCH_MNT/mysnap2/clones_snap $SCRATCH_MNT/mysnap2 $FSSUM_PROG -A -f -w $tmp/clones.fssum $SCRATCH_MNT/clones_snap \ -x $SCRATCH_MNT/clones_snap/mysnap1 -x $SCRATCH_MNT/clones_snap/mysnap2 $BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f $tmp/1.snap $BTRFS_UTIL_PROG send $SCRATCH_MNT/clones_snap -f $tmp/clones.snap $BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 \ -c $SCRATCH_MNT/clones_snap $SCRATCH_MNT/mysnap2 -f $tmp/2.snap _scratch_unmount _scratch_mkfs _scratch_mount $BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $tmp/1.snap $FSSUM_PROG -r $tmp/1.fssum $SCRATCH_MNT/mysnap1 2>> $seqres.full $BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $tmp/clones.snap $FSSUM_PROG -r $tmp/clones.fssum $SCRATCH_MNT/clones_snap 2>> $seqres.full $BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $tmp/2.snap $FSSUM_PROG -r $tmp/2.fssum $SCRATCH_MNT/mysnap2 2>> $seqres.full Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com> Signed-off-by: Chris Mason <clm@fb.com>
| | * btrfs: fix null pointer deference at btrfs_sysfs_add_one+0x105Anand Jain2014-02-151-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bdev is null when disk has disappeared and mounted with the degrade option stack trace --------- btrfs_sysfs_add_one+0x105/0x1c0 [btrfs] open_ctree+0x15f3/0x1fe0 [btrfs] btrfs_mount+0x5db/0x790 [btrfs] ? alloc_pages_current+0xa4/0x160 mount_fs+0x34/0x1b0 vfs_kern_mount+0x62/0xf0 do_mount+0x22e/0xa80 ? __get_free_pages+0x9/0x40 ? copy_mount_options+0x31/0x170 SyS_mount+0x7e/0xc0 system_call_fastpath+0x16/0x1b --------- reproducer: ------- mkfs.btrfs -draid1 -mraid1 /dev/sdc /dev/sdd (detach a disk) devmgt detach /dev/sdc [1] mount -o degrade /dev/sdd /btrfs ------- [1] github.com/anajain/devmgt.git Signed-off-by: Anand Jain <Anand.Jain@oracle.com> Tested-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: Chris Mason <clm@fb.com>
| | * Btrfs: unset DCACHE_DISCONNECTED when mounting default subvolJosef Bacik2014-02-142-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A user was running into errors from an NFS export of a subvolume that had a default subvol set. When we mount a default subvol we will use d_obtain_alias() to find an existing dentry for the subvolume in the case that the root subvol has already been mounted, or a dummy one is allocated in the case that the root subvol has not already been mounted. This allows us to connect the dentry later on if we wander into the path. However if we don't ever wander into the path we will keep DCACHE_DISCONNECTED set for a long time, which angers NFS. It doesn't appear to cause any problems but it is annoying nonetheless, so simply unset DCACHE_DISCONNECTED in the get_default_root case and switch btrfs_lookup() to use d_materialise_unique() instead which will make everything play nicely together and reconnect stuff if we wander into the defaul subvol path from a different way. With this patch I'm no longer getting the NFS errors when exporting a volume that has been mounted with a default subvol set. Thanks, cc: bfields@fieldses.org cc: ebiederm@xmission.com Signed-off-by: Josef Bacik <jbacik@fb.com> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Chris Mason <clm@fb.com>
OpenPOWER on IntegriCloud