diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-06 20:58:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-01-06 21:14:35 +0100 |
| commit | 9d9938854efcf2f21381b930bc1324e95640e0c4 (patch) | |
| tree | 7b136c25af5fcc64258f3427f985c1dc667ae0bd /fs/ocfs2/locks.c | |
| parent | ca9ea7a5ffda53ce9e9f3e14b9b104d85db47c7d (diff) | |
| parent | 3f37b26f8d57756b591383a9d8ce1cd628bc773c (diff) | |
Merge branch 'for-linus' into for-next
Conflicts:
drivers/gpu/drm/i915/intel_display.c
sound/soc/intel/skylake/skl.h
Diffstat (limited to 'fs/ocfs2/locks.c')
| -rw-r--r-- | fs/ocfs2/locks.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c index 652ece4a9d9e..d56f0079b858 100644 --- a/fs/ocfs2/locks.c +++ b/fs/ocfs2/locks.c @@ -67,7 +67,10 @@ static int ocfs2_do_flock(struct file *file, struct inode *inode, */ locks_lock_file_wait(file, - &(struct file_lock){.fl_type = F_UNLCK}); + &(struct file_lock) { + .fl_type = F_UNLCK, + .fl_flags = FL_FLOCK + }); ocfs2_file_unlock(file); } |