---

yaml --- r: 270034 b: refs/heads/master c: f3c7691 h: refs/heads/master v: v3
git-mirror · Oct 28, 2011 · b135e37 · b135e37
1 parent 5da2d26
commit b135e37
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79835a710d6ff811659c8de46f89c7577c3b8cc6
+refs/heads/master: f3c7691e8d30d88899b514675c7c86d19057b5fd
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -2035,10 +2035,7 @@ static int may_open(struct path *path, int acc_mode, int flag)
 	if (flag & O_NOATIME && !inode_owner_or_capable(inode))
 		return -EPERM;
 
-	/*
-	 * Ensure there are no outstanding leases on the file.
-	 */
-	return break_lease(inode, flag);
+	return 0;
 }
 
 static int handle_truncate(struct file *filp)

diff --git a/trunk/fs/open.c b/trunk/fs/open.c
@@ -685,6 +685,10 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,
 	if (error)
 		goto cleanup_all;
 
+	error = break_lease(inode, f->f_flags);
+	if (error)
+		goto cleanup_all;
+
 	if (!open && f->f_op)
 		open = f->f_op->open;
 	if (open) {