commit 886c81834884ed3df0d8cfc613d65441226786c8
author Linus Torvalds <torvalds@woody.linux-foundation.org> Sat Aug 11 16:01:34 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Sat Aug 11 16:01:34 2007 -0700
tree d3f6358a94e99bdc8d29acffe461d2ad33812057
parent dc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd
parent e0dceaf0a4b8c55076a4dbcba7ac8b05755f5cc6

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: set non-default s_time_gran during mount
  ocfs2: Retry sendpage() if it returns EAGAIN
  ocfs2: Fix rename/extend race
  [2.6 patch] ocfs2_insert_extent(): remove dead code
  ocfs2: Fix max offset calculations
  ocfs2: check ia_size limits in setattr
  ocfs2: Fix some casting errors related to file writes
  ocfs2: use s_maxbytes directly in ocfs2_change_file_space()
  ocfs2: Restrict inode changes in ocfs2_update_inode_atime()