Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.33-git11
Commits on Mar 5, 2010
  1. @torvalds

    Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/penberg/slab-2.6
    
    * 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      SLUB: Fix per-cpu merge conflict
      failslab: add ability to filter slab caches
      slab: fix regression in touched logic
      dma kmalloc handling fixes
      slub: remove impossible condition
      slab: initialize unused alien cache entry as NULL at alloc_alien_cache().
      SLUB: Make slub statistics use this_cpu_inc
      SLUB: this_cpu: Remove slub kmem_cache fields
      SLUB: Get rid of dynamic DMA kmalloc cache allocation
      SLUB: Use this_cpu operations in slub
  2. @torvalds

    Merge branch 'nfs-for-2.6.34' of git://git.linux-nfs.org/projects/tro…

    torvalds authored
    …ndmy/nfs-2.6
    
    * 'nfs-for-2.6.34' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (44 commits)
      NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping
      NFS: Clean up nfs_sync_mapping
      NFS: Simplify nfs_wb_page()
      NFS: Replace __nfs_write_mapping with sync_inode()
      NFS: Simplify nfs_wb_page_cancel()
      NFS: Ensure inode is always marked I_DIRTY_DATASYNC, if it has unstable pages
      NFS: Run COMMIT as an asynchronous RPC call when wbc->for_background is set
      NFS: Reduce the number of unnecessary COMMIT calls
      NFS: Add a count of the number of unstable writes carried by an inode
      NFS: Cleanup - move nfs_write_inode() into fs/nfs/write.c
      nfs41 fix NFS4ERR_CLID_INUSE for exchange id
      NFS: Fix an allocation-under-spinlock bug
      SUNRPC: Handle EINVAL error returns from the TCP connect operation
      NFSv4.1: Various fixes to the sequence flag error handling
      nfs4: renewd renew operations should take/put a client reference
      nfs41: renewd sequence operations should take/put client reference
      nfs: prevent backlogging of renewd requests
      nfs: kill renewd before clearing client minor version
      NFS: Make close(2) asynchronous when closing NFS O_DIRECT files
      NFS: Improve NFS iostat byte count accuracy for writes
      ...
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/ericvh/v9fs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      fs/9p: Add hardlink support to .u extension
      9P2010.L handshake: .L protocol negotiation
      9P2010.L handshake: Remove "dotu" variable
      9P2010.L handshake: Add mount option
      9P2010.L handshake: Add VFS flags
      net/9p: Handle mount errors correctly.
      net/9p: Remove MAX_9P_CHAN limit
      net/9p: Add multi channel support.
  4. @torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jack/linux-fs-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (33 commits)
      quota: stop using QUOTA_OK / NO_QUOTA
      dquot: cleanup dquot initialize routine
      dquot: move dquot initialization responsibility into the filesystem
      dquot: cleanup dquot drop routine
      dquot: move dquot drop responsibility into the filesystem
      dquot: cleanup dquot transfer routine
      dquot: move dquot transfer responsibility into the filesystem
      dquot: cleanup inode allocation / freeing routines
      dquot: cleanup space allocation / freeing routines
      ext3: add writepage sanity checks
      ext3: Truncate allocated blocks if direct IO write fails to update i_size
      quota: Properly invalidate caches even for filesystems with blocksize < pagesize
      quota: generalize quota transfer interface
      quota: sb_quota state flags cleanup
      jbd: Delay discarding buffers in journal_unmap_buffer
      ext3: quota_write cross block boundary behaviour
      quota: drop permission checks from xfs_fs_set_xstate/xfs_fs_set_xquota
      quota: split out compat_sys_quotactl support from quota.c
      quota: split out netlink notification support from quota.c
      quota: remove invalid optimization from quota_sync_all
      ...
    
    Fixed trivial conflicts in fs/namei.c and fs/ufs/inode.c
  5. @torvalds

    Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/vir…

    torvalds authored
    …t/kvm/kvm
    
    * 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (145 commits)
      KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP
      KVM: VMX: Update instruction length on intercepted BP
      KVM: Fix emulate_sys[call, enter, exit]()'s fault handling
      KVM: Fix segment descriptor loading
      KVM: Fix load_guest_segment_descriptor() to inject page fault
      KVM: x86 emulator: Forbid modifying CS segment register by mov instruction
      KVM: Convert kvm->requests_lock to raw_spinlock_t
      KVM: Convert i8254/i8259 locks to raw_spinlocks
      KVM: x86 emulator: disallow opcode 82 in 64-bit mode
      KVM: x86 emulator: code style cleanup
      KVM: Plan obsolescence of kernel allocated slots, paravirt mmu
      KVM: x86 emulator: Add LOCK prefix validity checking
      KVM: x86 emulator: Check CPL level during privilege instruction emulation
      KVM: x86 emulator: Fix popf emulation
      KVM: x86 emulator: Check IOPL level during io instruction emulation
      KVM: x86 emulator: fix memory access during x86 emulation
      KVM: x86 emulator: Add Virtual-8086 mode of emulation
      KVM: x86 emulator: Add group9 instruction decoding
      KVM: x86 emulator: Add group8 instruction decoding
      KVM: do not store wqh in irqfd
      ...
    
    Trivial conflicts in Documentation/feature-removal-schedule.txt
  6. @kvaneesh @ericvh

    fs/9p: Add hardlink support to .u extension

    kvaneesh authored ericvh committed
    For regular file and directories we put the link
    count in th extension field in a tagged string format.
    
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  7. @sripathi @ericvh

    9P2010.L handshake: .L protocol negotiation

    sripathi authored ericvh committed
    This patch adds 9P2010.L protocol negotiation with the server
    
    Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  8. @sripathi @ericvh

    9P2010.L handshake: Remove "dotu" variable

    sripathi authored ericvh committed
    Removes 'dotu' variable and make everything dependent
    on 'proto_version' field.
    
    Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  9. @sripathi @ericvh

    9P2010.L handshake: Add mount option

    sripathi authored ericvh committed
    Add new mount V9FS mount option to specify protocol version
    
    This patch adds a new mount option to specify protocol version.
    With this option it is possible to use "-o version=" switch to
    specify 9P protocol version to use. Valid options for version
    are:
    9p2000
    9p2000.u
    9p2010.L
    
    Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  10. @sripathi @ericvh

    9P2010.L handshake: Add VFS flags

    sripathi authored ericvh committed
    Add 9P2000.u and 9P2010.L protocol flags to V9FS VFS
    
    This patch adds 9P2000.u and 9P2010.L protocol flags into V9FS VFS side code
    and removes the single flag used for 'extended'.
    
    Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  11. @kvaneesh @ericvh

    net/9p: Handle mount errors correctly.

    kvaneesh authored ericvh committed
    With this patch we have
    
    # mount -t 9p -o trans=virtio virtio2 /mnt/
    # mount -t 9p -o trans=virtio virtio2 /mnt/
    mount: virtio2 already mounted or /mnt/ busy
    mount: according to mtab, virtio2 is already mounted on /mnt
    # mount -t 9p -o trans=virtio virtio3 /mnt/ -o debug=0xfff
    mount: special device virtio3 does not exist
    
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  12. @kvaneesh @ericvh

    net/9p: Remove MAX_9P_CHAN limit

    kvaneesh authored ericvh committed
    Use a list to track the channel instead of statically
    allocated array
    
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  13. @kvaneesh @ericvh

    net/9p: Add multi channel support.

    kvaneesh authored ericvh committed
    This is needed for supporting multiple mount points.
    
    We can find out the device names to be used with mount by checking
    
    /sys/devices/virtio-pci/virtio*/device file
    
    if the device file have value 9 then the specific virtio device can
    be used for mounting.
    
    ex:
     #cat /sys/devices/virtio-pci/virtio1/device
     9
    
    now we can mount using
    # mount -t 9p -o trans=virtio virtio1  /mnt/
    
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  14. Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34

    Trond Myklebust authored
  15. NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping

    Trond Myklebust authored
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  16. NFS: Clean up nfs_sync_mapping

    Trond Myklebust authored
    Remove the redundant call to filemap_write_and_wait().
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  17. NFS: Simplify nfs_wb_page()

    Trond Myklebust authored
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  18. NFS: Replace __nfs_write_mapping with sync_inode()

    Trond Myklebust authored
    Now that we have correct COMMIT semantics in writeback_single_inode, we can
    reduce and simplify nfs_wb_all(). Also replace nfs_wb_nocommit() with a
    call to filemap_write_and_wait(), which doesn't need to hold the
    inode->i_mutex.
    
    With that done, we can eliminate nfs_write_mapping() altogether.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  19. NFS: Simplify nfs_wb_page_cancel()

    Trond Myklebust authored
    In all cases we should be able to just remove the request and call
    cancel_dirty_page().
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  20. NFS: Ensure inode is always marked I_DIRTY_DATASYNC, if it has unstab…

    Trond Myklebust authored
    …le pages
    
    Since nfs_scan_list() doesn't wait for locked pages, we have a race in
    which it is possible to end up with an inode that needs to send a COMMIT,
    but which does not have the I_DIRTY_DATASYNC flag set.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  21. NFS: Run COMMIT as an asynchronous RPC call when wbc->for_background …

    Trond Myklebust authored
    …is set
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Acked-by: Peter Zijlstra <peterz@infradead.org>
    Acked-by: Wu Fengguang <fengguang.wu@intel.com>
  22. NFS: Reduce the number of unnecessary COMMIT calls

    Trond Myklebust authored
    If the caller is doing a non-blocking flush, and there are still writebacks
    pending on the wire, we can usually defer the COMMIT call until those
    writes are done.
    
    Also ensure that we honour the wbc->nonblocking flag.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  23. NFS: Add a count of the number of unstable writes carried by an inode

    Trond Myklebust authored
    In order to know when we should do opportunistic commits of the unstable
    writes, when the VM is doing a background flush, we add a field to count
    the number of unstable writes.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  24. NFS: Cleanup - move nfs_write_inode() into fs/nfs/write.c

    Trond Myklebust authored
    The sole purpose of nfs_write_inode is to commit unstable writes, so
    move it into fs/nfs/write.c, and make nfs_commit_inode static.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  25. @torvalds

    Merge branch 'write_inode2' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds authored
    …nel/git/viro/vfs-2.6
    
    * 'write_inode2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      pass writeback_control to ->write_inode
      make sure data is on disk before calling ->write_inode
  26. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      Switch !O_CREAT case to use of do_last()
      Get rid of symlink body copying
      Finish pulling of -ESTALE handling to upper level in do_filp_open()
      Turn do_link spaghetty into a normal loop
      Unify exits in O_CREAT handling
      Kill is_link argument of do_last()
      Pull handling of LAST_BIND into do_last(), clean up ok: part in do_filp_open()
      Leave mangled flag only for setting nd.intent.open.flag
      Get rid of passing mangled flag to do_last()
      Don't pass mangled open_flag to finish_open()
      pull more into do_last()
      bail out with ELOOP earlier in do_link loop
      pull the common predecessors into do_last()
      postpone __putname() until after do_last()
      unroll do_last: loop in do_filp_open()
      Shift releasing nd->root from do_last() to its caller
      gut do_filp_open() a bit more (do_last separation)
      beginning to untangle do_filp_open()
  27. @torvalds

    x86: fix mtrr missing kernel-doc

    Randy Dunlap authored torvalds committed
    Fix missing kernel-doc notation in mtrr/main.c:
    
    Warning(arch/x86/kernel/cpu/mtrr/main.c:152): No description found for parameter 'info'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  28. @torvalds

    Merge branch 'perf-probes-for-linus-2' of git://git.kernel.org/pub/sc…

    torvalds authored
    …m/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-probes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: Issue at least one memory barrier in stop_machine_text_poke()
      perf probe: Correct probe syntax on command line help
      perf probe: Add lazy line matching support
      perf probe: Show more lines after last line
      perf probe: Check function address range strictly in line finder
      perf probe: Use libdw callback routines
      perf probe: Use elfutils-libdw for analyzing debuginfo
      perf probe: Rename probe finder functions
      perf probe: Fix bugs in line range finder
      perf probe: Update perf probe document
      perf probe: Do not show --line option without dwarf support
      kprobes: Add documents of jump optimization
      kprobes/x86: Support kprobes jump optimization on x86
      x86: Add text_poke_smp for SMP cross modifying code
      kprobes/x86: Cleanup save/restore registers
      kprobes/x86: Boost probes when reentering
      kprobes: Jump optimization sysctl interface
      kprobes: Introduce kprobes jump optimization
      kprobes: Introduce generic insn_slot framework
      kprobes/x86: Cleanup RELATIVEJUMP_INSTRUCTION to RELATIVEJUMP_OPCODE
  29. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      padata: Allocate the cpumask for the padata instance
      crypto: authenc - Move saved IV in front of the ablkcipher request
      crypto: hash - Fix handling of unaligned buffers
      crypto: authenc - Use correct ahash complete functions
      crypto: md5 - Set statesize
  30. @torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (36 commits)
      ext4: fix up rb_root initializations to use RB_ROOT
      ext4: Code cleanup for EXT4_IOC_MOVE_EXT ioctl
      ext4: Fix the NULL reference in double_down_write_data_sem()
      ext4: Fix insertion point of extent in mext_insert_across_blocks()
      ext4: consolidate in_range() definitions
      ext4: cleanup to use ext4_grp_offs_to_block()
      ext4: cleanup to use ext4_group_first_block_no()
      ext4: Release page references acquired in ext4_da_block_invalidatepages
      ext4: Fix ext4_quota_write cross block boundary behaviour
      ext4: Convert BUG_ON checks to use ext4_error() instead
      ext4: Use direct_IO_no_locking in ext4 dio read
      ext4: use ext4_get_block_write in buffer write
      ext4: mechanical rename some of the direct I/O get_block's identifiers
      ext4: make "offset" consistent in ext4_check_dir_entry()
      ext4: Handle non empty on-disk orphan link
      ext4: explicitly remove inode from orphan list after failed direct io
      ext4: fix error handling in migrate
      ext4: deprecate obsoleted mount options
      ext4: Fix fencepost error in chosing choosing group vs file preallocation.
      jbd2: clean up an assertion in jbd2_journal_commit_transaction()
      ...
  31. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
      Squashfs: get rid of obsolete definition in header file
      Squashfs: get rid of obsolete variable in struct squashfs_sb_info
      Squashfs: add decompressor entries for lzma and lzo
      Squashfs: add a decompressor framework
      Squashfs: factor out remaining zlib dependencies into separate wrapper file
      Squashfs: move zlib decompression wrapper code into a separate file
  32. pass writeback_control to ->write_inode

    Christoph Hellwig authored Al Viro committed
    This gives the filesystem more information about the writeback that
    is happening.  Trond requested this for the NFS unstable write handling,
    and other filesystems might benefit from this too by beeing able to
    distinguish between the different callers in more detail.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  33. make sure data is on disk before calling ->write_inode

    Christoph Hellwig authored Al Viro committed
    Similar to the fsync issue fixed a while ago in commit
    2daea67 we need to write for data to
    actually hit the disk before writing out the metadata to guarantee
    data integrity for filesystems that modify the inode in the data I/O
    completion path.  Currently XFS and NFS handle this manually, and AFS
    has a write_inode method that does nothing but waiting for data, while
    others are possibly missing out on this.
    
    Fortunately this change has a lot less impact than the fsync change
    as none of the write_inode methods starts data writeout of any form
    by itself.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  34. @plougher

    Squashfs: get rid of obsolete definition in header file

    plougher authored
    Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
  35. @plougher

    Squashfs: get rid of obsolete variable in struct squashfs_sb_info

    plougher authored
    Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Something went wrong with that request. Please try again.