浏览代码

ceph: return EBADF if waiting for caps on closed file

Verify the file is actually open for the given caps when we are
waiting for caps.  This ensures we will wake up and return EBADF
if another thread closes the file out from under us.

Note that EBADF is also the correct return code from write(2)
when called on a file handle opened for reading (although the
vfs should catch that).

Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil 15 年之前
父节点
当前提交
195d3ce2cc
共有 2 个文件被更改,包括 9 次插入3 次删除
  1. 6 3
      fs/ceph/caps.c
  2. 3 0
      fs/ceph/file.c

+ 6 - 3
fs/ceph/caps.c

@@ -1923,14 +1923,17 @@ static int try_get_cap_refs(struct ceph_inode_info *ci, int need, int want,
 	struct inode *inode = &ci->vfs_inode;
 	struct inode *inode = &ci->vfs_inode;
 	int ret = 0;
 	int ret = 0;
 	int have, implemented;
 	int have, implemented;
+	int file_wanted;
 
 
 	dout("get_cap_refs %p need %s want %s\n", inode,
 	dout("get_cap_refs %p need %s want %s\n", inode,
 	     ceph_cap_string(need), ceph_cap_string(want));
 	     ceph_cap_string(need), ceph_cap_string(want));
 	spin_lock(&inode->i_lock);
 	spin_lock(&inode->i_lock);
 
 
-	/* make sure we _have_ some caps! */
-	if (!__ceph_is_any_caps(ci)) {
-		dout("get_cap_refs %p no real caps\n", inode);
+	/* make sure file is actually open */
+	file_wanted = __ceph_caps_file_wanted(ci);
+	if ((file_wanted & need) == 0) {
+		dout("try_get_cap_refs need %s file_wanted %s, EBADF\n",
+		     ceph_cap_string(need), ceph_cap_string(file_wanted));
 		*err = -EBADF;
 		*err = -EBADF;
 		ret = 1;
 		ret = 1;
 		goto out;
 		goto out;

+ 3 - 0
fs/ceph/file.c

@@ -262,6 +262,9 @@ int ceph_release(struct inode *inode, struct file *file)
 	kfree(cf->dir_info);
 	kfree(cf->dir_info);
 	dput(cf->dentry);
 	dput(cf->dentry);
 	kmem_cache_free(ceph_file_cachep, cf);
 	kmem_cache_free(ceph_file_cachep, cf);
+
+	/* wake up anyone waiting for caps on this inode */
+	wake_up(&ci->i_cap_wq);
 	return 0;
 	return 0;
 }
 }