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

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

Merge tag 'nfs-for-3.6-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
 - NFSv3 mounts need to fail if the FSINFO rpc call fails
 - Ensure that the NFS commit cache gets torn down when we unload the
   NFS module.
 - Fix memory scribble issues when interrupting a LAYOUTGET rpc call
 - Fix NFSv4 legacy idmapper regressions
 - Fix issues with the NFSv4 getacl command
 - Fix a regression when using the legacy "mount -t nfs4"

* tag 'nfs-for-3.6-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv3: Ensure that do_proc_get_root() reports errors correctly
  NFSv4: Ensure that nfs4_alloc_client cleans up on error.
  NFS: return -ENOKEY when the upcall fails to map the name
  NFS: Clear key construction data if the idmap upcall fails
  NFSv4: Don't use private xdr_stream fields in decode_getacl
  NFSv4: Fix the acl cache size calculation
  NFSv4: Fix pointer arithmetic in decode_getacl
  NFS: Alias the nfs module to nfs4
  NFS: Fix a regression when loading the NFS v4 module
  NFSv4.1: Remove a bogus BUG_ON() in nfs4_layoutreturn_done
  pnfs-obj: Better IO pattern in case of unaligned offset
  NFS41: add pg_layout_private to nfs_pageio_descriptor
  pnfs: nfs4_proc_layoutget returns void
  pnfs: defer release of pages in layoutget
  nfs: tear down caches in nfs_init_writepagecache when allocation fails
parents 467e9e51 08660043

fs/nfs/Makefile

+9 −9
Original line number Diff line number Diff line
@@ -12,19 +12,19 @@ nfs-$(CONFIG_ROOT_NFS) += nfsroot.o 
nfs-$(CONFIG_SYSCTL)	+= sysctl.o

nfs-$(CONFIG_NFS_FSCACHE) += fscache.o fscache-index.o



obj-$(CONFIG_NFS_V2) += nfs2.o

nfs2-y := nfs2super.o proc.o nfs2xdr.o

obj-$(CONFIG_NFS_V2) += nfsv2.o

nfsv2-y := nfs2super.o proc.o nfs2xdr.o



obj-$(CONFIG_NFS_V3) += nfs3.o

nfs3-y := nfs3super.o nfs3client.o nfs3proc.o nfs3xdr.o

nfs3-$(CONFIG_NFS_V3_ACL) += nfs3acl.o

obj-$(CONFIG_NFS_V3) += nfsv3.o

nfsv3-y := nfs3super.o nfs3client.o nfs3proc.o nfs3xdr.o

nfsv3-$(CONFIG_NFS_V3_ACL) += nfs3acl.o



obj-$(CONFIG_NFS_V4) += nfs4.o

nfs4-y := nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o nfs4super.o nfs4file.o \

obj-$(CONFIG_NFS_V4) += nfsv4.o

nfsv4-y := nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o nfs4super.o nfs4file.o \

	  delegation.o idmap.o callback.o callback_xdr.o callback_proc.o \

	  nfs4namespace.o nfs4getroot.o nfs4client.o

nfs4-$(CONFIG_SYSCTL)	+= nfs4sysctl.o

nfs4-$(CONFIG_NFS_V4_1)	+= pnfs.o pnfs_dev.o

nfsv4-$(CONFIG_SYSCTL)	+= nfs4sysctl.o

nfsv4-$(CONFIG_NFS_V4_1)	+= pnfs.o pnfs_dev.o



obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o

nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o

fs/nfs/client.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ struct nfs_subversion *get_nfs_version(unsigned int version) 


	if (IS_ERR(nfs)) {

		mutex_lock(&nfs_version_mutex);

		request_module("nfs%d", version);

		request_module("nfsv%d", version);

		nfs = find_nfs_version(version);

		mutex_unlock(&nfs_version_mutex);

	}

fs/nfs/idmap.c

+44 −18
Original line number Diff line number Diff line
@@ -61,6 +61,12 @@ struct idmap { 
	struct mutex		idmap_mutex;

};



struct idmap_legacy_upcalldata {

	struct rpc_pipe_msg pipe_msg;

	struct idmap_msg idmap_msg;

	struct idmap *idmap;

};



/**

 * nfs_fattr_init_names - initialise the nfs_fattr owner_name/group_name fields

 * @fattr: fully initialised struct nfs_fattr
@@ -324,6 +330,7 @@ static ssize_t nfs_idmap_get_key(const char *name, size_t namelen, 
		ret = nfs_idmap_request_key(&key_type_id_resolver_legacy,

					    name, namelen, type, data,

					    data_size, idmap);

		idmap->idmap_key_cons = NULL;

		mutex_unlock(&idmap->idmap_mutex);

	}

	return ret;
@@ -380,11 +387,13 @@ static const match_table_t nfs_idmap_tokens = { 
static int nfs_idmap_legacy_upcall(struct key_construction *, const char *, void *);

static ssize_t idmap_pipe_downcall(struct file *, const char __user *,

				   size_t);

static void idmap_release_pipe(struct inode *);

static void idmap_pipe_destroy_msg(struct rpc_pipe_msg *);



static const struct rpc_pipe_ops idmap_upcall_ops = {

	.upcall		= rpc_pipe_generic_upcall,

	.downcall	= idmap_pipe_downcall,

	.release_pipe	= idmap_release_pipe,

	.destroy_msg	= idmap_pipe_destroy_msg,

};
@@ -616,7 +625,8 @@ void nfs_idmap_quit(void) 
	nfs_idmap_quit_keyring();

}



static int nfs_idmap_prepare_message(char *desc, struct idmap_msg *im,

static int nfs_idmap_prepare_message(char *desc, struct idmap *idmap,

				     struct idmap_msg *im,

				     struct rpc_pipe_msg *msg)

{

	substring_t substr;
@@ -659,6 +669,7 @@ static int nfs_idmap_legacy_upcall(struct key_construction *cons, 
				   const char *op,

				   void *aux)

{

	struct idmap_legacy_upcalldata *data;

	struct rpc_pipe_msg *msg;

	struct idmap_msg *im;

	struct idmap *idmap = (struct idmap *)aux;
@@ -666,15 +677,15 @@ static int nfs_idmap_legacy_upcall(struct key_construction *cons, 
	int ret = -ENOMEM;



	/* msg and im are freed in idmap_pipe_destroy_msg */

	msg = kmalloc(sizeof(*msg), GFP_KERNEL);

	if (!msg)

		goto out0;



	im = kmalloc(sizeof(*im), GFP_KERNEL);

	if (!im)

	data = kmalloc(sizeof(*data), GFP_KERNEL);

	if (!data)

		goto out1;



	ret = nfs_idmap_prepare_message(key->description, im, msg);

	msg = &data->pipe_msg;

	im = &data->idmap_msg;

	data->idmap = idmap;



	ret = nfs_idmap_prepare_message(key->description, idmap, im, msg);

	if (ret < 0)

		goto out2;
@@ -683,15 +694,15 @@ static int nfs_idmap_legacy_upcall(struct key_construction *cons, 


	ret = rpc_queue_upcall(idmap->idmap_pipe, msg);

	if (ret < 0)

		goto out2;

		goto out3;



	return ret;



out3:

	idmap->idmap_key_cons = NULL;

out2:

	kfree(im);

	kfree(data);

out1:

	kfree(msg);

out0:

	complete_request_key(cons, ret);

	return ret;

}
@@ -749,9 +760,8 @@ idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen) 
	}



	if (!(im.im_status & IDMAP_STATUS_SUCCESS)) {

		ret = mlen;

		complete_request_key(cons, -ENOKEY);

		goto out_incomplete;

		ret = -ENOKEY;

		goto out;

	}



	namelen_in = strnlen(im.im_name, IDMAP_NAMESZ);
@@ -768,16 +778,32 @@ idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen) 


out:

	complete_request_key(cons, ret);

out_incomplete:

	return ret;

}



static void

idmap_pipe_destroy_msg(struct rpc_pipe_msg *msg)

{

	struct idmap_legacy_upcalldata *data = container_of(msg,

			struct idmap_legacy_upcalldata,

			pipe_msg);

	struct idmap *idmap = data->idmap;

	struct key_construction *cons;

	if (msg->errno) {

		cons = ACCESS_ONCE(idmap->idmap_key_cons);

		idmap->idmap_key_cons = NULL;

		complete_request_key(cons, msg->errno);

	}

	/* Free memory allocated in nfs_idmap_legacy_upcall() */

	kfree(msg->data);

	kfree(msg);

	kfree(data);

}



static void

idmap_release_pipe(struct inode *inode)

{

	struct rpc_inode *rpci = RPC_I(inode);

	struct idmap *idmap = (struct idmap *)rpci->private;

	idmap->idmap_key_cons = NULL;

}



int nfs_map_name_to_uid(const struct nfs_server *server, const char *name, size_t namelen, __u32 *uid)

fs/nfs/nfs3proc.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ do_proc_get_root(struct rpc_clnt *client, struct nfs_fh *fhandle, 
	nfs_fattr_init(info->fattr);

	status = rpc_call_sync(client, &msg, 0);

	dprintk("%s: reply fsinfo: %d\n", __func__, status);

	if (!(info->fattr->valid & NFS_ATTR_FATTR)) {

	if (status == 0 && !(info->fattr->valid & NFS_ATTR_FATTR)) {

		msg.rpc_proc = &nfs3_procedures[NFS3PROC_GETATTR];

		msg.rpc_resp = info->fattr;

		status = rpc_call_sync(client, &msg, 0);

fs/nfs/nfs4_fs.h

+3 −0
Original line number Diff line number Diff line
@@ -205,6 +205,9 @@ extern const struct dentry_operations nfs4_dentry_operations; 
int nfs_atomic_open(struct inode *, struct dentry *, struct file *,

		    unsigned, umode_t, int *);



/* super.c */

extern struct file_system_type nfs4_fs_type;



/* nfs4namespace.c */

rpc_authflavor_t nfs_find_best_sec(struct nfs4_secinfo_flavors *);

struct rpc_clnt *nfs4_create_sec_client(struct rpc_clnt *, struct inode *, struct qstr *);