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

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

Merge tag 'nfs-for-3.10-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull two NFS client fixes from Trond Myklebust:
 - Fix a regression that broke NFS mounting using klibc and busybox
 - Stable fix to check access modes correctly on NFSv4 delegated open()

* tag 'nfs-for-3.10-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Fix security flavor negotiation with legacy binary mounts
  NFSv4: Fix a thinko in nfs4_try_open_cached
parents 1d822d60 eb54d437

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ static struct nfs4_state *nfs4_try_open_cached(struct nfs4_opendata *opendata) 
	struct nfs4_state *state = opendata->state;

	struct nfs_inode *nfsi = NFS_I(state->inode);

	struct nfs_delegation *delegation;

	int open_mode = opendata->o_arg.open_flags & (O_EXCL|O_TRUNC);

	int open_mode = opendata->o_arg.open_flags;

	fmode_t fmode = opendata->o_arg.fmode;

	nfs4_stateid stateid;

	int ret = -EAGAIN;

fs/nfs/super.c

+2 −0
Original line number Diff line number Diff line
@@ -1942,6 +1942,7 @@ static int nfs23_validate_mount_data(void *options, 
		args->namlen		= data->namlen;

		args->bsize		= data->bsize;



		args->auth_flavors[0] = RPC_AUTH_UNIX;

		if (data->flags & NFS_MOUNT_SECFLAVOUR)

			args->auth_flavors[0] = data->pseudoflavor;

		if (!args->nfs_server.hostname)
@@ -2637,6 +2638,7 @@ static int nfs4_validate_mount_data(void *options, 
			goto out_no_address;

		args->nfs_server.port = ntohs(((struct sockaddr_in *)sap)->sin_port);



		args->auth_flavors[0] = RPC_AUTH_UNIX;

		if (data->auth_flavourlen) {

			if (data->auth_flavourlen > 1)

				goto out_inval_auth;