1. 26 Jan, 2008 32 commits
  2. 25 Jan, 2008 8 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 9b73e76f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
        [SCSI] usbstorage: use last_sector_bug flag universally
        [SCSI] libsas: abstract STP task status into a function
        [SCSI] ultrastor: clean up inline asm warnings
        [SCSI] aic7xxx: fix firmware build
        [SCSI] aacraid: fib context lock for management ioctls
        [SCSI] ch: remove forward declarations
        [SCSI] ch: fix device minor number management bug
        [SCSI] ch: handle class_device_create failure properly
        [SCSI] NCR5380: fix section mismatch
        [SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
        [SCSI] IB/iSER: add logical unit reset support
        [SCSI] don't use __GFP_DMA for sense buffers if not required
        [SCSI] use dynamically allocated sense buffer
        [SCSI] scsi.h: add macro for enclosure bit of inquiry data
        [SCSI] sd: add fix for devices with last sector access problems
        [SCSI] fix pcmcia compile problem
        [SCSI] aacraid: add Voodoo Lite class of cards.
        [SCSI] aacraid: add new driver features flags
        [SCSI] qla2xxx: Update version number to 8.02.00-k7.
        [SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
        ...
      9b73e76f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 50d9a126
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        [CRYPTO] hifn795x: Disallow built-in hifn795x when HW_RANDOM is m
      50d9a126
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · 29bd17af
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (31 commits)
        ocfs2: clean up bh null checks
        ocfs2: document access rules for blocked_lock_list
        configfs: file.c fix possible recursive locking
        configfs: dir.c fix possible recursive locking
        configfs: Remove EXPERIMENTAL
        ocfs2: bump version number
        ocfs2/dlm: Clear joining_node on hearbeat node down
        ocfs2: convert byte order of constant instead of variable
        ocfs2: Update default cluster timeouts
        ocfs2: printf fixes
        ocfs2: Use generic_file_llseek
        ocfs2: Safer read_inline_data()
        ocfs2: Silence false lockdep warnings
        [PATCH 2/2] ocfs2: cluster aware flock()
        [PATCH 1/2] ocfs2: add flock lock type
        ocfs2: Local alloc window size changeable via mount option
        ocfs2: Support commit= mount option
        ocfs2: Add missing permission checks
        [PATCH 2/2] ocfs2: Implement group add for online resize
        [PATCH 1/2] ocfs2: Add group extend for online resize
        ...
      29bd17af
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 2ba14a01
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (67 commits)
        fix drivers/ata/sata_fsl.c double-decl
        [libata] Prefer SCSI_SENSE_BUFFERSIZE to sizeof()
        pata_legacy: Merge winbond support
        ata_generic: Cenatek support
        pata_winbond: error return
        pata_serverworks: Fix cable types and cosmetics
        pata_mpc52xx: remove un-needed assignment
        libata: fix off-by-one in error categorization
        ahci: factor out AHCI enabling and enable AHCI before reading CAP
        ata_piix: implement SIDPR SCR access
        ata_piix: convert to prepare - activate initialization
        libata: factor out ata_pci_activate_sff_host() from ata_pci_one()
        [libata] Prefer SCSI_SENSE_BUFFERSIZE to sizeof()
        pata_legacy: resychronize with upstream changes and resubmit
        [libata] pata_legacy: typo fix
        [libata] pata_winbond: update for new ->data_xfer hook
        pata_pcmcia: convert to new data_xfer prototype
        libata annotations and fixes
        libata: use dev_driver_string() instead of "libata" in libata-sff.c
        ata_piix: kill unused constants and flags
        ...
      2ba14a01
    • Mark Fasheh's avatar
      ocfs2: clean up bh null checks · 2fe5c1d7
      Mark Fasheh authored
      If we know a buffer_head is non-null, then brelse() is unnecessary and
      put_bh() can be used instead. Also, an explicit check for NULL is
      unnecessary when using brelse(). This patch only covers buffer_head_io.c and
      resize.c, which have recently added code which exhibits this problem.
      Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
      2fe5c1d7
    • Mark Fasheh's avatar
      ocfs2: document access rules for blocked_lock_list · 7ec373cf
      Mark Fasheh authored
      ocfs2_super->blocked_lock_list and ocfs2_super->blocked_lock_count have some
      usage restrictions which aren't immediately obvious to anyone reading the
      code. It's a good idea to document this so that we avoid making costly
      mistakes in the future.
      Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
      7ec373cf
    • Joonwoo Park's avatar
      configfs: file.c fix possible recursive locking · 116ba5d5
      Joonwoo Park authored
      configfs_register_subsystem() with default_groups triggers recursive locking.
      it seems that mutex_lock_nested is needed.
      
      =============================================
      [ INFO: possible recursive locking detected ]
      2.6.24-rc6 #145
      ---------------------------------------------
      swapper/1 is trying to acquire lock:
       (&sb->s_type->i_mutex_key#3){--..}, at: [<c40c9a9e>] configfs_add_file+0x2e/0x70
      
      but task is already holding lock:
       (&sb->s_type->i_mutex_key#3){--..}, at: [<c40ca985>] configfs_register_subsystem+0x55/0x130
      
      other info that might help us debug this:
      1 lock held by swapper/1:
       #0:  (&sb->s_type->i_mutex_key#3){--..}, at: [<c40ca985>] configfs_register_subsystem+0x55/0x130
      
      stack backtrace:
      Pid: 1, comm: swapper Not tainted 2.6.24-rc6 #145
       [<c40053ba>] show_trace_log_lvl+0x1a/0x30
       [<c4005e82>] show_trace+0x12/0x20
       [<c400687e>] dump_stack+0x6e/0x80
       [<c404ec72>] __lock_acquire+0xe62/0x1120
       [<c404efb2>] lock_acquire+0x82/0xa0
       [<c43fda88>] mutex_lock_nested+0x98/0x2e0
       [<c40c9a9e>] configfs_add_file+0x2e/0x70
       [<c40c9b0c>] configfs_create_file+0x2c/0x40
       [<c40ca639>] configfs_attach_item+0x139/0x220
       [<c40ca734>] configfs_attach_group+0x14/0x140
       [<c40ca7e9>] configfs_attach_group+0xc9/0x140
       [<c40ca9f6>] configfs_register_subsystem+0xc6/0x130
       [<c45c8186>] init_netconsole+0x2b6/0x300
       [<c45a75f2>] kernel_init+0x142/0x320
       [<c4004fb3>] kernel_thread_helper+0x7/0x14
       =======================
      Signed-off-by: default avatarJoonwoo Park <joonwpark81@gmail.com>
      Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
      Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
      116ba5d5
    • Joonwoo Park's avatar
      configfs: dir.c fix possible recursive locking · ba611edf
      Joonwoo Park authored
      configfs_register_subsystem() with default_groups triggers recursive locking.
      it seems that mutex_lock_nested is needed.
      
      =============================================
      [ INFO: possible recursive locking detected ]
      2.6.24-rc6 #141
      ---------------------------------------------
      swapper/1 is trying to acquire lock:
       (&sb->s_type->i_mutex_key#3){--..}, at: [<c40ca76f>] configfs_attach_group+0x4f/0x190
      
      but task is already holding lock:
       (&sb->s_type->i_mutex_key#3){--..}, at: [<c40ca9d5>] configfs_register_subsystem+0x55/0x130
      
      other info that might help us debug this:
      1 lock held by swapper/1:
       #0:  (&sb->s_type->i_mutex_key#3){--..}, at: [<c40ca9d5>] configfs_register_subsystem+0x55/0x130
      
      stack backtrace:
      Pid: 1, comm: swapper Not tainted 2.6.24-rc6 #141
       [<c40053ba>] show_trace_log_lvl+0x1a/0x30
       [<c4005e82>] show_trace+0x12/0x20
       [<c400687e>] dump_stack+0x6e/0x80
       [<c404ec72>] __lock_acquire+0xe62/0x1120
       [<c404efb2>] lock_acquire+0x82/0xa0
       [<c43fdad8>] mutex_lock_nested+0x98/0x2e0
       [<c40ca76f>] configfs_attach_group+0x4f/0x190
       [<c40caa46>] configfs_register_subsystem+0xc6/0x130
       [<c45c8186>] init_netconsole+0x2b6/0x300
       [<c45a75f2>] kernel_init+0x142/0x320
       [<c4004fb3>] kernel_thread_helper+0x7/0x14
       =======================
      Signed-off-by: default avatarJoonwoo Park <joonwpark81@gmail.com>
      Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
      Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
      ba611edf