Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (5d5a8d2d) · Commits · e / devices / android_kernel_fairphone_FP4

fs/ceph/caps.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -487,17 +487,15 @@ static void __check_cap_issue(struct ceph_inode_info ci, struct ceph_cap cap,
		ci->i_rdcache_gen++;

		/*
		* if we are newly issued FILE_SHARED, clear I_COMPLETE; we
		* if we are newly issued FILE_SHARED, clear D_COMPLETE; we
		* don't know what happened to this directory while we didn't
		* have the cap.
		*/
		if ((issued & CEPH_CAP_FILE_SHARED) &&
		(had & CEPH_CAP_FILE_SHARED) == 0) {
		ci->i_shared_gen++;
		if (S_ISDIR(ci->vfs_inode.i_mode)) {
		dout(" marking %p NOT complete\n", &ci->vfs_inode);
		ci->i_ceph_flags &= ~CEPH_I_COMPLETE;
		}
		if (S_ISDIR(ci->vfs_inode.i_mode))
		ceph_dir_clear_complete(&ci->vfs_inode);
		}
		}

fs/ceph/dir.c

+78 −9

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ static unsigned fpos_off(loff_t p)
		* falling back to a "normal" sync readdir if any dentries in the dir
		* are dropped.
		*
		* I_COMPLETE tells indicates we have all dentries in the dir. It is
		* D_COMPLETE tells indicates we have all dentries in the dir. It is
		* defined IFF we hold CEPH_CAP_FILE_SHARED (which will be revoked by
		* the MDS if/when the directory is modified).
		*/
		@@ -199,8 +199,8 @@ static int __dcache_readdir(struct file *filp,
		filp->f_pos++;

		/* make sure a dentry wasn't dropped while we didn't have parent lock */
		if (!ceph_i_test(dir, CEPH_I_COMPLETE)) {
		dout(" lost I_COMPLETE on %p; falling back to mds\n", dir);
		if (!ceph_dir_test_complete(dir)) {
		dout(" lost D_COMPLETE on %p; falling back to mds\n", dir);
		err = -EAGAIN;
		goto out;
		}
		@@ -285,7 +285,7 @@ static int ceph_readdir(struct file filp, void dirent, filldir_t filldir)
		if ((filp->f_pos == 2 \|\| fi->dentry) &&
		!ceph_test_mount_opt(fsc, NOASYNCREADDIR) &&
		ceph_snap(inode) != CEPH_SNAPDIR &&
		(ci->i_ceph_flags & CEPH_I_COMPLETE) &&
		ceph_dir_test_complete(inode) &&
		__ceph_caps_issued_mask(ci, CEPH_CAP_FILE_SHARED, 1)) {
		spin_unlock(&inode->i_lock);
		err = __dcache_readdir(filp, dirent, filldir);
		@@ -351,7 +351,7 @@ static int ceph_readdir(struct file filp, void dirent, filldir_t filldir)

		if (!req->r_did_prepopulate) {
		dout("readdir !did_prepopulate");
		fi->dir_release_count--; /* preclude I_COMPLETE */
		fi->dir_release_count--; /* preclude D_COMPLETE */
		}

		/* note next offset and last dentry name */
		@@ -430,8 +430,7 @@ static int ceph_readdir(struct file filp, void dirent, filldir_t filldir)
		*/
		spin_lock(&inode->i_lock);
		if (ci->i_release_count == fi->dir_release_count) {
		dout(" marking %p complete\n", inode);
		/* ci->i_ceph_flags \|= CEPH_I_COMPLETE; */
		ceph_dir_set_complete(inode);
		ci->i_max_offset = filp->f_pos;
		}
		spin_unlock(&inode->i_lock);
		@@ -614,7 +613,7 @@ static struct dentry ceph_lookup(struct inode dir, struct dentry *dentry,
		fsc->mount_options->snapdir_name,
		dentry->d_name.len) &&
		!is_root_ceph_dentry(dir, dentry) &&
		(ci->i_ceph_flags & CEPH_I_COMPLETE) &&
		ceph_dir_test_complete(dir) &&
		(__ceph_caps_issued_mask(ci, CEPH_CAP_FILE_SHARED, 1))) {
		spin_unlock(&dir->i_lock);
		dout(" dir %p complete, -ENOENT\n", dir);
		@@ -934,7 +933,7 @@ static int ceph_rename(struct inode old_dir, struct dentry old_dentry,
		*/

		/* d_move screws up d_subdirs order */
		ceph_i_clear(new_dir, CEPH_I_COMPLETE);
		ceph_dir_clear_complete(new_dir);

		d_move(old_dentry, new_dentry);

		@@ -1092,7 +1091,75 @@ static int ceph_snapdir_d_revalidate(struct dentry *dentry,
		return 1;
		}

		/*
		* Set/clear/test dir complete flag on the dir's dentry.
		*/
		static struct dentry * __d_find_any_alias(struct inode *inode)
		{
		struct dentry *alias;

		if (list_empty(&inode->i_dentry))
		return NULL;
		alias = list_first_entry(&inode->i_dentry, struct dentry, d_alias);
		return alias;
		}

		void ceph_dir_set_complete(struct inode *inode)
		{
		struct dentry *dentry = __d_find_any_alias(inode);

		if (dentry && ceph_dentry(dentry)) {
		dout(" marking %p (%p) complete\n", inode, dentry);
		set_bit(CEPH_D_COMPLETE, &ceph_dentry(dentry)->flags);
		}
		}

		void ceph_dir_clear_complete(struct inode *inode)
		{
		struct dentry *dentry = __d_find_any_alias(inode);

		if (dentry && ceph_dentry(dentry)) {
		dout(" marking %p (%p) NOT complete\n", inode, dentry);
		clear_bit(CEPH_D_COMPLETE, &ceph_dentry(dentry)->flags);
		}
		}

		bool ceph_dir_test_complete(struct inode *inode)
		{
		struct dentry *dentry = __d_find_any_alias(inode);

		if (dentry && ceph_dentry(dentry))
		return test_bit(CEPH_D_COMPLETE, &ceph_dentry(dentry)->flags);
		return false;
		}

		/*
		* When the VFS prunes a dentry from the cache, we need to clear the
		* complete flag on the parent directory.
		*
		* Called under dentry->d_lock.
		*/
		static void ceph_d_prune(struct dentry *dentry)
		{
		struct ceph_dentry_info *di;

		dout("d_release %p\n", dentry);

		/* do we have a valid parent? */
		if (!dentry->d_parent \|\| IS_ROOT(dentry))
		return;

		/* if we are not hashed, we don't affect D_COMPLETE */
		if (d_unhashed(dentry))
		return;

		/*
		* we hold d_lock, so d_parent is stable, and d_fsdata is never
		* cleared until d_release
		*/
		di = ceph_dentry(dentry->d_parent);
		clear_bit(CEPH_D_COMPLETE, &di->flags);
		}

		/*
		* read() on a dir. This weird interface hack only works if mounted
		@@ -1306,6 +1373,7 @@ const struct inode_operations ceph_dir_iops = {
		const struct dentry_operations ceph_dentry_ops = {
		.d_revalidate = ceph_d_revalidate,
		.d_release = ceph_d_release,
		.d_prune = ceph_d_prune,
		};

		const struct dentry_operations ceph_snapdir_dentry_ops = {
		@@ -1315,4 +1383,5 @@ const struct dentry_operations ceph_snapdir_dentry_ops = {

		const struct dentry_operations ceph_snap_dentry_ops = {
		.d_release = ceph_d_release,
		.d_prune = ceph_d_prune,
		};

fs/ceph/inode.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -771,9 +771,9 @@ static int fill_inode(struct inode *inode,
		ceph_snap(inode) == CEPH_NOSNAP &&
		(le32_to_cpu(info->cap.caps) & CEPH_CAP_FILE_SHARED) &&
		(issued & CEPH_CAP_FILE_EXCL) == 0 &&
		(ci->i_ceph_flags & CEPH_I_COMPLETE) == 0) {
		!ceph_dir_test_complete(inode)) {
		dout(" marking %p complete (empty)\n", inode);
		/* ci->i_ceph_flags \|= CEPH_I_COMPLETE; */
		ceph_dir_set_complete(inode);
		ci->i_max_offset = 2;
		}

		@@ -856,7 +856,7 @@ static void ceph_set_dentry_offset(struct dentry *dn)
		di = ceph_dentry(dn);

		spin_lock(&inode->i_lock);
		if ((ceph_inode(inode)->i_ceph_flags & CEPH_I_COMPLETE) == 0) {
		if (!ceph_dir_test_complete(inode)) {
		spin_unlock(&inode->i_lock);
		return;
		}
		@@ -1056,7 +1056,7 @@ int ceph_fill_trace(struct super_block sb, struct ceph_mds_request req,
		* d_move() puts the renamed dentry at the end of
		* d_subdirs. We need to assign it an appropriate
		* directory offset so we can behave when holding
		* I_COMPLETE.
		* D_COMPLETE.
		*/
		ceph_set_dentry_offset(req->r_old_dentry);
		dout("dn %p gets new offset %lld\n", req->r_old_dentry,

fs/ceph/mds_client.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -619,7 +619,7 @@ static void __unregister_request(struct ceph_mds_client *mdsc,
		*
		* Called under mdsc->mutex.
		*/
		struct dentry get_nonsnap_parent(struct dentry dentry)
		static struct dentry get_nonsnap_parent(struct dentry dentry)
		{
		/*
		* we don't need to worry about protecting the d_parent access
		@@ -2002,7 +2002,7 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc,
		}

		/*
		* Invalidate dir I_COMPLETE, dentry lease state on an aborted MDS
		* Invalidate dir D_COMPLETE, dentry lease state on an aborted MDS
		* namespace request.
		*/
		void ceph_invalidate_dir_request(struct ceph_mds_request *req)
		@@ -2010,9 +2010,9 @@ void ceph_invalidate_dir_request(struct ceph_mds_request *req)
		struct inode *inode = req->r_locked_dir;
		struct ceph_inode_info *ci = ceph_inode(inode);

		dout("invalidate_dir_request %p (I_COMPLETE, lease(s))\n", inode);
		dout("invalidate_dir_request %p (D_COMPLETE, lease(s))\n", inode);
		spin_lock(&inode->i_lock);
		ci->i_ceph_flags &= ~CEPH_I_COMPLETE;
		ceph_dir_clear_complete(inode);
		ci->i_release_count++;
		spin_unlock(&inode->i_lock);

		@@ -3154,7 +3154,7 @@ void ceph_mdsc_sync(struct ceph_mds_client *mdsc)
		/*
		* true if all sessions are closed, or we force unmount
		*/
		bool done_closing_sessions(struct ceph_mds_client *mdsc)
		static bool done_closing_sessions(struct ceph_mds_client *mdsc)
		{
		int i, n = 0;

fs/ceph/super.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -426,7 +426,7 @@ static int extra_mon_dispatch(struct ceph_client client, struct ceph_msg msg)
		/*
		* create a new fs client
		*/
		struct ceph_fs_client create_fs_client(struct ceph_mount_options fsopt,
		static struct ceph_fs_client create_fs_client(struct ceph_mount_options fsopt,
		struct ceph_options *opt)
		{
		struct ceph_fs_client *fsc;
		@@ -502,7 +502,7 @@ struct ceph_fs_client create_fs_client(struct ceph_mount_options fsopt,
		return ERR_PTR(err);
		}

		void destroy_fs_client(struct ceph_fs_client *fsc)
		static void destroy_fs_client(struct ceph_fs_client *fsc)
		{
		dout("destroy_fs_client %p\n", fsc);