Commit 7e0338c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.31' of git://fieldses.org/git/linux-nfsd 

* 'for-2.6.31' of git://fieldses.org/git/linux-nfsd: (60 commits)
  SUNRPC: Fix the TCP server's send buffer accounting
  nfsd41: Backchannel: minorversion support for the back channel
  nfsd41: Backchannel: cleanup nfs4.0 callback encode routines
  nfsd41: Remove ip address collision detection case
  nfsd: optimise the starting of zero threads when none are running.
  nfsd: don't take nfsd_mutex twice when setting number of threads.
  nfsd41: sanity check client drc maxreqs
  nfsd41: move channel attributes from nfsd4_session to a nfsd4_channel_attr struct
  NFS: kill off complicated macro 'PROC'
  sunrpc: potential memory leak in function rdma_read_xdr
  nfsd: minor nfsd_vfs_write cleanup
  nfsd: Pull write-gathering code out of nfsd_vfs_write
  nfsd: track last inode only in use_wgather case
  sunrpc: align cache_clean work's timer
  nfsd: Use write gathering only with NFSv2
  NFSv4: kill off complicated macro 'PROC'
  NFSv4: do exact check about attribute specified
  knfsd: remove unreported filehandle stats counters
  knfsd: fix reply cache memory corruption
  knfsd: reply cache cleanups
  ...
parents df36b439 47fcb03f

Documentation/filesystems/00-INDEX

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ mandatory-locking.txt 
	- info on the Linux implementation of Sys V mandatory file locking.

ncpfs.txt

	- info on Novell Netware(tm) filesystem using NCP protocol.

nfs41-server.txt

	- info on the Linux server implementation of NFSv4 minor version 1.

nfs-rdma.txt

	- how to install and setup the Linux NFS/RDMA client and server software.

nfsroot.txt

	- short guide on setting up a diskless box with NFS root filesystem.

nilfs2.txt

fs/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -236,10 +236,12 @@ source "fs/nfsd/Kconfig" 


config LOCKD

	tristate

	depends on FILE_LOCKING



config LOCKD_V4

	bool

	depends on NFSD_V3 || NFS_V3

	depends on FILE_LOCKING

	default y



config EXPORTFS

fs/lockd/svclock.c

+2 −0
Original line number Diff line number Diff line
@@ -326,6 +326,8 @@ static void nlmsvc_freegrantargs(struct nlm_rqst *call) 
{

	if (call->a_args.lock.oh.data != call->a_owner)

		kfree(call->a_args.lock.oh.data);



	locks_release_private(&call->a_args.lock.fl);

}



/*

fs/locks.c

+2 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static struct file_lock *locks_alloc_lock(void) 
	return kmem_cache_alloc(filelock_cache, GFP_KERNEL);

}



static void locks_release_private(struct file_lock *fl)

void locks_release_private(struct file_lock *fl)

{

	if (fl->fl_ops) {

		if (fl->fl_ops->fl_release_private)
@@ -165,6 +165,7 @@ static void locks_release_private(struct file_lock *fl) 
	}



}

EXPORT_SYMBOL_GPL(locks_release_private);



/* Free a lock which is not in use. */

static void locks_free_lock(struct file_lock *fl)

fs/nfs/Kconfig

+1 −1
Original line number Diff line number Diff line 
config NFS_FS

	tristate "NFS client support"

	depends on INET

	depends on INET && FILE_LOCKING

	select LOCKD

	select SUNRPC

	select NFS_ACL_SUPPORT if NFS_V3_ACL

CRA Git | Maintained and supported by SUSTech CRA and CCSE