1. 20 Jul, 2008 39 commits
  2. 17 Jul, 2008 1 commit
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · 5b664cb2
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
        [PATCH] ocfs2: fix oops in mmap_truncate testing
        configfs: call drop_link() to cleanup after create_link() failure
        configfs: Allow ->make_item() and ->make_group() to return detailed errors.
        configfs: Fix failing mkdir() making racing rmdir() fail
        configfs: Fix deadlock with racing rmdir() and rename()
        configfs: Make configfs_new_dirent() return error code instead of NULL
        configfs: Protect configfs_dirent s_links list mutations
        configfs: Introduce configfs_dirent_lock
        ocfs2: Don't snprintf() without a format.
        ocfs2: Fix CONFIG_OCFS2_DEBUG_FS #ifdefs
        ocfs2/net: Silence build warnings on sparc64
        ocfs2: Handle error during journal load
        ocfs2: Silence an error message in ocfs2_file_aio_read()
        ocfs2: use simple_read_from_buffer()
        ocfs2: fix printk format warnings with OCFS2_FS_STATS=n
        [PATCH 2/2] ocfs2: Instrument fs cluster locks
        [PATCH 1/2] ocfs2: Add CONFIG_OCFS2_FS_STATS config option
      5b664cb2