| commit | 5dbc746960b5cd62c558cd6663697afd41f59d39 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 25 09:06:04 2013 -1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 25 09:06:04 2013 -1000 |
| tree | 41486216b93c026c92743d64e16295528ac68c88 | |
| parent | f97f7d2d27bf092b40babda9ded29cc85cf77eec [diff] | |
| parent | 14c14414d157ea851119c96c61a17306a2b4a035 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse Pull fuse bugfix from Miklos Szeredi: "This fixes a race between fallocate() and truncate()" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: hold i_mutex in fuse_file_fallocate()