Commit 8acd3a60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux 

* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux: (59 commits)
  svcrdma: Fix IRD/ORD polarity
  svcrdma: Update svc_rdma_send_error to use DMA LKEY
  svcrdma: Modify the RPC reply path to use FRMR when available
  svcrdma: Modify the RPC recv path to use FRMR when available
  svcrdma: Add support to svc_rdma_send to handle chained WR
  svcrdma: Modify post recv path to use local dma key
  svcrdma: Add a service to register a Fast Reg MR with the device
  svcrdma: Query device for Fast Reg support during connection setup
  svcrdma: Add FRMR get/put services
  NLM: Remove unused argument from svc_addsock() function
  NLM: Remove "proto" argument from lockd_up()
  NLM: Always start both UDP and TCP listeners
  lockd: Remove unused fields in the nlm_reboot structure
  lockd: Add helper to sanity check incoming NOTIFY requests
  lockd: change nlmclnt_grant() to take a "struct sockaddr *"
  lockd: Adjust nlmsvc_lookup_host() to accomodate AF_INET6 addresses
  lockd: Adjust nlmclnt_lookup_host() signature to accomodate non-AF_INET
  lockd: Support non-AF_INET addresses in nlm_lookup_host()
  NLM: Convert nlm_lookup_host() to use a single argument
  svcrdma: Add Fast Reg MR Data Types
  ...
parents c269bc00 107e0008

fs/Kconfig

+30 −0
Original line number Original line Diff line number Diff line
@@ -433,6 +433,14 @@ config FS_POSIX_ACL 
	bool

	bool

	default n

	default n





config FILE_LOCKING

	bool "Enable POSIX file locking API" if EMBEDDED

	default y

	help

	  This option enables standard file locking support, required

          for filesystems like NFS and for the flock() system

          call. Disabling this option saves about 11k.



source "fs/xfs/Kconfig"

source "fs/xfs/Kconfig"

source "fs/gfs2/Kconfig"

source "fs/gfs2/Kconfig"
@@ -1779,6 +1787,28 @@ config SUNRPC_XPRT_RDMA 




	  If unsure, say N.

	  If unsure, say N.





config SUNRPC_REGISTER_V4

	bool "Register local RPC services via rpcbind v4 (EXPERIMENTAL)"

	depends on SUNRPC && EXPERIMENTAL

	default n

	help

	  Sun added support for registering RPC services at an IPv6

	  address by creating two new versions of the rpcbind protocol

	  (RFC 1833).



	  This option enables support in the kernel RPC server for

	  registering kernel RPC services via version 4 of the rpcbind

	  protocol.  If you enable this option, you must run a portmapper

	  daemon that supports rpcbind protocol version 4.



	  Serving NFS over IPv6 from knfsd (the kernel's NFS server)

	  requires that you enable this option and use a portmapper that

	  supports rpcbind version 4.



	  If unsure, say N to get traditional behavior (register kernel

	  RPC services using only rpcbind version 2).  Distributions

	  using the legacy Linux portmapper daemon must say N here.



config RPCSEC_GSS_KRB5

config RPCSEC_GSS_KRB5

	tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"

	tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"

	depends on SUNRPC && EXPERIMENTAL

	depends on SUNRPC && EXPERIMENTAL

fs/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 




obj-y :=	open.o read_write.o file_table.o super.o \

obj-y :=	open.o read_write.o file_table.o super.o \

		char_dev.o stat.o exec.o pipe.o namei.o fcntl.o \

		char_dev.o stat.o exec.o pipe.o namei.o fcntl.o \

		ioctl.o readdir.o select.o fifo.o locks.o dcache.o inode.o \

		ioctl.o readdir.o select.o fifo.o dcache.o inode.o \

		attr.o bad_inode.o file.o filesystems.o namespace.o aio.o \

		attr.o bad_inode.o file.o filesystems.o namespace.o aio.o \

		seq_file.o xattr.o libfs.o fs-writeback.o \

		seq_file.o xattr.o libfs.o fs-writeback.o \

		pnode.o drop_caches.o splice.o sync.o utimes.o \

		pnode.o drop_caches.o splice.o sync.o utimes.o \
@@ -27,6 +27,7 @@ obj-$(CONFIG_ANON_INODES) += anon_inodes.o 
obj-$(CONFIG_SIGNALFD)		+= signalfd.o

obj-$(CONFIG_SIGNALFD)		+= signalfd.o

obj-$(CONFIG_TIMERFD)		+= timerfd.o

obj-$(CONFIG_TIMERFD)		+= timerfd.o

obj-$(CONFIG_EVENTFD)		+= eventfd.o

obj-$(CONFIG_EVENTFD)		+= eventfd.o

obj-$(CONFIG_FILE_LOCKING)      += locks.o

obj-$(CONFIG_COMPAT)		+= compat.o compat_ioctl.o

obj-$(CONFIG_COMPAT)		+= compat.o compat_ioctl.o





nfsd-$(CONFIG_NFSD)		:= nfsctl.o

nfsd-$(CONFIG_NFSD)		:= nfsctl.o

fs/lockd/Makefile

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

obj-$(CONFIG_LOCKD) += lockd.o





lockd-objs-y := clntlock.o clntproc.o host.o svc.o svclock.o svcshare.o \

lockd-objs-y := clntlock.o clntproc.o host.o svc.o svclock.o svcshare.o \

	        svcproc.o svcsubs.o mon.o xdr.o

	        svcproc.o svcsubs.o mon.o xdr.o grace.o

lockd-objs-$(CONFIG_LOCKD_V4) += xdr4.o svc4proc.o

lockd-objs-$(CONFIG_LOCKD_V4) += xdr4.o svc4proc.o

lockd-objs		      := $(lockd-objs-y)
 
lockd-objs		      := $(lockd-objs-y)

fs/lockd/clntlock.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -54,14 +54,13 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init) 
	u32 nlm_version = (nlm_init->nfs_version == 2) ? 1 : 4;

	u32 nlm_version = (nlm_init->nfs_version == 2) ? 1 : 4;

	int status;

	int status;





	status = lockd_up(nlm_init->protocol);

	status = lockd_up();

	if (status < 0)

	if (status < 0)

		return ERR_PTR(status);

		return ERR_PTR(status);





	host = nlmclnt_lookup_host((struct sockaddr_in *)nlm_init->address,

	host = nlmclnt_lookup_host(nlm_init->address, nlm_init->addrlen,

				   nlm_init->protocol, nlm_version,

				   nlm_init->protocol, nlm_version,

				   nlm_init->hostname,

				   nlm_init->hostname);

				   strlen(nlm_init->hostname));

	if (host == NULL) {

	if (host == NULL) {

		lockd_down();

		lockd_down();

		return ERR_PTR(-ENOLCK);

		return ERR_PTR(-ENOLCK);
@@ -142,7 +141,7 @@ int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout) 
/*

/*

 * The server lockd has called us back to tell us the lock was granted

 * The server lockd has called us back to tell us the lock was granted

 */

 */

__be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock)

__be32 nlmclnt_grant(const struct sockaddr *addr, const struct nlm_lock *lock)

{

{

	const struct file_lock *fl = &lock->fl;

	const struct file_lock *fl = &lock->fl;

	const struct nfs_fh *fh = &lock->fh;

	const struct nfs_fh *fh = &lock->fh;
@@ -166,7 +165,7 @@ __be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock 
		 */

		 */

		if (fl_blocked->fl_u.nfs_fl.owner->pid != lock->svid)

		if (fl_blocked->fl_u.nfs_fl.owner->pid != lock->svid)

			continue;

			continue;

		if (!nlm_cmp_addr(&block->b_host->h_addr, addr))

		if (!nlm_cmp_addr(nlm_addr(block->b_host), addr))

			continue;

			continue;

		if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_path.dentry->d_inode) ,fh) != 0)

		if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_path.dentry->d_inode) ,fh) != 0)

			continue;

			continue;
@@ -216,7 +215,7 @@ reclaimer(void *ptr) 
	/* This one ensures that our parent doesn't terminate while the

	/* This one ensures that our parent doesn't terminate while the

	 * reclaim is in progress */

	 * reclaim is in progress */

	lock_kernel();

	lock_kernel();

	lockd_up(0); /* note: this cannot fail as lockd is already running */

	lockd_up();	/* note: this cannot fail as lockd is already running */





	dprintk("lockd: reclaiming locks for host %s\n", host->h_name);

	dprintk("lockd: reclaiming locks for host %s\n", host->h_name);

fs/lockd/grace.c

0 → 100644
+59 −0
Original line number Original line Diff line number Diff line 
/*

 * Common code for control of lockd and nfsv4 grace periods.

 */



#include <linux/module.h>

#include <linux/lockd/bind.h>



static LIST_HEAD(grace_list);

static DEFINE_SPINLOCK(grace_lock);



/**

 * locks_start_grace

 * @lm: who this grace period is for

 *

 * A grace period is a period during which locks should not be given

 * out.  Currently grace periods are only enforced by the two lock

 * managers (lockd and nfsd), using the locks_in_grace() function to

 * check when they are in a grace period.

 *

 * This function is called to start a grace period.

 */

void locks_start_grace(struct lock_manager *lm)

{

	spin_lock(&grace_lock);

	list_add(&lm->list, &grace_list);

	spin_unlock(&grace_lock);

}

EXPORT_SYMBOL_GPL(locks_start_grace);



/**

 * locks_end_grace

 * @lm: who this grace period is for

 *

 * Call this function to state that the given lock manager is ready to

 * resume regular locking.  The grace period will not end until all lock

 * managers that called locks_start_grace() also call locks_end_grace().

 * Note that callers count on it being safe to call this more than once,

 * and the second call should be a no-op.

 */

void locks_end_grace(struct lock_manager *lm)

{

	spin_lock(&grace_lock);

	list_del_init(&lm->list);

	spin_unlock(&grace_lock);

}

EXPORT_SYMBOL_GPL(locks_end_grace);



/**

 * locks_in_grace

 *

 * Lock managers call this function to determine when it is OK for them

 * to answer ordinary lock requests, and when they should accept only

 * lock reclaims.

 */

int locks_in_grace(void)

{

	return !list_empty(&grace_list);

}

EXPORT_SYMBOL_GPL(locks_in_grace);

CRA Git | Maintained and supported by SUSTech CRA and CCSE