浏览代码

GFS2: Fix unlock of fcntl locks during withdrawn state

When withdraw occurs, we need to continue to allow unlocks of fcntl
locks to occur, however these will only be local, since the node has
withdrawn from the cluster. This prevents triggering a VFS level
bug trap due to locks remaining when a file is closed.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Steven Whitehouse 12 年之前
父节点
当前提交
c2952d202f
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      fs/gfs2/file.c

+ 4 - 1
fs/gfs2/file.c

@@ -923,8 +923,11 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
 		cmd = F_SETLK;
 		cmd = F_SETLK;
 		fl->fl_type = F_UNLCK;
 		fl->fl_type = F_UNLCK;
 	}
 	}
-	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
+	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) {
+		if (fl->fl_type == F_UNLCK)
+			posix_lock_file_wait(file, fl);
 		return -EIO;
 		return -EIO;
+	}
 	if (IS_GETLK(cmd))
 	if (IS_GETLK(cmd))
 		return dlm_posix_get(ls->ls_dlm, ip->i_no_addr, file, fl);
 		return dlm_posix_get(ls->ls_dlm, ip->i_no_addr, file, fl);
 	else if (fl->fl_type == F_UNLCK)
 	else if (fl->fl_type == F_UNLCK)