diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-10 14:04:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-10 14:04:17 -0700 |
commit | 7ec62d421bdf29cb31101ae2689f7f3a9906289a (patch) | |
tree | e88e160e8339dc229b6c66cc6c34b8fcb8fb3dfb /kernel/futex.c | |
parent | e874a5fe3efabbdd87db635d34f3d086af288e55 (diff) | |
parent | 0b93a92be4cb48f22b78c95dea84089a1e72f860 (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF fixes from Jan Kara:
"Fixes for UDF handling of NFS handles and one fix for proper handling
of corrupted media"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
udf: saner calling conventions for udf_new_inode()
udf: fix the udf_iget() vs. udf_new_inode() races
udf: merge the pieces inserting a new non-directory object into directory
udf: Set i_generation field
udf: Properly detect stale inodes
udf: Make udf_read_inode() and udf_iget() return error
udf: Avoid infinite loop when processing indirect ICBs
udf: Fold udf_fill_inode() into __udf_read_inode()
udf: Avoid dir link count to go negative
Diffstat (limited to 'kernel/futex.c')
0 files changed, 0 insertions, 0 deletions