Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Browse source

Pull ext2 fix from Jan Kara:
 "Fix for DAX on ext2"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext2: Add locking for DAX faults

...

This commit is contained in:

Linus Torvalds 2015-11-09 17:38:34 -08:00

parent 373ee21eec 5726b27b09

commit 123a28d8b5

4 changed files with 104 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

fs/ext2/ext2.h

View file

84

fs/ext2/file.c

View file

10

fs/ext2/inode.c

View file

3

fs/ext2/super.c

View file