summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/acl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-05 19:31:29 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-05 19:31:29 +0100
commit9576c2f2934eb5839a468ae156418ef595d5fec6 (patch)
tree1dd64350de1830f639ac8b46bd0183a9fd7febc9 /fs/ocfs2/acl.c
parentMerge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentlocks: cleanup posix_lock_inode_wait and flock_lock_inode_wait (diff)
downloadlinux-9576c2f2934eb5839a468ae156418ef595d5fec6.tar.xz
linux-9576c2f2934eb5839a468ae156418ef595d5fec6.zip
Merge tag 'locks-v4.4-1' of git://git.samba.org/jlayton/linux
Pull file locking updates from Jeff Layton: "The largest series of changes is from Ben who offered up a set to add a new helper function for setting locks based on the type set in fl_flags. Dmitry also send in a fix for a potential race that he found with KTSAN" * tag 'locks-v4.4-1' of git://git.samba.org/jlayton/linux: locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait Move locks API users to locks_lock_inode_wait() locks: introduce locks_lock_inode_wait() locks: Use more file_inode and fix a comment fs: fix data races on inode->i_flctx locks: change tracepoint for generic_add_lease
Diffstat (limited to 'fs/ocfs2/acl.c')
0 files changed, 0 insertions, 0 deletions