Commit bd81ccea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull nfsd update from J Bruce Fields:
 "Another relatively quiet cycle.  There was some progress on my
  remaining 4.1 todo's, but a couple of them were just of the form
  "check that we do X correctly", so didn't have much affect on the
  code.

  Other than that, a bunch of cleanup and some bugfixes (including an
  annoying NFSv4.0 state leak and a busy-loop in the server that could
  cause it to peg the CPU without making progress)."

* 'for-3.7' of git://linux-nfs.org/~bfields/linux: (46 commits)
  UAPI: (Scripted) Disintegrate include/linux/sunrpc
  UAPI: (Scripted) Disintegrate include/linux/nfsd
  nfsd4: don't allow reclaims of expired clients
  nfsd4: remove redundant callback probe
  nfsd4: expire old client earlier
  nfsd4: separate session allocation and initialization
  nfsd4: clean up session allocation
  nfsd4: minor free_session cleanup
  nfsd4: new_conn_from_crses should only allocate
  nfsd4: separate connection allocation and initialization
  nfsd4: reject bad forechannel attrs earlier
  nfsd4: enforce per-client sessions/no-sessions distinction
  nfsd4: set cl_minorversion at create time
  nfsd4: don't pin clientids to pseudoflavors
  nfsd4: fix bind_conn_to_session xdr comment
  nfsd4: cast readlink() bug argument
  NFSD: pass null terminated buf to kstrtouint()
  nfsd: remove duplicate init in nfsd4_cb_recall
  nfsd4: eliminate redundant nfs4_free_stateid
  fs/nfsd/nfs4idmap.c: adjust inconsistent IS_ERR and PTR_ERR
  ...
parents 98260daa a9ca4043

Documentation/filesystems/nfs/nfsd-admin-interfaces.txt

0 → 100644
+41 −0
Original line number Diff line number Diff line 
Administrative interfaces for nfsd

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^



Note that normally these interfaces are used only by the utilities in

nfs-utils.



nfsd is controlled mainly by pseudofiles under the "nfsd" filesystem,

which is normally mounted at /proc/fs/nfsd/.



The server is always started by the first write of a nonzero value to

nfsd/threads.



Before doing that, NFSD can be told which sockets to listen on by

writing to nfsd/portlist; that write may be:



	- an ascii-encoded file descriptor, which should refer to a

	  bound (and listening, for tcp) socket, or

	- "transportname port", where transportname is currently either

	  "udp", "tcp", or "rdma".



If nfsd is started without doing any of these, then it will create one

udp and one tcp listener at port 2049 (see nfsd_init_socks).



On startup, nfsd and lockd grace periods start.



nfsd is shut down by a write of 0 to nfsd/threads.  All locks and state

are thrown away at that point.



Between startup and shutdown, the number of threads may be adjusted up

or down by additional writes to nfsd/threads or by writes to

nfsd/pool_threads.



For more detail about files under nfsd/ and what they control, see

fs/nfsd/nfsctl.c; most of them have detailed comments.



Implementation notes

^^^^^^^^^^^^^^^^^^^^



Note that the rpc server requires the caller to serialize addition and

removal of listening sockets, and startup and shutdown of the server.

For nfsd this is done using nfsd_mutex.

fs/lockd/svc.c

+2 −15
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static void restart_grace(void) 
static int

lockd(void *vrqstp)

{

	int		err = 0, preverr = 0;

	int		err = 0;

	struct svc_rqst *rqstp = vrqstp;



	/* try_to_freeze() is called from svc_recv() */
@@ -165,21 +165,8 @@ lockd(void *vrqstp) 
		 * recvfrom routine.

		 */

		err = svc_recv(rqstp, timeout);

		if (err == -EAGAIN || err == -EINTR) {

			preverr = err;

		if (err == -EAGAIN || err == -EINTR)

			continue;

		}

		if (err < 0) {

			if (err != preverr) {

				printk(KERN_WARNING "%s: unexpected error "

					"from svc_recv (%d)\n", __func__, err);

				preverr = err;

			}

			schedule_timeout_interruptible(HZ);

			continue;

		}

		preverr = err;



		dprintk("lockd: request from %s\n",

				svc_print_addr(rqstp, buf, sizeof(buf)));

fs/locks.c

+3 −3
Original line number Diff line number Diff line
@@ -1289,7 +1289,7 @@ EXPORT_SYMBOL(__break_lease); 
void lease_get_mtime(struct inode *inode, struct timespec *time)

{

	struct file_lock *flock = inode->i_flock;

	if (flock && IS_LEASE(flock) && (flock->fl_type & F_WRLCK))

	if (flock && IS_LEASE(flock) && (flock->fl_type == F_WRLCK))

		*time = current_fs_time(inode->i_sb);

	else

		*time = inode->i_mtime;
@@ -2185,8 +2185,8 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl, 
	} else {

		seq_printf(f, "%s ",

			       (lease_breaking(fl))

			       ? (fl->fl_type & F_UNLCK) ? "UNLCK" : "READ "

			       : (fl->fl_type & F_WRLCK) ? "WRITE" : "READ ");

			       ? (fl->fl_type == F_UNLCK) ? "UNLCK" : "READ "

			       : (fl->fl_type == F_WRLCK) ? "WRITE" : "READ ");

	}

	if (inode) {

#ifdef WE_CAN_BREAK_LSLK_NOW

fs/nfs/callback.c

+2 −14
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ out_err: 
static int

nfs4_callback_svc(void *vrqstp)

{

	int err, preverr = 0;

	int err;

	struct svc_rqst *rqstp = vrqstp;



	set_freezable();
@@ -82,20 +82,8 @@ nfs4_callback_svc(void *vrqstp) 
		 * Listen for a request on the socket

		 */

		err = svc_recv(rqstp, MAX_SCHEDULE_TIMEOUT);

		if (err == -EAGAIN || err == -EINTR) {

			preverr = err;

		if (err == -EAGAIN || err == -EINTR)

			continue;

		}

		if (err < 0) {

			if (err != preverr) {

				printk(KERN_WARNING "NFS: %s: unexpected error "

					"from svc_recv (%d)\n", __func__, err);

				preverr = err;

			}

			schedule_timeout_uninterruptible(HZ);

			continue;

		}

		preverr = err;

		svc_process(rqstp);

	}

	return 0;

fs/nfsd/nfs2acl.c

+1 −2
Original line number Diff line number Diff line
@@ -218,8 +218,7 @@ static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p, 
 * There must be an encoding function for void results so svc_process

 * will work properly.

 */

int

nfsaclsvc_encode_voidres(struct svc_rqst *rqstp, __be32 *p, void *dummy)

static int nfsaclsvc_encode_voidres(struct svc_rqst *rqstp, __be32 *p, void *dummy)

{

	return xdr_ressize_check(rqstp, p);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE