Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18bce371 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux: (62 commits)
  nfsd4: fix callback restarting
  nfsd: break lease on unlink, link, and rename
  nfsd4: break lease on nfsd setattr
  nfsd: don't support msnfs export option
  nfsd4: initialize cb_per_client
  nfsd4: allow restarting callbacks
  nfsd4: simplify nfsd4_cb_prepare
  nfsd4: give out delegations more quickly in 4.1 case
  nfsd4: add helper function to run callbacks
  nfsd4: make sure sequence flags are set after destroy_session
  nfsd4: re-probe callback on connection loss
  nfsd4: set sequence flag when backchannel is down
  nfsd4: keep finer-grained callback status
  rpc: allow xprt_class->setup to return a preexisting xprt
  rpc: keep backchannel xprt as long as server connection
  rpc: move sk_bc_xprt to svc_xprt
  nfsd4: allow backchannel recovery
  nfsd4: support BIND_CONN_TO_SESSION
  nfsd4: modify session list under cl_lock
  Documentation: fl_mylease no longer exists
  ...

Fix up conflicts in fs/nfsd/vfs.c with the vfs-scale work.  The
vfs-scale work touched some msnfs cases, and this merge removes support
for that entirely, so the conflict was trivial to resolve.
parents ec08bdb1 a8f2800b

Documentation/filesystems/Locking

+0 −2
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ prototypes: 
	int (*fl_grant)(struct file_lock *, struct file_lock *, int);

	void (*fl_release_private)(struct file_lock *);

	void (*fl_break)(struct file_lock *); /* break_lease callback */

	int (*fl_mylease)(struct file_lock *, struct file_lock *);

	int (*fl_change)(struct file_lock **, int);



locking rules:
@@ -353,7 +352,6 @@ fl_notify: yes no 
fl_grant:		no		no

fl_release_private:	maybe		no

fl_break:		yes		no

fl_mylease:		yes		no

fl_change		yes		no



--------------------------- buffer_head -----------------------------------

fs/locks.c

+1 −7
Original line number Diff line number Diff line
@@ -444,15 +444,9 @@ static void lease_release_private_callback(struct file_lock *fl) 
	fl->fl_file->f_owner.signum = 0;

}



static int lease_mylease_callback(struct file_lock *fl, struct file_lock *try)

{

	return fl->fl_file == try->fl_file;

}



static const struct lock_manager_operations lease_manager_ops = {

	.fl_break = lease_break_callback,

	.fl_release_private = lease_release_private_callback,

	.fl_mylease = lease_mylease_callback,

	.fl_change = lease_modify,

};
@@ -1405,7 +1399,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) 
	for (before = &inode->i_flock;

			((fl = *before) != NULL) && IS_LEASE(fl);

			before = &fl->fl_next) {

		if (lease->fl_lmops->fl_mylease(fl, lease))

		if (fl->fl_file == filp)

			my_before = before;

		else if (fl->fl_type == (F_INPROGRESS | F_UNLCK))

			/*

include/linux/nfs4_acl.h→fs/nfsd/acl.h

+0 −2
Original line number Diff line number Diff line 
/*

 *  include/linux/nfs4_acl.c

 *

 *  Common NFSv4 ACL handling definitions.

 *

 *  Copyright (c) 2002 The Regents of the University of Michigan.

fs/nfsd/export.c

+0 −4
Original line number Diff line number Diff line 
#define MSNFS	/* HACK HACK */

/*

 * NFS exporting and validation.

 *
@@ -1444,9 +1443,6 @@ static struct flags { 
	{ NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}},

	{ NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},

	{ NFSEXP_V4ROOT, {"v4root", ""}},

#ifdef MSNFS

	{ NFSEXP_MSNFS, {"msnfs", ""}},

#endif

	{ 0, {"", ""}}

};

include/linux/nfsd_idmap.h→fs/nfsd/idmap.h

+2 −4
Original line number Diff line number Diff line 
/*

 *  include/linux/nfsd_idmap.h

 *

 *  Mapping of UID to name and vice versa.

 *

 *  Copyright (c) 2002, 2003 The Regents of the University of
@@ -56,8 +54,8 @@ static inline void nfsd_idmap_shutdown(void) 
}

#endif



int nfsd_map_name_to_uid(struct svc_rqst *, const char *, size_t, __u32 *);

int nfsd_map_name_to_gid(struct svc_rqst *, const char *, size_t, __u32 *);

__be32 nfsd_map_name_to_uid(struct svc_rqst *, const char *, size_t, __u32 *);

__be32 nfsd_map_name_to_gid(struct svc_rqst *, const char *, size_t, __u32 *);

int nfsd_map_uid_to_name(struct svc_rqst *, __u32, char *);

int nfsd_map_gid_to_name(struct svc_rqst *, __u32, char *);