13 Jan, 2011

13 commits


12 Jan, 2011

10 commits

  • * 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (89 commits)
    NFS fix the setting of exchange id flag
    NFS: Don't use vm_map_ram() in readdir
    NFSv4: Ensure continued open and lockowner name uniqueness
    NFS: Move cl_delegations to the nfs_server struct
    NFS: Introduce nfs_detach_delegations()
    NFS: Move cl_state_owners and related fields to the nfs_server struct
    NFS: Allow walking nfs_client.cl_superblocks list outside client.c
    pnfs: layout roc code
    pnfs: update nfs4_callback_recallany to handle layouts
    pnfs: add CB_LAYOUTRECALL handling
    pnfs: CB_LAYOUTRECALL xdr code
    pnfs: change lo refcounting to atomic_t
    pnfs: check that partial LAYOUTGET return is ignored
    pnfs: add layout to client list before sending rpc
    pnfs: serialize LAYOUTGET(openstateid)
    pnfs: layoutget rpc code cleanup
    pnfs: change how lsegs are removed from layout list
    pnfs: change layout state seqlock to a spinlock
    pnfs: add prefix to struct pnfs_layout_hdr fields
    pnfs: add prefix to struct pnfs_layout_segment fields
    ...

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
    UDF: Close small mem leak in udf_find_entry()
    udf: Fix directory corruption after extent merging
    udf: Protect udf_file_aio_write from possible races
    udf: Remove unnecessary bkl usages
    udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution
    udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct
    udf: Remove BKL from free space counting functions
    udf: Call udf_add_free_space() for more blocks at once in udf_free_blocks()
    udf: Remove BKL from udf_put_super() and udf_remount_fs()
    udf: Protect default inode credentials by rwlock
    udf: Protect all modifications of LVID with s_alloc_mutex
    udf: Move handling of uniqueID into a helper function and protect it by a s_alloc_mutex
    udf: Remove BKL from udf_update_inode
    udf: Convert UDF_SB(sb)->s_flags to use bitops
    fs/udf: Add printf format/argument verification
    fs/udf: Use vzalloc

    (Evil merge: this also removes the BKL dependency from the Kconfig file)

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (44 commits)
    ext4: fix trimming starting with block 0 with small blocksize
    ext4: revert buggy trim overflow patch
    ext4: don't pass entire map to check_eofblocks_fl
    ext4: fix memory leak in ext4_free_branches
    ext4: remove ext4_mb_return_to_preallocation()
    ext4: flush the i_completed_io_list during ext4_truncate
    ext4: add error checking to calls to ext4_handle_dirty_metadata()
    ext4: fix trimming of a single group
    ext4: fix uninitialized variable in ext4_register_li_request
    ext4: dynamically allocate the jbd2_inode in ext4_inode_info as necessary
    ext4: drop i_state_flags on architectures with 64-bit longs
    ext4: reorder ext4_inode_info structure elements to remove unneeded padding
    ext4: drop ec_type from the ext4_ext_cache structure
    ext4: use ext4_lblk_t instead of sector_t for logical blocks
    ext4: replace i_delalloc_reserved_flag with EXT4_STATE_DELALLOC_RESERVED
    ext4: fix 32bit overflow in ext4_ext_find_goal()
    ext4: add more error checks to ext4_mkdir()
    ext4: ext4_ext_migrate should use NULL not 0
    ext4: Use ext4_error_file() to print the pathname to the corrupted inode
    ext4: use IS_ERR() to check for errors in ext4_error_file
    ...

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
    ext2: Resolve 'dereferencing pointer to incomplete type' when enabling EXT2_XATTR_DEBUG
    ext3: Remove redundant unlikely()
    ext2: Remove redundant unlikely()
    ext3: speed up file creates by optimizing rec_len functions
    ext2: speed up file creates by optimizing rec_len functions
    ext3: Add more journal error check
    ext3: Add journal error check in resize.c
    quota: Use %pV and __attribute__((format (printf in __quota_error and fix fallout
    ext3: Add FITRIM handling
    ext3: Add batched discard support for ext3
    ext3: Add journal error check into ext3_rename()
    ext3: Use search_dirblock() in ext3_dx_find_entry()
    ext3: Avoid uninitialized memory references with a corrupted htree directory
    ext3: Return error code from generic_check_addressable
    ext3: Add journal error check into ext3_delete_entry()
    ext3: Add error check in ext3_mkdir()
    fs/ext3/super.c: Use printf extension %pV
    fs/ext2/super.c: Use printf extension %pV
    ext3: don't update sb journal_devnum when RO dev

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
    fs/9p: Don't set dentry->d_op in create routines
    fs/9p: fix spelling typo
    fs/9p: TREADLINK bugfix
    net/9p: Use proper data types
    fs/9p: Simplify the .L create operation
    fs/9p: Move dotl inode operations into a seperate file
    fs/9p: fix menu presentation
    fs/9p: Fix the return error on default acl removal
    fs/9p: Remove unnecessary semicolons

    Linus Torvalds
     
  • When s_first_data_block is not zero (which happens e.g. when block size is 1KB)
    and trim ioctl is called to start trimming from block 0, the math in
    ext4_get_group_no_and_offset() overflows. The overall result is that ioctl
    returns EINVAL which is kind of unexpected and we probably don't want
    userspace tools to bother with internal details of filesystem structure.
    So just silently increase starting offset (and shorten length) when starting
    block is below s_first_data_block.

    CC: Lukas Czerner
    Signed-off-by: Jan Kara
    Signed-off-by: "Theodore Ts'o"

    Jan Kara
     
  • This reverts commit 4f531501e44: ext4: fix possible overflow in
    ext4_trim_fs()

    Signed-off-by: "Theodore Ts'o"

    Theodore Ts'o
     
  • * 'for-linus-merged' of git://oss.sgi.com/xfs/xfs: (47 commits)
    xfs: convert grant head manipulations to lockless algorithm
    xfs: introduce new locks for the log grant ticket wait queues
    xfs: convert log grant heads to atomic variables
    xfs: convert l_tail_lsn to an atomic variable.
    xfs: convert l_last_sync_lsn to an atomic variable
    xfs: make AIL tail pushing independent of the grant lock
    xfs: use wait queues directly for the log wait queues
    xfs: combine grant heads into a single 64 bit integer
    xfs: rework log grant space calculations
    xfs: fact out common grant head/log tail verification code
    xfs: convert log grant ticket queues to list heads
    xfs: use AIL bulk delete function to implement single delete
    xfs: use AIL bulk update function to implement single updates
    xfs: remove all the inodes on a buffer from the AIL in bulk
    xfs: consume iodone callback items on buffers as they are processed
    xfs: reduce the number of AIL push wakeups
    xfs: bulk AIL insertion during transaction commit
    xfs: clean up xfs_ail_delete()
    xfs: Pull EFI/EFD handling out from under the AIL lock
    xfs: fix EFI transaction cancellation.
    ...

    Linus Torvalds
     
  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (22 commits)
    MAINTAINERS: Update Joel Becker's email address
    ocfs2: Remove unused truncate function from alloc.c
    ocfs2/cluster: dereferencing before checking in nst_seq_show()
    ocfs2: fix build for OCFS2_FS_STATS not enabled
    ocfs2/cluster: Show o2net timing statistics
    ocfs2/cluster: Track process message timing stats for each socket
    ocfs2/cluster: Track send message timing stats for each socket
    ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_container
    ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking
    ocfs2: Add DEBUG_FS dependency
    ocfs2/dlm: Hard code the values for enums
    ocfs2/dlm: Minor cleanup
    ocfs2/dlm: Cleanup dlmdebug.c
    ocfs2: Release buffer_head in case of error in ocfs2_double_lock.
    ocfs2/cluster: Pin the local node when o2hb thread starts
    ocfs2/cluster: Show pin state for each o2hb region
    ocfs2/cluster: Pin/unpin o2hb regions
    ocfs2/cluster: Remove dropped region from o2hb quorum region bitmap
    ocfs2/cluster: Pin the remote node item in configfs
    ocfs2/dlm: make existing convertion precedent over new lock
    ...

    Linus Torvalds
     
  • Indicate support for referrals. Do not set any PNFS roles. Check the flags
    returned by the server for validity. Do not use exchange flags from an old
    client ID instance when recovering a client ID.

    Update the EXCHID4_FLAG_XXX set to RFC 5661.

    Signed-off-by: Andy Adamson
    Signed-off-by: Trond Myklebust

    Andy Adamson
     

11 Jan, 2011

17 commits

  • We do set dentry->d_op in lookup even in case of EOENT entries.
    That implies we should have dentry->d_op already set when
    create/mkdir/mknod/link/symlink routines are called

    Signed-off-by: Aneesh Kumar K.V
    Signed-off-by: Eric Van Hensbergen

    Aneesh Kumar K.V
     
  • introduced a typo somehow during a hand merge

    Reported by: Aneesh Kumar K.V
    Signed-off-by: Eric Van Hensbergen

    Eric Van Hensbergen
     
  • Remove v9fs_vfs_readlink_dotl function and use generic_readlink. Update
    v9fs_vfs_follow_link_dotl function to accommodate this change

    Signed-off-by: M. Mohan Kumar
    Reported-by: Dr. David Alan Gilbert
    Signed-off-by: Venkateswararao Jujjuri
    Signed-off-by: Eric Van Hensbergen

    M. Mohan Kumar
     
  • Signed-off-by: Aneesh Kumar K.V
    Signed-off-by: Venkateswararao Jujjuri
    Signed-off-by: Eric Van Hensbergen

    Aneesh Kumar K.V
     
  • Source Code Reorganization

    Signed-off-by: Aneesh Kumar K.V
    Signed-off-by: Venkateswararao Jujjuri
    Signed-off-by: Eric Van Hensbergen

    Aneesh Kumar K.V
     
  • Make the 9P_FS kconfig options subordinate to the 9P_FS kconfig symbol
    in the menu presentation instead of them all being at the same level.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Eric Van Hensbergen

    Randy Dunlap
     
  • If we don't have default ACL, then trying to remove
    default acl on a file should return 0.

    Signed-off-by: Aneesh Kumar K.V
    Signed-off-by: Venkateswararao Jujjuri

    Aneesh Kumar K.V
     
  • Signed-off-by: Joe Perches
    Signed-off-by: Eric Van Hensbergen

    Joe Perches
     
  • This merge pulls the XFS master branch into the latest Linus master.
    This results in a merge conflict whose best fix is not obvious.
    I manually fixed the conflict, in "fs/xfs/xfs_iget.c".

    Dave Chinner had done work that resulted in RCU freeing of inodes
    separate from what Nick Piggin had done, and their results differed
    slightly in xfs_inode_free(). The fix updates Nick's call_rcu()
    with the use of VFS_I(), while incorporating needed updates to some
    XFS inode fields implemented in Dave's series. Dave's RCU callback
    function has also been removed.

    Signed-off-by: Alex Elder

    Alex Elder
     
  • …/gregkh/driver-core-2.6

    * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
    driver core: Document that device_rename() is only for networking
    sysfs: remove useless test from sysfs_merge_group
    driver-core: merge private parts of class and bus
    driver core: fix whitespace in class_attr_string

    Linus Torvalds
     
  • Conflicts:
    fs/nfs/nfs2xdr.c
    fs/nfs/nfs3xdr.c
    fs/nfs/nfs4xdr.c

    Trond Myklebust
     
  • vm_map_ram() is not available on NOMMU platforms, and causes trouble
    on incoherrent architectures such as ARM when we access the page data
    through both the direct and the virtual mapping.

    The alternative is to use the direct mapping to access page data
    for the case when we are not crossing a page boundary, but to copy
    the data into a linear scratch buffer when we are accessing data
    that spans page boundaries.

    Signed-off-by: Trond Myklebust
    Tested-by: Marc Kleine-Budde
    Cc: stable@kernel.org [2.6.37]

    Trond Myklebust
     
  • When I enable EXT2_XATTR_DEBUG in fs/ext2/xattr.c I get a build error stating
    the following:

    CC fs/ext2/xattr.o
    fs/ext2/xattr.c: In function 'ext2_xattr_cache_insert':
    fs/ext2/xattr.c:841: error: dereferencing pointer to incomplete type
    fs/ext2/xattr.c:846: error: dereferencing pointer to incomplete type
    make[2]: *** [fs/ext2/xattr.o] Error 1
    make[1]: *** [fs/ext2] Error 2
    make: *** [fs] Error 2

    These lines reference ext2_xattr_cache->c_entry_count which is defined
    in struct mb_cache. struct mb_cache is currently only defined in fs/mbcache.c.
    Moving struct mb_cache definition to include/linux/mbcache.h to resolve the
    issue.

    Signed-off-by: Josh Hunt
    Signed-off-by: Jan Kara

    Josh Hunt
     
  • IS_ERR() already implies unlikely(), so it can be omitted here.

    Signed-off-by: Tobias Klauser
    Signed-off-by: Jan Kara

    Tobias Klauser
     
  • IS_ERR() already implies unlikely(), so it can be omitted here.

    Signed-off-by: Tobias Klauser
    Signed-off-by: Jan Kara

    Tobias Klauser
     
  • The addition of 64k block capability in the rec_len_from_disk
    and rec_len_to_disk functions added a bit of math overhead which
    slows down file create workloads needlessly when the architecture
    cannot even support 64k blocks, thanks to page size limits.

    Similar changes already exist in the ext4 codebase.

    The directory entry checking can also be optimized a bit
    by sprinkling in some unlikely() conditions to move the
    error handling out of line.

    bonnie++ sequential file creates on a 512MB ramdisk speeds up
    from about 77,000/s to about 82,000/s, about a 6% improvement.

    Signed-off-by: Eric Sandeen
    Signed-off-by: Jan Kara

    Eric Sandeen
     
  • The addition of 64k block capability in the rec_len_from_disk
    and rec_len_to_disk functions added a bit of math overhead which
    slows down file create workloads needlessly when the architecture
    cannot even support 64k blocks, thanks to page size limits.

    The directory entry checking can also be optimized a bit
    by sprinkling in some unlikely() conditions to move the
    error handling out of line.

    bonnie++ sequential file creates on a 512MB ramdisk speeds up
    from about 2200/s to about 2500/s, about a 14% improvement.

    Signed-off-by: Eric Sandeen
    Signed-off-by: Jan Kara

    Eric Sandeen