Merge commit '24bab491220f' into client-4.2 (4a3a0eba) · Commits · 戴 / test

fs/Kconfig

+5 −1

Original line number	Diff line number	Diff line
		@@ -233,9 +233,13 @@ if NETWORK_FILESYSTEMS
		source "fs/nfs/Kconfig"
		source "fs/nfsd/Kconfig"

		config GRACE_PERIOD
		tristate

		config LOCKD
		tristate
		depends on FILE_LOCKING
		select GRACE_PERIOD

		config LOCKD_V4
		bool
		@@ -249,7 +253,7 @@ config NFS_ACL_SUPPORT

		config NFS_COMMON
		bool
		depends on NFSD \|\| NFS_FS
		depends on NFSD \|\| NFS_FS \|\| LOCKD
		default y

		source "net/sunrpc/Kconfig"

fs/lockd/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		obj-$(CONFIG_LOCKD) += lockd.o

		lockd-objs-y := clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \
		svcshare.o svcproc.o svcsubs.o mon.o xdr.o grace.o
		svcshare.o svcproc.o svcsubs.o mon.o xdr.o
		lockd-objs-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o
		lockd-objs-$(CONFIG_PROC_FS) += procfs.o
		lockd-objs := $(lockd-objs-y)

fs/lockd/netns.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ struct lockd_net {

		struct delayed_work grace_period_end;
		struct lock_manager lockd_manager;
		struct list_head grace_list;

		spinlock_t nsm_clnt_lock;
		unsigned int nsm_users;

fs/lockd/procfs.c

0 → 100644

+92 −0

Original line number	Diff line number	Diff line
		/*
		* Procfs support for lockd
		*
		* Copyright (c) 2014 Jeff Layton <jlayton@primarydata.com>
		*/

		#include <linux/fs.h>
		#include <linux/proc_fs.h>
		#include <linux/module.h>
		#include <linux/nsproxy.h>
		#include <net/net_namespace.h>

		#include "netns.h"
		#include "procfs.h"

		/*
		* We only allow strings that start with 'Y', 'y', or '1'.
		*/
		static ssize_t
		nlm_end_grace_write(struct file file, const char __user buf, size_t size,
		loff_t *pos)
		{
		char *data;
		struct lockd_net *ln = net_generic(current->nsproxy->net_ns,
		lockd_net_id);

		if (size < 1)
		return -EINVAL;

		data = simple_transaction_get(file, buf, size);
		if (IS_ERR(data))
		return PTR_ERR(data);

		switch(data[0]) {
		case 'Y':
		case 'y':
		case '1':
		locks_end_grace(&ln->lockd_manager);
		break;
		default:
		return -EINVAL;
		}

		return size;
		}

		static ssize_t
		nlm_end_grace_read(struct file file, char __user buf, size_t size,
		loff_t *pos)
		{
		struct lockd_net *ln = net_generic(current->nsproxy->net_ns,
		lockd_net_id);
		char resp[3];

		resp[0] = list_empty(&ln->lockd_manager.list) ? 'Y' : 'N';
		resp[1] = '\n';
		resp[2] = '\0';

		return simple_read_from_buffer(buf, size, pos, resp, sizeof(resp));
		}

		static const struct file_operations lockd_end_grace_operations = {
		.write = nlm_end_grace_write,
		.read = nlm_end_grace_read,
		.llseek = default_llseek,
		.release = simple_transaction_release,
		.owner = THIS_MODULE,
		};

		int __init
		lockd_create_procfs(void)
		{
		struct proc_dir_entry *entry;

		entry = proc_mkdir("fs/lockd", NULL);
		if (!entry)
		return -ENOMEM;
		entry = proc_create("nlm_end_grace", S_IRUGO\|S_IWUSR, entry,
		&lockd_end_grace_operations);
		if (!entry) {
		remove_proc_entry("fs/lockd", NULL);
		return -ENOMEM;
		}
		return 0;
		}

		void __exit
		lockd_remove_procfs(void)
		{
		remove_proc_entry("fs/lockd/nlm_end_grace", NULL);
		remove_proc_entry("fs/lockd", NULL);
		}

fs/lockd/procfs.h

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* Procfs support for lockd
		*
		* Copyright (c) 2014 Jeff Layton <jlayton@primarydata.com>
		*/
		#ifndef _LOCKD_PROCFS_H
		#define _LOCKD_PROCFS_H

		#include <linux/kconfig.h>

		#if IS_ENABLED(CONFIG_PROC_FS)
		int lockd_create_procfs(void);
		void lockd_remove_procfs(void);
		#else
		static inline int
		lockd_create_procfs(void)
		{
		return 0;
		}

		static inline void
		lockd_remove_procfs(void)
		{
		return;
		}
		#endif /* IS_ENABLED(CONFIG_PROC_FS) */

		#endif /* _LOCKD_PROCFS_H */

Admin message