diff options
| author | Junxiao Bi <junxiao.bi@oracle.com> | 2015-12-22 08:06:08 -0600 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2015-12-22 08:06:08 -0600 |
| commit | a93a99838248bdab49db2eaac00236847670bc7f (patch) | |
| tree | 6878b5d6ee05d7af15a75f3f0985528003cb5ae4 /fs/gfs2 | |
| parent | 6cc4b6e801c725321e9f63ca7c2d00af8df24699 (diff) | |
| download | linux-stable-a93a99838248bdab49db2eaac00236847670bc7f.tar.gz linux-stable-a93a99838248bdab49db2eaac00236847670bc7f.tar.bz2 linux-stable-a93a99838248bdab49db2eaac00236847670bc7f.zip | |
gfs2: fix flock panic issue
Commit 4f6563677ae8 ("Move locks API users to locks_lock_inode_wait()")
moved flock/posix lock identify code to locks_lock_inode_wait(), but
missed to set fl_flags to FL_FLOCK which will cause kernel panic in
locks_lock_inode_wait().
Fixes: 4f6563677ae8 ("Move locks API users to locks_lock_inode_wait()")
Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 860408053c95..7412863cda1e 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -1027,7 +1027,10 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl) if (fl_gh->gh_state == state) goto out; locks_lock_file_wait(file, - &(struct file_lock){.fl_type = F_UNLCK}); + &(struct file_lock) { + .fl_type = F_UNLCK, + .fl_flags = FL_FLOCK + }); gfs2_glock_dq(fl_gh); gfs2_holder_reinit(state, flags, fl_gh); } else { |