1. 07 4月, 2010 22 次提交
  2. 06 4月, 2010 18 次提交
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · ab195c58
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        libata: unlock HPA if device shrunk
        libata: disable NCQ on Crucial C300 SSD
        libata: don't whine on spurious IRQ
      ab195c58
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · cb4361c1
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)
        smc91c92_cs: fix the problem of "Unable to find hardware address"
        r8169: clean up my printk uglyness
        net: Hook up cxgb4 to Kconfig and Makefile
        cxgb4: Add main driver file and driver Makefile
        cxgb4: Add remaining driver headers and L2T management
        cxgb4: Add packet queues and packet DMA code
        cxgb4: Add HW and FW support code
        cxgb4: Add register, message, and FW definitions
        netlabel: Fix several rcu_dereference() calls used without RCU read locks
        bonding: fix potential deadlock in bond_uninit()
        net: check the length of the socket address passed to connect(2)
        stmmac: add documentation for the driver.
        stmmac: fix kconfig for crc32 build error
        be2net: fix bug in vlan rx path for big endian architecture
        be2net: fix flashing on big endian architectures
        be2net: fix a bug in flashing the redboot section
        bonding: bond_xmit_roundrobin() fix
        drivers/net: Add missing unlock
        net: gianfar - align BD ring size console messages
        net: gianfar - initialize per-queue statistics
        ...
      cb4361c1
    • D
      proc: copy_to_user() returns unsigned · 309361e0
      Dan Carpenter 提交于
      copy_to_user() returns the number of bytes left to be copied.
      
      This was a typo from: d82ef020 "proc: pagemap: Hold mmap_sem during
      page walk".
      Signed-off-by: NDan Carpenter <error27@gmail.com>
      Acked-by: NMatt Mackall <mpm@selenic.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      309361e0
    • T
      libata: unlock HPA if device shrunk · 445d211b
      Tejun Heo 提交于
      Some BIOSes don't configure HPA during boot but do so while resuming.
      This causes harddrives to shrink during resume making libata detach
      and reattach them.  This can be worked around by unlocking HPA if old
      size equals native size.
      
      Add ATA_DFLAG_UNLOCK_HPA so that HPA unlocking can be controlled
      per-device and update ata_dev_revalidate() such that it sets
      ATA_DFLAG_UNLOCK_HPA and fails with -EIO when the above condition is
      detected.
      
      This patch fixes the following bug.
      
        https://bugzilla.kernel.org/show_bug.cgi?id=15396Signed-off-by: NTejun Heo <tj@kernel.org>
      Reported-by: NOleksandr Yermolenko <yaa.bta@gmail.com>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      445d211b
    • T
      libata: disable NCQ on Crucial C300 SSD · 68b0ddb2
      Tejun Heo 提交于
      Crucial said,
      
        Thank you for contacting us. We know that with our M225 line of SSDs
        you sometimes need to disable NCQ (native command queuing) to avoid
        just the type of errors you're seeing. Our recommendation for the
        M225 is to add libata.force=noncq to your Linux kernel boot options,
        under the kernel ATA library option.
      
        I have sent your feedback to the engineers working on the C300, and
        asked them to please pass it on to the firmware team. I have been
        notified that they are in the process of testing and finalizing a
        new firmware version, that you can expect to see released around the
        end of April. We’ll keep you posted as to when it will be available
        for download.
      
      So, turn off NCQ on the drive w/ the current firmware revision.
      
      Reported in the following bug.
      
        https://bugzilla.kernel.org/show_bug.cgi?id=15573Signed-off-by: NTejun Heo <tj@kernel.org>
      Reported-by: lethalwp@scarlet.be
      Reported-by: NLuke Macken <lmacken@redhat.com>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      68b0ddb2
    • T
      libata: don't whine on spurious IRQ · c710f785
      Tejun Heo 提交于
      On configurations where IRQ line is shared with a different
      controller, spurious IRQs may happen continuously.  The message was
      put there primarily for debugging anyway.  Kill it.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      c710f785
    • T
      [WATCHDOG] hpwdt - fix lower timeout limit · 8ba42bd8
      Thomas Mingarelli 提交于
      [Novell Bug 581103] HP Watchdog driver has arbitrary (wrong) timeout limits.
      Fix the lower timeout limit to a more appropriate value.
      Signed-off-by: NThomas Mingarelli <Thomas.Mingarelli@hp.com>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      Cc: stable <stable@kernel.org>
      8ba42bd8
    • S
      [WATCHDOG] iTCO_wdt: TCO Watchdog patch for additional Intel Cougar Point DeviceIDs · 4c7d8492
      Seth Heasley 提交于
      This patch adds the Intel Cougar Point PCH LPC Controller DeviceIDs for iTCO Watchdog.
      Signed-off-by: NSeth Heasley <seth.heasley@intel.com>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      Cc: stable <stable@kernel.org>
      4c7d8492
    • J
      [WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl. · dfc33383
      James Hogan 提交于
      In the watchdog-test program and watchdog-api.txt, pass the values to
      the WDIOC_SETOPTIONS ioctl as a pointer to an integer containing the
      values intead of directly in the third ioctl argument. The actual
      watchdog drivers in drivers/watchdog don't read the options directly
      from the argument but use get_user and copy_from_user.
      Signed-off-by: NJames Hogan <james.hogan@imgtec.com>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      dfc33383
    • N
      Fix up possibly racy module refcounting · 5fbfb18d
      Nick Piggin 提交于
      Module refcounting is implemented with a per-cpu counter for speed.
      However there is a race when tallying the counter where a reference may
      be taken by one CPU and released by another.  Reference count summation
      may then see the decrement without having seen the previous increment,
      leading to lower than expected count.  A module which never has its
      actual reference drop below 1 may return a reference count of 0 due to
      this race.
      
      Module removal generally runs under stop_machine, which prevents this
      race causing bugs due to removal of in-use modules.  However there are
      other real bugs in module.c code and driver code (module_refcount is
      exported) where the callers do not run under stop_machine.
      
      Fix this by maintaining running per-cpu counters for the number of
      module refcount increments and the number of refcount decrements.  The
      increments are tallied after the decrements, so any decrement seen will
      always have its corresponding increment counted.  The final refcount is
      the difference of the total increments and decrements, preventing a
      low-refcount from being returned.
      Signed-off-by: NNick Piggin <npiggin@suse.de>
      Acked-by: NRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5fbfb18d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · 7da23b86
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
        [SCSI] qla1280: retain firmware for error recovery
        [SCSI] attirbute_container: Initialize sysfs attributes with sysfs_attr_init
        [SCSI] advansys: fix regression with request_firmware change
        [SCSI] qla2xxx: Updated version number to 8.03.02-k2.
        [SCSI] qla2xxx: Prevent sending mbx commands from sysfs during isp reset.
        [SCSI] qla2xxx: Disable MSI on qla24xx chips other than QLA2432.
        [SCSI] qla2xxx: Check to make sure multique and CPU affinity support is not enabled at the same time.
        [SCSI] qla2xxx: Correct vp_idx checking during PORT_UPDATE processing.
        [SCSI] qla2xxx: Honour "Extended BB credits" bit for CNAs.
        [SCSI] scsi_transport_fc: Make sure commands are completed when rport is offline
        [SCSI] libiscsi: Fix recovery slowdown regression
      7da23b86
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 749d2297
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: saving negative to unsigned char
        9p: return on mutex_lock_interruptible()
        9p: Creating files with names too long should fail with ENAMETOOLONG.
        9p: Make sure we are able to clunk the cached fid on umount
        9p: drop nlink remove
        fs/9p: Clunk the fid resulting from partial walk of the name
        9p: documentation update
        9p: Fix setting of protocol flags in v9fs_session_info structure.
      749d2297
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · 795d580b
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
        Btrfs: add check for changed leaves in setup_leaf_for_split
        Btrfs: create snapshot references in same commit as snapshot
        Btrfs: fix small race with delalloc flushing waitqueue's
        Btrfs: use add_to_page_cache_lru, use __page_cache_alloc
        Btrfs: fix chunk allocate size calculation
        Btrfs: kill max_extent mount option
        Btrfs: fail to mount if we have problems reading the block groups
        Btrfs: check btrfs_get_extent return for IS_ERR()
        Btrfs: handle kmalloc() failure in inode lookup ioctl
        Btrfs: dereferencing freed memory
        Btrfs: Simplify num_stripes's calculation logical for __btrfs_alloc_chunk()
        Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree()
        Btrfs: Remove unnecessary finish_wait() in wait_current_trans()
        Btrfs: add NULL check for do_walk_down()
        Btrfs: remove duplicate include in ioctl.c
      
      Fix trivial conflict in fs/btrfs/compression.c due to slab.h include
      cleanups.
      795d580b
    • E
      audit: preface audit printk with audit · 449cedf0
      Eric Paris 提交于
      There have been a number of reports of people seeing the message:
      "name_count maxed, losing inode data: dev=00:05, inode=3185"
      in dmesg.  These usually lead to people reporting problems to the filesystem
      group who are in turn clueless what they mean.
      
      Eventually someone finds me and I explain what is going on and that
      these come from the audit system.  The basics of the problem is that the
      audit subsystem never expects a single syscall to 'interact' (for some
      wish washy meaning of interact) with more than 20 inodes.  But in fact
      some operations like loading kernel modules can cause changes to lots of
      inodes in debugfs.
      
      There are a couple real fixes being bandied about including removing the
      fixed compile time limit of 20 or not auditing changes in debugfs (or
      both) but neither are small and obvious so I am not sending them for
      immediate inclusion (I hope Al forwards a real solution next devel
      window).
      
      In the meantime this patch simply adds 'audit' to the beginning of the
      crap message so if a user sees it, they come blame me first and we can
      talk about what it means and make sure we understand all of the reasons
      it can happen and make sure this gets solved correctly in the long run.
      Signed-off-by: NEric Paris <eparis@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      449cedf0
    • D
      9p: saving negative to unsigned char · 3dc9fef6
      Dan Carpenter 提交于
      Saving -EINVAL as unsigned char truncates the high bits and changes it
      into 234 instead of -22.  This breaks the test for "if (ret == -EINVAL)"
      in parse_opts().
      Signed-off-by: NDan Carpenter <error27@gmail.com>
      Signed-off-by: NEric Van Hensbergen <ericvh@gmail.com>
      3dc9fef6
    • D
      9p: return on mutex_lock_interruptible() · 85a770a8
      Dan Carpenter 提交于
      If "err" is -EINTR here the original code calls mutex_unlock() and then
      returns, but it should just return directly.
      Signed-off-by: NDan Carpenter <error27@gmail.com>
      Signed-off-by: NEric Van Hensbergen <ericvh@gmail.com>
      
      ------------------------------------------------------------------------------
      Download Intel&#174; Parallel Studio Eval
      Try the new software tools for yourself. Speed compiling, find bugs
      proactively, and fine-tune applications for parallel performance.
      See why Intel Parallel Studio got high marks during beta.
      http://p.sf.net/sfu/intel-sw-dev
      85a770a8
    • C
      Btrfs: add check for changed leaves in setup_leaf_for_split · 109f6aef
      Chris Mason 提交于
      setup_leaf_for_split needs to drop the path and search again, and has
      checks to see if the item we want to split changed size.  But, it misses
      the case where the leaf changed and now has enough room for the item
      we want to insert.
      
      This adds an extra check to make sure the leaf really needs splitting
      before we call btrfs_split_leaf(), which keeps us from trying to split
      a leaf with a single item.
      
      btrfs_split_leaf() will blindly split the single item leaf, leaving us
      with one good leaf and one empty leaf and then a crash.
      Signed-off-by: NChris Mason <chris.mason@oracle.com>
      109f6aef
    • S
      Btrfs: create snapshot references in same commit as snapshot · 6bdb72de
      Sage Weil 提交于
      This creates the reference to a new snapshot in the same commit as the
      snapshot itself.  This avoids the need for a second commit in order for a
      snapshot to be persistent, and also avoids the problem of "leaking" a
      new snapshot tree root if the host crashes before the second commit takes
      place.
      
      It is not at all clear to me why it wasn't always done this way.  If there
      is still a reason for the two-stage {create,finish}_pending_snapshots()
      approach I'm missing something!  :)
      
      I've been running this for a couple weeks under pretty heavy usage (a few
      snapshots per minute) without obvious problems.
      Signed-off-by: NSage Weil <sage@newdream.net>
      Signed-off-by: NChris Mason <chris.mason@oracle.com>
      6bdb72de