diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 10:31:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 10:31:29 -0800 |
| commit | 9576c2f2934eb5839a468ae156418ef595d5fec6 (patch) | |
| tree | 1dd64350de1830f639ac8b46bd0183a9fd7febc9 /fs/cifs | |
| parent | 8e483ed1342a4ea45b70f0f33ac54eff7a33d918 (diff) | |
| parent | 616fb38fa7a9599293e05ae1fa9acfaf73922434 (diff) | |
| download | blackbird-obmc-linux-9576c2f2934eb5839a468ae156418ef595d5fec6.tar.gz blackbird-obmc-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/cifs')
| -rw-r--r-- | fs/cifs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 62203c387db4..47c5c97e2dd3 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1553,7 +1553,7 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type, out: if (flock->fl_flags & FL_POSIX && !rc) - rc = posix_lock_file_wait(file, flock); + rc = locks_lock_file_wait(file, flock); return rc; } |
