Merge tag 'nfsd-5.8-1' of git://linux-nfs.org/~bfields/linux (083176c8) · Commits · 戴 / test

fs/nfsd/nfs4state.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -7912,9 +7912,14 @@ nfs4_state_start_net(struct net *net)
		struct nfsd_net *nn = net_generic(net, nfsd_net_id);
		int ret;

		ret = nfs4_state_create_net(net);
		ret = get_nfsdfs(net);
		if (ret)
		return ret;
		ret = nfs4_state_create_net(net);
		if (ret) {
		mntput(nn->nfsd_mnt);
		return ret;
		}
		locks_start_grace(net, &nn->nfsd4_manager);
		nfsd4_client_tracking_init(net);
		if (nn->track_reclaim_completes && nn->reclaim_str_hashtbl_size == 0)
		@@ -7984,6 +7989,7 @@ nfs4_state_shutdown_net(struct net *net)

		nfsd4_client_tracking_exit(net);
		nfs4_state_destroy_net(net);
		mntput(nn->nfsd_mnt);
		}

		void

+13 −10

Original line number	Diff line number	Diff line
		@@ -1335,6 +1335,7 @@ void nfsd_client_rmdir(struct dentry *dentry)
		WARN_ON_ONCE(ret);
		fsnotify_rmdir(dir, dentry);
		d_delete(dentry);
		dput(dentry);
		inode_unlock(dir);
		}

		@@ -1424,6 +1425,18 @@ static struct file_system_type nfsd_fs_type = {
		};
		MODULE_ALIAS_FS("nfsd");

		int get_nfsdfs(struct net *net)
		{
		struct nfsd_net *nn = net_generic(net, nfsd_net_id);
		struct vfsmount *mnt;

		mnt = vfs_kern_mount(&nfsd_fs_type, SB_KERNMOUNT, "nfsd", NULL);
		if (IS_ERR(mnt))
		return PTR_ERR(mnt);
		nn->nfsd_mnt = mnt;
		return 0;
		}

		#ifdef CONFIG_PROC_FS
		static int create_proc_exports_entry(void)
		{
		@@ -1451,7 +1464,6 @@ unsigned int nfsd_net_id;
		static __net_init int nfsd_init_net(struct net *net)
		{
		int retval;
		struct vfsmount *mnt;
		struct nfsd_net *nn = net_generic(net, nfsd_net_id);

		retval = nfsd_export_init(net);
		@@ -1478,16 +1490,8 @@ static __net_init int nfsd_init_net(struct net *net)
		init_waitqueue_head(&nn->ntf_wq);
		seqlock_init(&nn->boot_lock);

		mnt = vfs_kern_mount(&nfsd_fs_type, SB_KERNMOUNT, "nfsd", NULL);
		if (IS_ERR(mnt)) {
		retval = PTR_ERR(mnt);
		goto out_mount_err;
		}
		nn->nfsd_mnt = mnt;
		return 0;

		out_mount_err:
		nfsd_reply_cache_shutdown(nn);
		out_drc_error:
		nfsd_idmap_shutdown(net);
		out_idmap_error:
		@@ -1500,7 +1504,6 @@ static __net_exit void nfsd_exit_net(struct net *net)
		{
		struct nfsd_net *nn = net_generic(net, nfsd_net_id);

		mntput(nn->nfsd_mnt);
		nfsd_reply_cache_shutdown(nn);
		nfsd_idmap_shutdown(net);
		nfsd_export_shutdown(net);

+3 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,8 @@ void nfsd_destroy(struct net *net);

		bool i_am_nfsd(void);

		int get_nfsdfs(struct net *);

		struct nfsdfs_client {
		struct kref cl_ref;
		void (cl_release)(struct kref kref);
		@@ -100,6 +102,7 @@ struct dentry nfsd_client_mkdir(struct nfsd_net nn,
		struct nfsdfs_client ncl, u32 id, const struct tree_descr );
		void nfsd_client_rmdir(struct dentry *dentry);


		#if defined(CONFIG_NFSD_V2_ACL) \|\| defined(CONFIG_NFSD_V3_ACL)
		#ifdef CONFIG_NFSD_V2_ACL
		extern const struct svc_version nfsd_acl_version2;

+6 −0

Original line number	Diff line number	Diff line
		@@ -1226,6 +1226,9 @@ nfsd_create_locked(struct svc_rqst rqstp, struct svc_fh fhp,
		iap->ia_mode = 0;
		iap->ia_mode = (iap->ia_mode & S_IALLUGO) \| type;

		if (!IS_POSIXACL(dirp))
		iap->ia_mode &= ~current_umask();

		err = 0;
		host_err = 0;
		switch (type) {
		@@ -1458,6 +1461,9 @@ do_nfsd_create(struct svc_rqst rqstp, struct svc_fh fhp,
		goto out;
		}

		if (!IS_POSIXACL(dirp))
		iap->ia_mode &= ~current_umask();

		host_err = vfs_create(dirp, dchild, iap->ia_mode, true);
		if (host_err < 0) {
		fh_drop_write(fhp);

+1 −0