SUNRPC: Remove the rpc_client->cl_dentry (c36dcfe1) · Commits · e / devices / android_kernel_xiaomi_markw

include/linux/sunrpc/clnt.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ struct rpc_clnt {
		int cl_nodelen; /* nodename length */
		char cl_nodename[UNX_MAXNODENAME];
		struct rpc_pipe_dir_head cl_pipedir_objects;
		struct dentry * cl_dentry;
		struct rpc_clnt * cl_parent; /* Points to parent of clones */
		struct rpc_rtt cl_rtt_default;
		struct rpc_timeout cl_timeout_default;

include/linux/sunrpc/rpc_pipe_fs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ extern int rpc_queue_upcall(struct rpc_pipe , struct rpc_pipe_msg );

		struct rpc_clnt;
		extern struct dentry rpc_create_client_dir(struct dentry , const char , struct rpc_clnt );
		extern int rpc_remove_client_dir(struct dentry , struct rpc_clnt );
		extern int rpc_remove_client_dir(struct rpc_clnt *);

		extern void rpc_init_pipe_dir_head(struct rpc_pipe_dir_head *pdh);
		extern void rpc_init_pipe_dir_object(struct rpc_pipe_dir_object *pdo,

net/sunrpc/clnt.c

+18 −17

Original line number	Diff line number	Diff line
		@@ -102,9 +102,7 @@ static void rpc_unregister_client(struct rpc_clnt *clnt)

		static void __rpc_clnt_remove_pipedir(struct rpc_clnt *clnt)
		{
		if (clnt->cl_dentry)
		rpc_remove_client_dir(clnt->cl_dentry, clnt);
		clnt->cl_dentry = NULL;
		rpc_remove_client_dir(clnt);
		}

		static void rpc_clnt_remove_pipedir(struct rpc_clnt *clnt)
		@@ -154,14 +152,11 @@ rpc_setup_pipedir(struct super_block pipefs_sb, struct rpc_clnt clnt)
		{
		struct dentry *dentry;

		if (clnt->cl_program->pipe_dir_name == NULL)
		goto out;
		clnt->cl_dentry = NULL;
		if (clnt->cl_program->pipe_dir_name != NULL) {
		dentry = rpc_setup_pipedir_sb(pipefs_sb, clnt);
		if (IS_ERR(dentry))
		return PTR_ERR(dentry);
		clnt->cl_dentry = dentry;
		out:
		}
		return 0;
		}

		@@ -170,11 +165,18 @@ static int rpc_clnt_skip_event(struct rpc_clnt *clnt, unsigned long event)
		if (clnt->cl_program->pipe_dir_name == NULL)
		return 1;

		if (((event == RPC_PIPEFS_MOUNT) && clnt->cl_dentry) \|\|
		((event == RPC_PIPEFS_UMOUNT) && !clnt->cl_dentry))
		switch (event) {
		case RPC_PIPEFS_MOUNT:
		if (clnt->cl_pipedir_objects.pdh_dentry != NULL)
		return 1;
		if ((event == RPC_PIPEFS_MOUNT) && atomic_read(&clnt->cl_count) == 0)
		if (atomic_read(&clnt->cl_count) == 0)
		return 1;
		break;
		case RPC_PIPEFS_UMOUNT:
		if (clnt->cl_pipedir_objects.pdh_dentry == NULL)
		return 1;
		break;
		}
		return 0;
		}

		@@ -191,7 +193,6 @@ static int __rpc_clnt_handle_event(struct rpc_clnt *clnt, unsigned long event,
		return -ENOENT;
		if (IS_ERR(dentry))
		return PTR_ERR(dentry);
		clnt->cl_dentry = dentry;
		break;
		case RPC_PIPEFS_UMOUNT:
		__rpc_clnt_remove_pipedir(clnt);

net/sunrpc/rpc_pipe.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -1055,15 +1055,16 @@ struct dentry rpc_create_client_dir(struct dentry dentry,

		/**
		* rpc_remove_client_dir - Remove a directory created with rpc_create_client_dir()
		* @dentry: dentry for the pipe
		* @rpc_client: rpc_client for the pipe
		*/
		int rpc_remove_client_dir(struct dentry dentry, struct rpc_clnt rpc_client)
		int rpc_remove_client_dir(struct rpc_clnt *rpc_client)
		{
		if (rpc_client->cl_pipedir_objects.pdh_dentry) {
		struct dentry *dentry = rpc_client->cl_pipedir_objects.pdh_dentry;

		if (dentry == NULL)
		return 0;
		rpc_destroy_pipe_dir_objects(&rpc_client->cl_pipedir_objects);
		rpc_client->cl_pipedir_objects.pdh_dentry = NULL;
		}
		return rpc_rmdir_depopulate(dentry, rpc_clntdir_depopulate);
		}