1. 21 May, 2010 40 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 2a8ba8f0
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (46 commits)
        random: simplify fips mode
        crypto: authenc - Fix cryptlen calculation
        crypto: talitos - add support for sha224
        crypto: talitos - add hash algorithms
        crypto: talitos - second prepare step for adding ahash algorithms
        crypto: talitos - prepare for adding ahash algorithms
        crypto: n2 - Add Niagara2 crypto driver
        crypto: skcipher - Add ablkcipher_walk interfaces
        crypto: testmgr - Add testing for async hashing and update/final
        crypto: tcrypt - Add speed tests for async hashing
        crypto: scatterwalk - Fix scatterwalk_done() test
        crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk
        padata: Use get_online_cpus/put_online_cpus in padata_free
        padata: Add some code comments
        padata: Flush the padata queues actively
        padata: Use a timer to handle remaining objects in the reorder queues
        crypto: shash - Remove usage of CRYPTO_MINALIGN
        crypto: mv_cesa - Use resource_size
        crypto: omap - OMAP macros corrected
        padata: Use get_online_cpus/put_online_cpus
        ...
      
      Fix up conflicts in arch/arm/mach-omap2/devices.c
      2a8ba8f0
    • Linus Torvalds's avatar
      Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm · ec2a7587
      Linus Torvalds authored
      * 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
        drivers: video: msm: add include msm_mdp.h
        drivers: video: msm: default to no
      ec2a7587
    • Linus Torvalds's avatar
      Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm · da7806f9
      Linus Torvalds authored
      * 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
        drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support
        mmc: msm_sdcc: Fix issue where clocks could be disabled mid transaction
        mmc: msm_sdcc: Fix the dma exec function to use the proper delays
        mmc: msm_sdcc: Don't set host->curr.mrq until after we're sure the busclk timer won't fire
        mmc: msm_sdcc: Enable busclk idle timer for power savings
        mmc: msm_sdcc: Don't disable interrupts while suspending
        mmc: msm_sdcc: Fix issue where we might not end a sucessfull request
        mmc: msm_sdcc: Featurize busclock power save and disable it by default
        mmc: msm_sdcc: Fix bug where busclk expiry timer was not properly disabled
        mmc: msm_sdcc: Reduce command timeouts and improve reliability.
        mmc: msm_sdcc: Schedule clock disable after probe
        mmc: msm_sdcc: Wrap readl/writel calls with appropriate clk delays
        mmc: msm_sdcc: Driver clocking/irq improvements
        msm: Add 'execute' datamover callback
        mmc: msm_sdcc: Snoop SDIO_CCCR_ABORT register
        mmc: msm_sdcc: Clean up clock management and add a 10us delay after enabling clocks
      da7806f9
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 79c45812
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (92 commits)
        powerpc: Remove unused 'protect4gb' boot parameter
        powerpc: Build-in e1000e for pseries & ppc64_defconfig
        powerpc/pseries: Make request_ras_irqs() available to other pseries code
        powerpc/numa: Use ibm,architecture-vec-5 to detect form 1 affinity
        powerpc/numa: Set a smaller value for RECLAIM_DISTANCE to enable zone reclaim
        powerpc: Use smt_snooze_delay=-1 to always busy loop
        powerpc: Remove check of ibm,smt-snooze-delay OF property
        powerpc/kdump: Fix race in kdump shutdown
        powerpc/kexec: Fix race in kexec shutdown
        powerpc/kexec: Speedup kexec hash PTE tear down
        powerpc/pseries: Add hcall to read 4 ptes at a time in real mode
        powerpc: Use more accurate limit for first segment memory allocations
        powerpc/kdump: Use chip->shutdown to disable IRQs
        powerpc/kdump: CPUs assume the context of the oopsing CPU
        powerpc/crashdump: Do not fail on NULL pointer dereferencing
        powerpc/eeh: Fix oops when probing in early boot
        powerpc/pci: Check devices status property when scanning OF tree
        powerpc/vio: Switch VIO Bus PM to use generic helpers
        powerpc: Avoid bad relocations in iSeries code
        powerpc: Use common cpu_die (fixes SMP+SUSPEND build)
        ...
      79c45812
    • Linus Torvalds's avatar
      Merge branch 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 59534f72
      Linus Torvalds authored
      * 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (207 commits)
        drm/radeon/kms/pm/r600: select the mid clock mode for single head low profile
        drm/radeon: fix power supply kconfig interaction.
        drm/radeon/kms: record object that have been list reserved
        drm/radeon: AGP memory is only I/O if the aperture can be mapped by the CPU.
        drm/radeon/kms: don't default display priority to high on rs4xx
        drm/edid: fix typo in 1600x1200@75 mode
        drm/nouveau: fix i2c-related init table handlers
        drm/nouveau: support init table i2c device identifier 0x81
        drm/nouveau: ensure we've parsed i2c table entry for INIT_*I2C* handlers
        drm/nouveau: display error message for any failed init table opcode
        drm/nouveau: fix init table handlers to return proper error codes
        drm/nv50: support fractional feedback divider on newer chips
        drm/nv50: fix monitor detection on certain chipsets
        drm/nv50: store full dcb i2c entry from vbios
        drm/nv50: fix suspend/resume with DP outputs
        drm/nv50: output calculated crtc pll when debugging on
        drm/nouveau: dump pll limits entries when debugging is on
        drm/nouveau: bios parser fixes for eDP boards
        drm/nouveau: fix a nouveau_bo dereference after it's been destroyed
        drm/nv40: remove some completed ctxprog TODOs
        ...
      59534f72
    • Linus Torvalds's avatar
      Merge branch 'dbg-early-merge' of... · ac3ee84c
      Linus Torvalds authored
      Merge branch 'dbg-early-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
      
      * 'dbg-early-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
        echi-dbgp: Add kernel debugger support for the usb debug port
        earlyprintk,vga,kdb: Fix \b and \r for earlyprintk=vga with kdb
        kgdboc: Add ekgdboc for early use of the kernel debugger
        x86,early dr regs,kgdb: Allow kernel debugger early dr register access
        x86,kgdb: Implement early hardware breakpoint debugging
        x86, kgdb, init: Add early and late debug states
        x86, kgdb: early trap init for early debug
      ac3ee84c
    • Linus Torvalds's avatar
      Merge branch 'kdb-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb · 90b9a32d
      Linus Torvalds authored
      * 'kdb-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: (25 commits)
        kdb,debug_core: Allow the debug core to receive a panic notification
        MAINTAINERS: update kgdb, kdb, and debug_core info
        debug_core,kdb: Allow the debug core to process a recursive debug entry
        printk,kdb: capture printk() when in kdb shell
        kgdboc,kdb: Allow kdb to work on a non open console port
        kgdb: Add the ability to schedule a breakpoint via a tasklet
        mips,kgdb: kdb low level trap catch and stack trace
        powerpc,kgdb: Introduce low level trap catching
        x86,kgdb: Add low level debug hook
        kgdb: remove post_primary_code references
        kgdb,docs: Update the kgdb docs to include kdb
        kgdboc,keyboard: Keyboard driver for kdb with kgdb
        kgdb: gdb "monitor" -> kdb passthrough
        sparc,sunzilog: Add console polling support for sunzilog serial driver
        sh,sh-sci: Use NO_POLL_CHAR in the SCIF polled console code
        kgdb,8250,pl011: Return immediately from console poll
        kgdb: core changes to support kdb
        kdb: core for kgdb back end (2 of 2)
        kdb: core for kgdb back end (1 of 2)
        kgdb,blackfin: Add in kgdb_arch_set_pc for blackfin
        ...
      90b9a32d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 8b108c60
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (59 commits)
        HID: fix up 'EMBEDDED' mess in Kconfig
        HID: roccat: cleanup preprocessor macros
        HID: roccat: refactor special event handling
        HID: roccat: fix special button support
        HID: roccat: Correctly mark init and exit functions
        HID: hidraw: Use Interrupt Endpoint for OUT Transfers if Available
        HID: hid-samsung: remove redundant key mappings
        HID: add omitted hid-zydacron.c file
        HID: hid-samsung: add support for Creative Desktop Wireless 6000
        HID: picolcd: Eliminate use after free
        HID: Zydacron Remote Control driver
        HID: Use kmemdup
        HID: magicmouse: fix input registration
        HID: make Prodikeys driver standalone config option
        HID: Prodikeys PC-MIDI HID Driver
        HID: hidraw: fix indentation
        HID: ntrig: add filtering module parameters
        HID: ntrig: add sysfs access to filter parameters
        HID: ntrig: add sensitivity and responsiveness support
        HID: add multi-input quirk for eGalax Touchcontroller
        ...
      8b108c60
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 7ce1418f
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (31 commits)
        dquot: Detect partial write error to quota file in write_blk() and add printk_ratelimit for quota error messages
        ocfs2: Fix lock inversion in quotas during umount
        ocfs2: Use __dquot_transfer to avoid lock inversion
        ocfs2: Fix NULL pointer deref when writing local dquot
        ocfs2: Fix estimate of credits needed for quota allocation
        ocfs2: Fix quota locking
        ocfs2: Avoid unnecessary block mapping when refreshing quota info
        ocfs2: Do not map blocks from local quota file on each write
        quota: Refactor dquot_transfer code so that OCFS2 can pass in its references
        quota: unify quota init condition in setattr
        quota: remove sb_has_quota_active in get/set_info
        quota: unify ->set_dqblk
        quota: unify ->get_dqblk
        ext3: make barrier options consistent with ext4
        quota: Make quota stat accounting lockless.
        suppress warning: "quotatypes" defined but not used
        ext3: Fix waiting on transaction during fsync
        jbd: Provide function to check whether transaction will issue data barrier
        ufs: add ufs speciffic ->setattr call
        BKL: Remove BKL from ext2 filesystem
        ...
      7ce1418f
    • Linus Torvalds's avatar
      Merge branch 'omap-for-linus' of... · a6f03986
      Linus Torvalds authored
      Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (113 commits)
        omap4: Add support for i2c init
        omap: Fix i2c platform init code for omap4
        OMAP2 clock: fix recursive spinlock attempt when CONFIG_CPU_FREQ=y
        OMAP powerdomain, hwmod, omap_device: add some credits
        OMAP4 powerdomain: Support LOWPOWERSTATECHANGE for powerdomains
        OMAP3 clock: add support for setting the divider for sys_clkout2 using clk_set_rate
        OMAP4 powerdomain: Fix pwrsts flags for ALWAYS ON domains
        OMAP: timers: Fix clock source names for OMAP4
        OMAP4 clock: Support clk_set_parent
        OMAP4: PRCM: Add offset defines for all CM registers
        OMAP4: PRCM: Add offset defines for all PRM registers
        OMAP4: PRCM: Remove duplicate definition of base addresses
        OMAP4: PRM: Remove MPU internal code name and apply PRCM naming convention
        OMAP4: CM: Remove non-functional registers in ES1.0
        OMAP: hwmod: Replace WARN by pr_warning for clockdomain check
        OMAP: hwmod: Rename hwmod name for the MPU
        OMAP: hwmod: Do not exit the iteration if one clock init failed
        OMAP: hwmod: Replace WARN by pr_warning if clock lookup failed
        OMAP: hwmod: Remove IS_ERR check with omap_clk_get_by_name return value
        OMAP: hwmod: Fix wrong pointer iteration in oh->slaves
        ...
      a6f03986
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · e0bc5d4a
      Linus Torvalds authored
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c-nforce2: Remove redundant error messages on ACPI conflict
        i2c: Use <linux/io.h> instead of <asm/io.h>
        i2c-algo-pca: Fix coding style issues
        i2c-dev: Fix all coding style issues
        i2c-core: Fix some coding style issues
        i2c-gpio: Move initialization code to subsys_initcall()
        i2c-parport: Make template structure const
        i2c-dev: Remove unnecessary casts
        at24: Fall back to byte or word reads if needed
        i2c-stub: Expose the default functionality flags
        i2c/scx200_acb: Make PCI device ids constant
        i2c-i801: Fix all checkpatch warnings
        i2c-i801: All newer devices have all the optional features
        i2c-i801: Let the user disable selected driver features
      e0bc5d4a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 7f02ab3c
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (25 commits)
        serial: Tidy REMOTE_DEBUG
        serial: isicomm: handle running out of slots
        serial: bfin_sport_uart: Use resource size to fix off-by-one error
        tty: fix obsolete comment on tty_insert_flip_string_fixed_flag
        serial: Add driver for the Altera UART
        serial: Add driver for the Altera JTAG UART
        serial: timbuart: make sure last byte is sent when port is closed
        serial: two branches the same in timbuart_set_mctrl()
        serial: uartlite: move from byte accesses to word accesses
        tty: n_gsm: depends on NET
        tty: n_gsm line discipline
        serial: TTY: new ldiscs for staging
        serial: bfin_sport_uart: drop redundant cpu depends
        serial: bfin_sport_uart: drop the experimental markings
        serial: bfin_sport_uart: pull in bfin_sport.h for SPORT defines
        serial: bfin_sport_uart: only enable SPORT TX if data is to be sent
        serial: bfin_sport_uart: drop useless status masks
        serial: bfin_sport_uart: zero sport_uart_port if allocated dynamically
        serial: bfin_sport_uart: protect changes to uart_port
        serial: bfin_sport_uart: add support for CTS/RTS via GPIOs
        ...
      7f02ab3c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 · d6fb1db0
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (38 commits)
        net: Expose all network devices in a namespaces in sysfs
        hotplug: netns aware uevent_helper
        kobj: Send hotplug events in the proper namespace.
        netlink: Implment netlink_broadcast_filtered
        net/sysfs: Fix the bitrot in network device kobject namespace support
        netns: Teach network device kobjects which namespace they are in.
        kobject: Send hotplug events in all network namespaces
        driver-core: fix Typo in drivers/base/core.c for CONFIG_MODULE
        pci: check caps from sysfs file open to read device dependent config space
        sysfs: add struct file* to bin_attr callbacks
        sysfs: Remove usage of S_BIAS to avoid merge conflict with the vfs tree
        sysfs: Don't use enums in inline function declaration.
        sysfs-namespaces: add a high-level Documentation file
        sysfs: Comment sysfs directory tagging logic
        driver core: Implement ns directory support for device classes.
        sysfs: Implement sysfs_delete_link
        sysfs: Add support for tagged directories with untagged members.
        sysfs: Implement sysfs tagged directory support.
        kobj: Add basic infrastructure for dealing with namespaces.
        sysfs: Remove double free sysfs_get_sb
        ...
      d6fb1db0
    • Randy Dunlap's avatar
      interrupt.h: fix fatal kernel-doc error · b4e6b097
      Randy Dunlap authored
      Fix kernel-doc fatal error:
      /** beginning a non-kernel-doc comment block:
      (That alone does not kill kernel-doc, but the 'enum' was
      totally confusing to it.)
      
      Error(/lnx/src/TMP/linux-2.6.34-git6//include/linux/interrupt.h:88): cannot understand prototype: 'enum '
      make[2]: *** [Documentation/DocBook/genericirq.xml] Error 1
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b4e6b097
    • Jiaying Zhang's avatar
      dquot: Detect partial write error to quota file in write_blk() and add... · 1907131b
      Jiaying Zhang authored
      dquot: Detect partial write error to quota file in write_blk() and add printk_ratelimit for quota error messages
      
      This patch changes quota_tree.c:write_blk() to detect error caused by partial
      write to quota file and add a macro to limit control printed quota error
      messages so we won't fill up dmesg with a corrupted quota file.
      Signed-off-by: default avatarJiaying Zhang <jiayingz@google.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      1907131b
    • Jan Kara's avatar
      ocfs2: Fix lock inversion in quotas during umount · c06bcbfa
      Jan Kara authored
      We cannot cancel delayed work from ocfs2_local_free_info because that is called
      with dqonoff_mutex held and the work it cancels requires dqonoff_mutex to
      finish. Cancel the work before acquiring dqonoff_mutex.
      Acked-by: default avatarJoel Becker <Joel.Becker@oracle.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      c06bcbfa
    • Jan Kara's avatar
      ocfs2: Use __dquot_transfer to avoid lock inversion · 52a9ee28
      Jan Kara authored
      dquot_transfer() acquires own references to dquots via dqget(). Thus it waits
      for dq_lock which creates a lock inversion because dq_lock ranks above
      transaction start but transaction is already started in ocfs2_setattr(). Fix
      the problem by passing own references directly to __dquot_transfer.
      Acked-by: default avatarJoel Becker <Joel.Becker@oracle.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      52a9ee28
    • Jan Kara's avatar
      ocfs2: Fix NULL pointer deref when writing local dquot · 741e1289
      Jan Kara authored
      commit_dqblk() can write quota info to global file. That is actually a bad
      thing to do because if we are just modifying local quota file, we are not
      prepared (do not hold proper locks, do not have transaction credits) to do
      a modification of the global quota file. So do not use commit_dqblk() and
      instead call our writing function directly.
      Acked-by: default avatarJoel Becker <Joel.Becker@oracle.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      741e1289
    • Jan Kara's avatar
      ocfs2: Fix estimate of credits needed for quota allocation · 832d09cf
      Jan Kara authored
      We were missing reservation of a journal credit for modification of quota
      file inode when creating new dquot structure in the global quota file.
      Acked-by: default avatarJoel Becker <Joel.Becker@oracle.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      832d09cf
    • Jan Kara's avatar
      ocfs2: Fix quota locking · fb8dd8d7
      Jan Kara authored
      OCFS2 had three issues with quota locking:
      a) When reading dquot from global quota file, we started a transaction while
         holding dqio_mutex which is prone to deadlocks because other paths do it
         the other way around
      b) During ocfs2_sync_dquot we were not protected against concurrent writers
         on the same node. Because we first copy data to local buffer, a race
         could happen resulting in old data being written to global quota file and
         thus causing quota inconsistency after a crash.
      c) ip_alloc_sem of quota files was acquired while a transaction is started
         in ocfs2_quota_write which can deadlock because we first get ip_alloc_sem
         and then start a transaction when extending quota files.
      
      We fix the problem a) by pulling all necessary code to ocfs2_acquire_dquot
      and ocfs2_release_dquot. Thus we no longer depend on generic dquot_acquire
      to do the locking and can force proper lock ordering.
      
      Problems b) and c) are fixed by locking i_mutex and ip_alloc_sem of
      global quota file in ocfs2_lock_global_qf and removing ip_alloc_sem from
      ocfs2_quota_read and ocfs2_quota_write.
      Acked-by: default avatarJoel Becker <Joel.Becker@oracle.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      fb8dd8d7
    • Jan Kara's avatar
      ocfs2: Avoid unnecessary block mapping when refreshing quota info · ae4f6ef1
      Jan Kara authored
      The position of global quota file info does not change. So we do not have
      to do logical -> physical block translation every time we reread it from
      disk. Thus we can also avoid taking ip_alloc_sem.
      Acked-by: default avatarJoel Becker <Joel.Becker@oracle.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      ae4f6ef1
    • Jan Kara's avatar
      ocfs2: Do not map blocks from local quota file on each write · f64dd44e
      Jan Kara authored
      There is no need to map offset of local dquot structure to on disk block
      in each quota write. It is enough to map it just once and store the physical
      block number in quota structure in memory. Moreover this simplifies locking
      as we do not have to take ip_alloc_sem from quota write path.
      Acked-by: default avatarJoel Becker <Joel.Becker@oracle.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      f64dd44e
    • Jan Kara's avatar
      quota: Refactor dquot_transfer code so that OCFS2 can pass in its references · bc8e5f07
      Jan Kara authored
      Currently, __dquot_transfer() acquires its own references of dquot structures
      that will be put into inode. But for OCFS2, this creates a lock inversion
      between dq_lock (waited on in dqget) and transaction start (started in
      ocfs2_setattr). Currently, deadlock is impossible because dq_lock is acquired
      only during dquot_acquire and dquot_release and we already hold a reference to
      dquot structures in ocfs2_setattr so neither of these functions can be called
      while we call dquot_transfer. But this is rather subtle and it is hard to teach
      lockdep about it. So provide __dquot_transfer function that can be passed dquot
      references directly. OCFS2 can then pass acquired dquot references directly to
      __dquot_transfer with proper locking.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      bc8e5f07
    • Dmitry Monakhov's avatar
      quota: unify quota init condition in setattr · 12755627
      Dmitry Monakhov authored
      Quota must being initialized if size or uid/git changes requested.
      But initialization performed in two different places:
      in case of i_size file system is responsible for dquot init
      , but in case of uid/gid init will be called internally in
      dquot_transfer().
      This ambiguity makes code harder to understand.
      Let's move this logic to one common helper function.
      Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      12755627
    • Christoph Hellwig's avatar
      quota: remove sb_has_quota_active in get/set_info · fcbc59f9
      Christoph Hellwig authored
      The methods already do these checks, so remove them in the quotactl
      implementation to allow non-VFS quota implementations to also support
      these calls.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      fcbc59f9
    • Christoph Hellwig's avatar
      quota: unify ->set_dqblk · c472b432
      Christoph Hellwig authored
      Pass the larger struct fs_disk_quota to the ->set_dqblk operation so
      that the Q_SETQUOTA and Q_XSETQUOTA operations can be implemented
      with a single filesystem operation and we can retire the ->set_xquota
      operation.  The additional information (RT-subvolume accounting and
      warn counts) are left zero for the VFS quota implementation.
      
      Add new fieldmask values for setting the numer of blocks and inodes
      values which is required for the VFS quota, but wasn't for XFS.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      c472b432
    • Christoph Hellwig's avatar
      quota: unify ->get_dqblk · b9b2dd36
      Christoph Hellwig authored
      Pass the larger struct fs_disk_quota to the ->get_dqblk operation so
      that the Q_GETQUOTA and Q_XGETQUOTA operations can be implemented
      with a single filesystem operation and we can retire the ->get_xquota
      operation.  The additional information (RT-subvolume accounting and
      warn counts) are left zero for the VFS quota implementation.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      b9b2dd36
    • Eric Sandeen's avatar
      ext3: make barrier options consistent with ext4 · 0636c73e
      Eric Sandeen authored
      ext4 was updated to accept barrier/nobarrier mount options
      in addition to the older barrier=0/1.  The barrier story
      is complex enough, we should help people by making the options
      the same at least, even if the defaults are different.
      
      This patch allows the barrier/nobarrier mount options for ext3,
      while keeping nobarrier the default.
      
      It also unconditionally displays barrier status in show_options,
      and prints a message at mount time if barriers are not enabled,
      just as ext4 does.
      Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      0636c73e
    • Dmitry Monakhov's avatar
      quota: Make quota stat accounting lockless. · dde95888
      Dmitry Monakhov authored
      Quota stats is mostly writable data structure. Let's alloc percpu
      bucket for each value.
      
      NOTE: dqstats_read() function is racy against dqstats_{inc,dec}
      and may return inconsistent value. But this is ok since absolute
      accuracy is not required.
      Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      dde95888
    • Sergey Senozhatsky's avatar
      suppress warning: "quotatypes" defined but not used · da8d1ba2
      Sergey Senozhatsky authored
      Suppress compilation warning: "quotatypes" defined but not used.
      quotatypes is used only when CONFIG_QUOTA_DEBUG or CONFIG_PRINT_QUOTA_WARNING
      is/are defined.
      Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      da8d1ba2
    • Jan Kara's avatar
      ext3: Fix waiting on transaction during fsync · 52779708
      Jan Kara authored
      log_start_commit() returns 1 only when it started a transaction
      commit. Thus in case transaction commit is already running, we
      fail to wait for the commit to finish. Fix the issue by always
      waiting for the commit regardless of the log_start_commit return
      value.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      52779708
    • Jan Kara's avatar
      jbd: Provide function to check whether transaction will issue data barrier · 03f4d804
      Jan Kara authored
      Provide a function which returns whether a transaction with given tid
      will send a barrier to the filesystem device. The function will be used
      by ext3 to detect whether fsync needs to send a separate barrier or not.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      03f4d804
    • Dmitry Monakhov's avatar
      ufs: add ufs speciffic ->setattr call · 311b9549
      Dmitry Monakhov authored
      generic setattr not longer responsible for quota transfer.
      use ufs_setattr for all ufs's inodes.
      Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      311b9549
    • Jan Blunck's avatar
      BKL: Remove BKL from ext2 filesystem · e0a5cbac
      Jan Blunck authored
      The BKL is still used in ext2_put_super(), ext2_fill_super(), ext2_sync_fs()
      ext2_remount() and ext2_write_inode(). From these calls ext2_put_super(),
      ext2_fill_super() and ext2_remount() are protected against each other by
      the struct super_block s_umount rw semaphore. The call in ext2_write_inode()
      could only protect the modification of the ext2_sb_info through
      ext2_update_dynamic_rev() against concurrent ext2_sync_fs() or ext2_remount().
      ext2_fill_super() and ext2_put_super() can be left out because you need a
      valid filesystem reference in all three cases, which you do not have when
      you are one of these functions.
      
      If the BKL is only protecting the modification of the ext2_sb_info it can
      safely be removed since this is protected by the struct ext2_sb_info s_lock.
      Signed-off-by: default avatarJan Blunck <jblunck@suse.de>
      Cc: Jan Kara <jack@suse.cz>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      e0a5cbac
    • Jan Blunck's avatar
      ext2: Add ext2_sb_info s_lock spinlock · c15271f4
      Jan Blunck authored
      Add a spinlock that protects against concurrent modifications of
      s_mount_state, s_blocks_last, s_overhead_last and the content of the
      superblock's buffer pointed to by sbi->s_es. The spinlock is now used in
      ext2_xattr_update_super_block() which was setting the
      EXT2_FEATURE_COMPAT_EXT_ATTR flag on the superblock without protection
      before. Likewise the spinlock is used in ext2_show_options() to have a
      consistent view of the mount options.
      
      This is a preparation patch for removing the BKL from ext2 in the next
      patch.
      Signed-off-by: default avatarJan Blunck <jblunck@suse.de>
      Cc: Andi Kleen <andi@firstfloor.org>
      Cc: Jan Kara <jack@suse.cz>
      Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      c15271f4
    • Jan Blunck's avatar
      ext2: Move ext2_write_super() out of ext2_setup_super() · 4c96a68b
      Jan Blunck authored
      Move ext2_write_super() out of ext2_setup_super() as a preparation for the
      next patch that adds a new lock for superblock fields.
      Signed-off-by: default avatarJan Blunck <jblunck@suse.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      4c96a68b
    • Jan Blunck's avatar
      ext2: Fold ext2_commit_super() into ext2_sync_super() · ee6921eb
      Jan Blunck authored
      Both function originally did similar things except that ext2_sync_super()
      is returning after the call to sync_dirty_buffer(sbh). Therefore this
      patch adds a wait flag to tell ext2_sync_super() if it has to call
      sync_dirty_buffer() to wait for in-progress I/O to finish.
      Signed-off-by: default avatarJan Blunck <jblunck@suse.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      ee6921eb
    • Jan Blunck's avatar
      ext2: Remove duplicate code from ext2_sync_fs() · 20da9baf
      Jan Blunck authored
      Depending in the state (valid or unchecked) of the filesystem either
      ext2_sync_super() or ext2_commit_super() is called. If the filesystem is
      currently valid (it is checked), we first mark it unchecked and afterwards
      duplicate the work that ext2_sync_super() is doing later. Therefore this
      patch removes the duplicate code and calls ext2_sync_super() directly after
      marking the filesystem unchecked.
      Signed-off-by: default avatarJan Blunck <jblunck@suse.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      20da9baf
    • Jan Blunck's avatar
      ext2: Set the write time in ext2_sync_fs() · 269c8db3
      Jan Blunck authored
      This is probably a typo since the write time should actually be updated by
      ext2_sync_fs() instead of the mount time.
      Signed-off-by: default avatarJan Blunck <jblunck@suse.de>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      269c8db3