11 Nov, 2011

2 commits


08 Nov, 2011

1 commit

  • Fix a regression that was introduced by commit
    0c2e53f11a6dae9e3af5f50f5ad0382e7c3e0cfa (NFS: Remove the unused
    "lookupfh()" version of nfs4_proc_lookup()).

    In the case where the lookup gets an NFS4ERR_MOVED, we want to return
    the result of nfs4_get_referral(). Instead, that value is getting
    clobbered by the call to nfs4_handle_exception()...

    Reported-by: Tigran Mkrtchyan
    Tested-by: Tigran Mkrtchyan
    Signed-off-by: Trond Myklebust

    Trond Myklebust
     

05 Nov, 2011

18 commits

  • ...a remove a set of forward declarations.

    Signed-off-by: Jeff Layton
    Signed-off-by: Trond Myklebust

    Jeff Layton
     
  • commit d953126 changed how nfs_atomic_lookup handles an -EISDIR return
    from an OPEN call. Prior to that patch, that caused the client to fall
    back to doing a normal lookup. When that patch went in, the code began
    returning that error to userspace. The d_revalidate codepath however
    never had the corresponding change, so it was still possible to end up
    with a NULL ctx->state pointer after that.

    That patch caused a regression. When we attempt to open a directory that
    does not have a cached dentry, that open now errors out with EISDIR. If
    you attempt the same open with a cached dentry, it will succeed.

    Fix this by reverting the change in nfs_atomic_lookup and allowing
    attempts to open directories to fall back to a normal lookup

    Also, add a NFSv4-specific f_ops->open routine that just returns
    -ENOTDIR. This should never be called if things are working properly,
    but if it ever is, then the dprintk may help in debugging.

    To facilitate this, a new file_operations field is also added to the
    nfs_rpc_ops struct.

    Cc: stable@kernel.org
    Signed-off-by: Jeff Layton
    Signed-off-by: Trond Myklebust

    Jeff Layton
     
  • * 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile:
    arch/tile: factor out header
    arch/tile: add the headers to the set of installed kernel headers
    arch/tile: avoid exporting a symbol no longer used by gcc
    arch/tile: avoid ISO namespace pollution with

    Linus Torvalds
     
  • * 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (25 commits)
    nfs: set vs_hidden on nfs4_callback_version4 (try #2)
    pnfs-obj: Support for RAID5 read-4-write interface.
    pnfs-obj: move to ore 03: Remove old raid engine
    pnfs-obj: move to ore 02: move to ORE
    pnfs-obj: move to ore 01: ore_layout & ore_components
    pnfs-obj: Rename objlayout_io_state => objlayout_io_res
    pnfs-obj: Get rid of objlayout_{alloc,free}_io_state
    pnfs-obj: Return PNFS_NOT_ATTEMPTED in case of read/write_pagelist
    pnfs-obj: Remove redundant EOF from objlayout_io_state
    nfs: Remove unused variable from write.c
    nfs: Fix unused variable warning from file.c
    NFS: Remove no-op less-than-zero checks on unsigned variables.
    NFS: Clean up nfs4_xdr_dec_secinfo()
    NFS: Fix documenting comment for nfs_create_request()
    NFS4: fix cb_recallany decode error
    nfs4: serialize layoutcommit
    SUNRPC: remove rpcbind clients destruction on module cleanup
    SUNRPC: remove rpcbind clients creation during service registering
    NFSd: call svc rpcbind cleanup explicitly
    SUNRPC: cleanup service destruction
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
    IB/qib: Fix panic in RC error flushing logic
    IB/iser: DMA unmap TX bufs used for iSCSI/iSER headers
    IB/iser: Use separate buffers for the login request/response
    IB/mthca: Fix buddy->num_free allocation size

    Linus Torvalds
     
  • Remove 'as' for as is no longer supported, and we can not use
    'elevator=as' any more.

    Signed-off-by: Wang Sheng-Hui
    Signed-off-by: Randy Dunlap
    Cc: Jens Axboe
    Signed-off-by: Linus Torvalds

    Wang Sheng-Hui
     
  • Fix a typo (duplicated word) in Documentation/leds/leds-class.txt

    Signed-off-by: Bryan Wu
    Acked-by: Richard Purdie
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Bryan Wu
     
  • Removed the email for support and fixes for orphaned ip2 driver.

    Signed-off-by: Marcos Paulo de Souza
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Marcos Paulo Souza
     
  • Removed the reference of Roman Zippel, last maintainer, of orphaned
    HFS filesystem.

    Signed-off-by: Marcos Paulo de Souza
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Marcos Paulo de Souza
     
  • After commit 38829dc9d7b4 ("Documentation/CodingStyle: flesh out if-else
    examples") highlight that if _only_one_ branch of a conditional
    statement is a single statement, then braces are to be used on both
    branches.

    Signed-off-by: Antonio Ospite
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Antonio Ospite
     
  • Fixes the path to find the source files of the inotify subsystem.

    Signed-off-by: Marcos Paulo de Souza
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Marcos Paulo de Souza
     
  • This adds minor grammatical fixes to the description of the keys in the
    thinkpad-acpi documentation.

    Signed-off-by: Kumar Appaiah
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Kumar Appaiah
     
  • - ns cgroup has been removed.
    - it's true moving a task to another cgroup can fail.

    Signed-off-by: Li Zefan
    Acked-by: Paul Menage
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Li Zefan
     
  • Roland Dreier
     
  • The following panic can occur when flushing a QP:

    RIP: 0010:[] [] qib_send_complete+0x3b/0x190 [ib_qib]
    RSP: 0018:ffff8803cdc6fc90 EFLAGS: 00010046
    RAX: 0000000000000000 RBX: ffff8803d84ba000 RCX: 0000000000000000
    RDX: 0000000000000005 RSI: ffffc90015a53430 RDI: ffff8803d84ba000
    RBP: ffff8803cdc6fce0 R08: ffff8803cdc6fc90 R09: 0000000000000001
    R10: 00000000ffffffff R11: 0000000000000000 R12: ffff8803d84ba0c0
    R13: ffff8803d84ba5cc R14: 0000000000000800 R15: 0000000000000246
    FS: 0000000000000000(0000) GS:ffff880036600000(0000) knlGS:0000000000000000
    CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
    CR2: 0000000000000034 CR3: 00000003e44f9000 CR4: 00000000000406f0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process qib/0 (pid: 1350, threadinfo ffff8803cdc6e000, task ffff88042728a100)
    Stack:
    53544c5553455201 0000000100000005 0000000000000000 ffff8803d84ba000
    0000000000000000 0000000000000000 0000000000000000 0000000000000000
    0000000000000000 0000000000000001 ffff8803cdc6fd30 ffffffffa0165d7a
    Call Trace:
    [] qib_make_rc_req+0x36a/0xe80 [ib_qib]
    [] ? qib_make_rc_req+0x0/0xe80 [ib_qib]
    [] qib_do_send+0xf3/0xb60 [ib_qib]
    [] ? thread_return+0x4e/0x777
    [] ? qib_do_send+0x0/0xb60 [ib_qib]
    [] worker_thread+0x170/0x2a0
    [] ? autoremove_wake_function+0x0/0x40
    [] ? worker_thread+0x0/0x2a0
    [] kthread+0x96/0xa0
    [] child_rip+0xa/0x20
    [] ? kthread+0x0/0xa0
    [] ? child_rip+0x0/0x20
    RIP [] qib_send_complete+0x3b/0x190 [ib_qib]

    The RC error state flush logic in qib_make_rc_req() could return all
    of the acked wqes and potentially have emptied the queue. It would
    then unconditionally try return a flush completion via
    qib_send_complete() for an invalid wqe, or worse a valid one that is
    not queued. The panic results when the completion code tries to
    maintain an MR reference count for a NULL MR.

    This fix modifies logic to only send one completion per
    qib_make_rc_req() call and changing the completion status from
    IB_WC_SUCCESS to IB_WC_WR_FLUSH_ERR as the completions progress.

    The outer loop will call as many times as necessary to flush the queue.

    Reviewed-by: Ram Vepa
    Signed-off-by: Mike Marciniszyn
    Signed-off-by: Roland Dreier

    Mike Marciniszyn
     
  • * 'process_vm' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
    [IA64] Wire up cross memory attach syscalls

    Linus Torvalds
     
  • The current driver never does DMA unmapping on these buffers. Fix that
    by adding DMA unmapping to the task cleanup callback, and DMA mapping to
    the task init function (drop the headers_initialized micro-optimization).

    Signed-off-by: Or Gerlitz
    Signed-off-by: Roland Dreier

    Or Gerlitz
     
  • The driver counted on the transactional nature of iSCSI login/text
    flows and used the same buffer for both the request and the response.
    We also went further and did DMA mapping only once, with
    DMA_FROM_DEVICE, which violates the DMA mapping API. Fix that by
    using different buffers, one for requests and one for responses, and
    use the correct DMA mapping direction for each.

    Signed-off-by: Or Gerlitz
    Signed-off-by: Roland Dreier

    Or Gerlitz
     

04 Nov, 2011

19 commits

  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits)
    [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set
    [media] it913x [VER 1.07] Support for single ITE 9135 devices
    [media] Support for Terratec G1
    [media] cx25821: off by one in cx25821_vidioc_s_input()
    [media] media: tea5764: reconcile Kconfig symbol and macro
    [media] omap_vout: Add poll() support
    [media] omap3isp: preview: Add crop support on the sink pad
    [media] omap3isp: preview: Rename min/max input/output sizes defines
    [media] omap3isp: preview: Remove horizontal averager support
    [media] omap3isp: Report the ISP revision through the media controller API
    [media] omap3isp: ccdc: remove redundant operation
    [media] omap3isp: Fix memory leaks in initialization error paths
    [media] omap3isp: Add missing mutex_destroy() calls
    [media] omap3isp: Move *_init_entities() functions to the init/cleanup section
    [media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup()
    [media] MFC: Change MFC firmware binary name
    [media] vb2: add vb2_get_unmapped_area in vb2 core
    [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor
    [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
    [media] media: ov6650: stylistic improvements
    ...

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: (w83627ehf) Add support for the W83627UHG
    hwmon: (w83627ehf) Clean up probe function
    hwmon: (w83627ehf) Properly report PECI and AMD-SI sensor types
    hwmon: Use i2c_smbus_{read,write}_word_swapped
    hwmon: (smsc47b397) Fix checkpatch errors
    hwmon: (lm90) Make code more readable
    hwmon: (lm90) Fix warnings
    hwmon: (ibmaem) Avoid repeated memory allocations
    hwmon: (ibmaem) Make instance initializations independent
    hwmon: (ibmaem) Fix error paths
    hwmon: (lm73) Make detection less problematic
    hwmon: Avoid building drivers for powerpc that read/write ISA addresses

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
    ALSA: hda/realtek - Skip invalid digital out pins
    ALSA: hda/sigmatel - Automatically retrieve digital I/O widgets
    ALSA: hda - Remove unused variables
    ALSA: hda/realtek - Don't create alt-stream for capture when unnecessary
    ALSA: hda - Add support for 92HD65 / 92HD66 family of codecs
    ALSA: hda - Disable power-widget control for IDT 92HD83/93 as default
    ALSA: hda - Check NO_PRESENCE pincfg default bit
    ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK
    ASoC: Ensure the WM8962 oscillator and PLLs start up disabled
    ASoC: Ensure WM8962 PLL registers are reset
    ALSA: intel8x0 - Fix inclusion of kvm_para.h
    ALSA: hda_hwdep: Fix possible buffer overflow
    ASoC: Fix return value of wm5100_gpio_direction_out()
    ASoC: WM8904: Set `invert' bit for Capture Switch
    ASoC: Leave input audio data bit length settings untouched in wm8711_set_dai_fmt
    ASoC: wm8711: Fix wrong mask for setting input audio data bit length select
    ALSA: intel8x0: Improve performance in virtual environment
    ALSA: hdspm - Enable all firmware ranges for PCI MADI/AES cards
    ALSA: hdsp - Correct HDSP_VERSION_BIT constant, thus partly fixing RPM detection
    ALSA: hdspm - Fix MADI channel format in the status ioctl
    ...

    Linus Torvalds
     
  • * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
    dt: add empty of_machine_is_compatible
    ahci: add DT binding for Calxeda AHCI controller
    dt/platform: minor cleanup
    dt: add empty of_alias_get_id() for non-dt builds

    Linus Torvalds
     
  • This service should not be registered with or unregistered from rpcbind.

    Signed-off-by: Jeff Layton
    Signed-off-by: Trond Myklebust

    Jeff Layton
     
  • This is essentially a stripped down version of the W83627DHG. Noticeable
    difference is that it is still powered with +5V, as older models, even
    though the ADC resolution is 8 mV as newer models have.

    Thanks to Ulf Bruman (Saab Group) for doing all the testing.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • The probe function has grown pretty large, I think it's time for some
    cleanups, starting with these two simple ones:
    * Move temp3/in6 check for the W83667HG later in the function, where
    it is done for all other chip types.
    * Move temperature register setting to a separate function, to avoid
    code duplication.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • When temperature sources are PECI or AMD-SI agents, it makes no sense
    to report their type as diode or thermistor. Instead we must report
    their digital nature.

    Signed-off-by: Jean Delvare
    Cc: stable@kernel.org
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • Make use of the new i2c_smbus_{read,write}_word_swapped functions.
    This makes the driver code more compact and readable. It also ensures
    proper error handling.

    Signed-off-by: Jean Delvare
    Acked-by: Jonathan Cameron
    Acked-by: Guenter Roeck
    Cc: Dirk Eibach
    Cc: "Mark M. Hoffman"
    Cc: Guillaume Ligneul

    Jean Delvare
     
  • Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • Clean up the code to make it more readable:
    * Remove reg_ and new_ prefixes from variable names, they made the
    names longer, causing extra line breaks, while not adding much
    value.
    * Introduce struct device dev* = &client->dev in two functions, to
    avoid repeating client->dev everywhere in these functions.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • With some configuration option combinations, we get the following
    warnings:

    drivers/hwmon/lm90.c: In function 'lm90_detect':
    drivers/hwmon/lm90.c:1114: warning: 'chip_id' may be used uninitialized
    in this function
    drivers/hwmon/lm90.c:1114: warning: 'reg_config1' may be used
    uninitialized in this function
    drivers/hwmon/lm90.c:1114: warning: 'reg_convrate' may be used
    uninitialized in this function
    drivers/hwmon/lm90.c:1187: warning: 'reg_emerg2' may be used
    uninitialized in this function
    drivers/hwmon/lm90.c:1187: warning: 'reg_status2' may be used
    uninitialized in this function

    We can solve these easily by reading the register values first and
    checking for errors later. These errors should be very rare, even in
    the case of failed detection, so this change has no impact on
    performance. And this makes checkpatch.pl happier.

    Reported-by: Guenter Roeck
    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • Preallocate a buffer for the response to sensor reads, and reuse it
    for each read instead of allocating a new one each time. This should
    be faster and should also avoid memory fragmentation.

    Signed-off-by: Jean Delvare
    Acked-by: Darrick J. Wong
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • There is no good reason that I can see why the failure to initialize
    one instance should prevent other instances from being initialized.

    Signed-off-by: Jean Delvare
    Acked-by: Darrick J. Wong
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • I am under the impression that error paths in functions
    aem_init_aem1_inst() and aem_init_aem2_inst() are incorrect. In
    several cases, the function returns 0 on error, which I suspect is
    not intended. Fix this by properly tracking error codes.

    Signed-off-by: Jean Delvare
    Acked-by: Darrick J. Wong
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • Word reads can cause trouble with some I2C devices, so do as much
    detection as we can using only byte reads, and only use a word read in
    the end to confirm the positive match. Also properly handle read
    errors.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck
    Cc: Robert Casanova

    Jean Delvare
     
  • A modprobe of hwmon drivers that read/write ISA addresses on a powerpc results
    in a kernel Oops. These reads/writes are being done via the inb()/in_8() and
    outb()/out_8() macros.

    Prevent these drivers from being built for powerpc.

    Signed-off-by: Dean Nelson
    Signed-off-by: Jean Delvare

    Dean Nelson
     
  • The patch adds an empty function for non-dt build, so that
    drivers migrating to dt can save some '#ifdef CONFIG_OF'.

    v3: New patch

    Signed-off-by: Stephen Warren
    Signed-off-by: Grant Likely

    Stephen Warren
     
  • * git://git.samba.org/sfrench/cifs-2.6:
    cifs: Assume passwords are encoded according to iocharset (try #2)
    CIFS: Fix the VFS brlock cache usage in posix locking case
    [CIFS] Update cifs version to 1.76
    CIFS: Remove extra mutex_unlock in cifs_lock_add_if

    Linus Torvalds