• Linus Torvalds's avatar
    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 2ac232f3
    Linus Torvalds authored
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
      jbd: change the field "b_cow_tid" of struct journal_head from type unsigned to tid_t
      ext3.txt: update the links in the section "useful links" to the latest ones
      ext3: Fix data corruption in inodes with journalled data
      ext2: check xattr name_len before acquiring xattr_sem in ext2_xattr_get
      ext3: Fix compilation with -DDX_DEBUG
      quota: Remove unused declaration
      jbd: Use WRITE_SYNC in journal checkpoint.
      jbd: Fix oops in journal_remove_journal_head()
      ext3: Return -EINVAL when start is beyond the end of fs in ext3_trim_fs()
      ext3/ioctl.c: silence sparse warnings about different address spaces
      ext3/ext4 Documentation: remove bh/nobh since it has been deprecated
      ext3: Improve truncate error handling
      ext3: use proper little-endian bitops
      ext2: include fs.h into ext2_fs.h
      ext3: Fix oops in ext3_try_to_allocate_with_rsv()
      jbd: fix a bug of leaking jh->b_jcount
      jbd: remove dependency on __GFP_NOFAIL
      ext3: Convert ext3 to new truncate calling convention
      jbd: Add fixed tracepoints
      ext3: Add fixed tracepoints
    
    Resolve conflicts in fs/ext3/fsync.c due to fsync locking push-down and
    new fixed tracepoints.
    2ac232f3
file.c 2.21 KB