Commit 57eccf1c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'nfs-for-3.3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

* 'nfs-for-3.3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Change the default setting of the nfs4_disable_idmapping parameter
  NFSv4: Save the owner/group name string when doing open
  NFS: Remove pNFS bloat from the generic write path
  pnfs-obj: Must return layout on IO error
  pnfs-obj: pNFS errors are communicated on iodata->pnfs_error
  NFS: Cache state owners after files are closed
  NFS: Clean up nfs4_find_state_owners_locked()
  NFSv4: include bitmap in nfsv4 get acl data
  nfs: fix a minor do_div portability issue
  NFSv4.1: cleanup comment and debug printk
  NFSv4.1: change nfs4_free_slot parameters for dynamic slots
  NFSv4.1: cleanup init and reset of session slot tables
  NFSv4.1: fix backchannel slotid off-by-one bug
  nfs: fix regression in handling of context= option in NFSv4
  NFS - fix recent breakage to NFS error handling.
  NFS: Retry mounting NFSROOT
  SUNRPC: Clean up the RPCSEC_GSS service ticket requests
parents 5c395ae7 074b1d12

Documentation/kernel-parameters.txt

+11 −6
Original line number Diff line number Diff line
@@ -1634,12 +1634,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			The default is to return 64-bit inode numbers.



	nfs.nfs4_disable_idmapping=

			[NFSv4] When set, this option disables the NFSv4

			idmapper on the client, but only if the mount

			is using the 'sec=sys' security flavour. This may

			make migration from legacy NFSv2/v3 systems easier

			provided that the server has the appropriate support.

			The default is to always enable NFSv4 idmapping.

			[NFSv4] When set to the default of '1', this option

			ensures that both the RPC level authentication

			scheme and the NFS level operations agree to use

			numeric uids/gids if the mount is using the

			'sec=sys' security flavour. In effect it is

			disabling idmapping, which can make migration from

			legacy NFSv2/v3 systems to NFSv4 easier.

			Servers that do not support this mode of operation

			will be autodetected by the client, and it will fall

			back to using the idmapper.

			To turn off this behaviour, set the value to '0'.



	nmi_debug=	[KNL,AVR32,SH] Specify one or more actions to take

			when a NMI is triggered.

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ validate_seqid(struct nfs4_slot_table *tbl, struct cb_sequenceargs * args) 
	dprintk("%s enter. slotid %d seqid %d\n",

		__func__, args->csa_slotid, args->csa_sequenceid);



	if (args->csa_slotid > NFS41_BC_MAX_CALLBACKS)

	if (args->csa_slotid >= NFS41_BC_MAX_CALLBACKS)

		return htonl(NFS4ERR_BADSLOT);



	slot = tbl->slots + args->csa_slotid;

fs/nfs/client.c

+10 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ retry: 
/*

 * Turn off NFSv4 uid/gid mapping when using AUTH_SYS

 */

static int nfs4_disable_idmapping = 0;

static int nfs4_disable_idmapping = 1;



/*

 * RPC cruft for NFS
@@ -185,7 +185,7 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_ 
	clp->cl_minorversion = cl_init->minorversion;

	clp->cl_mvops = nfs_v4_minor_ops[cl_init->minorversion];

#endif

	cred = rpc_lookup_machine_cred();

	cred = rpc_lookup_machine_cred("*");

	if (!IS_ERR(cred))

		clp->cl_machine_cred = cred;

	nfs_fscache_get_client_cookie(clp);
@@ -250,6 +250,11 @@ static void pnfs_init_server(struct nfs_server *server) 
	rpc_init_wait_queue(&server->roc_rpcwaitq, "pNFS ROC");

}



static void nfs4_destroy_server(struct nfs_server *server)

{

	nfs4_purge_state_owners(server);

}



#else

static void nfs4_shutdown_client(struct nfs_client *clp)

{
@@ -1065,6 +1070,7 @@ static struct nfs_server *nfs_alloc_server(void) 
	INIT_LIST_HEAD(&server->master_link);

	INIT_LIST_HEAD(&server->delegations);

	INIT_LIST_HEAD(&server->layouts);

	INIT_LIST_HEAD(&server->state_owners_lru);



	atomic_set(&server->active, 0);
@@ -1538,6 +1544,7 @@ static int nfs4_server_common_setup(struct nfs_server *server, 


	nfs_server_insert_lists(server);

	server->mount_time = jiffies;

	server->destroy = nfs4_destroy_server;

out:

	nfs_free_fattr(fattr);

	return error;
@@ -1719,6 +1726,7 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source, 


	/* Copy data from the source */

	server->nfs_client = source->nfs_client;

	server->destroy = source->destroy;

	atomic_inc(&server->nfs_client->cl_count);

	nfs_server_copy_userdata(server, source);

fs/nfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -272,13 +272,13 @@ nfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync) 
			datasync);



	ret = filemap_write_and_wait_range(inode->i_mapping, start, end);

	if (ret)

		return ret;

	mutex_lock(&inode->i_mutex);



	nfs_inc_stats(inode, NFSIOS_VFSFSYNC);

	have_error = test_and_clear_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags);

	status = nfs_commit_inode(inode, FLUSH_SYNC);

	if (status >= 0 && ret < 0)

		status = ret;

	have_error |= test_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags);

	if (have_error)

		ret = xchg(&ctx->error, 0);

fs/nfs/idmap.c

+83 −0
Original line number Diff line number Diff line
@@ -38,6 +38,89 @@ 
#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/nfs_idmap.h>

#include <linux/nfs_fs.h>



/**

 * nfs_fattr_init_names - initialise the nfs_fattr owner_name/group_name fields

 * @fattr: fully initialised struct nfs_fattr

 * @owner_name: owner name string cache

 * @group_name: group name string cache

 */

void nfs_fattr_init_names(struct nfs_fattr *fattr,

		struct nfs4_string *owner_name,

		struct nfs4_string *group_name)

{

	fattr->owner_name = owner_name;

	fattr->group_name = group_name;

}



static void nfs_fattr_free_owner_name(struct nfs_fattr *fattr)

{

	fattr->valid &= ~NFS_ATTR_FATTR_OWNER_NAME;

	kfree(fattr->owner_name->data);

}



static void nfs_fattr_free_group_name(struct nfs_fattr *fattr)

{

	fattr->valid &= ~NFS_ATTR_FATTR_GROUP_NAME;

	kfree(fattr->group_name->data);

}



static bool nfs_fattr_map_owner_name(struct nfs_server *server, struct nfs_fattr *fattr)

{

	struct nfs4_string *owner = fattr->owner_name;

	__u32 uid;



	if (!(fattr->valid & NFS_ATTR_FATTR_OWNER_NAME))

		return false;

	if (nfs_map_name_to_uid(server, owner->data, owner->len, &uid) == 0) {

		fattr->uid = uid;

		fattr->valid |= NFS_ATTR_FATTR_OWNER;

	}

	return true;

}



static bool nfs_fattr_map_group_name(struct nfs_server *server, struct nfs_fattr *fattr)

{

	struct nfs4_string *group = fattr->group_name;

	__u32 gid;



	if (!(fattr->valid & NFS_ATTR_FATTR_GROUP_NAME))

		return false;

	if (nfs_map_group_to_gid(server, group->data, group->len, &gid) == 0) {

		fattr->gid = gid;

		fattr->valid |= NFS_ATTR_FATTR_GROUP;

	}

	return true;

}



/**

 * nfs_fattr_free_names - free up the NFSv4 owner and group strings

 * @fattr: a fully initialised nfs_fattr structure

 */

void nfs_fattr_free_names(struct nfs_fattr *fattr)

{

	if (fattr->valid & NFS_ATTR_FATTR_OWNER_NAME)

		nfs_fattr_free_owner_name(fattr);

	if (fattr->valid & NFS_ATTR_FATTR_GROUP_NAME)

		nfs_fattr_free_group_name(fattr);

}



/**

 * nfs_fattr_map_and_free_names - map owner/group strings into uid/gid and free

 * @server: pointer to the filesystem nfs_server structure

 * @fattr: a fully initialised nfs_fattr structure

 *

 * This helper maps the cached NFSv4 owner/group strings in fattr into

 * their numeric uid/gid equivalents, and then frees the cached strings.

 */

void nfs_fattr_map_and_free_names(struct nfs_server *server, struct nfs_fattr *fattr)

{

	if (nfs_fattr_map_owner_name(server, fattr))

		nfs_fattr_free_owner_name(fattr);

	if (nfs_fattr_map_group_name(server, fattr))

		nfs_fattr_free_group_name(fattr);

}



static int nfs_map_string_to_numeric(const char *name, size_t namelen, __u32 *res)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE