ceph: fix bad parent_inode calc in ceph_lookup_open (acda7657) · Commits · 戴 / test

We were always getting NULL here because the intent file f_dentry is always NULL at this point, which means we were always passing NULL to ceph_mdsc_do_request. In reality, this was fine, since this isn't currently ever a write operation that needs to get strung on the dir's unsafe list. Use the dir explicitly, and only pass it if this open has side-effects that a dir fsync should flush. Reviewed-by:

Yehuda Sadeh <yehuda@hq.newdream.net> Signed-off-by:

Sage Weil <sage@newdream.net>

fs/ceph/file.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -223,7 +223,6 @@ struct dentry ceph_lookup_open(struct inode dir, struct dentry *dentry,
		struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
		struct ceph_mds_client *mdsc = fsc->mdsc;
		struct file *file = nd->intent.open.file;
		struct inode *parent_inode = get_dentry_parent_inode(file->f_dentry);
		struct ceph_mds_request *req;
		int err;
		int flags = nd->intent.open.flags - 1; /* silly vfs! */
		@@ -242,7 +241,9 @@ struct dentry ceph_lookup_open(struct inode dir, struct dentry *dentry,
		req->r_dentry_unless = CEPH_CAP_FILE_EXCL;
		}
		req->r_locked_dir = dir; /* caller holds dir->i_mutex */
		err = ceph_mdsc_do_request(mdsc, parent_inode, req);
		err = ceph_mdsc_do_request(mdsc,
		(flags & (O_CREAT\|O_TRUNC)) ? dir : NULL,
		req);
		dentry = ceph_finish_lookup(req, dentry, err);
		if (!err && (flags & O_CREAT) && !req->r_reply_info.head->is_dentry)
		err = ceph_handle_notrace_create(dir, dentry);

Admin message