| commit | 1b506cfb6ae63f352643d6e208c85c1351547036 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 24 07:57:38 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 24 07:57:38 2011 -0700 |
| tree | 4556cbdb0443eadc4406778a45d7b771f0dc7be7 | |
| parent | 4cc4d24efce4672f9b0e7fa27963770ae602998f [diff] | |
| parent | a49fb4c3d035ab516507b31ec3bd49263caee14d [diff] |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd * 'for-linus' of git://git.open-osd.org/linux-open-osd: exofs: deprecate the commands pending counter exofs: Write sbi->s_nextid as part of the Create command exofs: Add option to mount by osdname exofs: Override read-ahead to align on stripe_size exofs: simple fsync race fix exofs: Optimize read_4_write exofs: Trivial: fix some indentation and debug prints exofs: Remove redundant unlikely()