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

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

Merge tag 'nfs-for-4.2-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
 "Highlights include:

  Stable patches:
   - Fix a situation where the client uses the wrong (zero) stateid.
   - Fix a memory leak in nfs_do_recoalesce

  Bugfixes:
   - Plug a memory leak when ->prepare_layoutcommit fails
   - Fix an Oops in the NFSv4 open code
   - Fix a backchannel deadlock
   - Fix a livelock in sunrpc when sendmsg fails due to low memory
     availability
   - Don't revalidate the mapping if both size and change attr are up to
     date
   - Ensure we don't miss a file extension when doing pNFS
   - Several fixes to handle NFSv4.1 sequence operation status bits
     correctly
   - Several pNFS layout return bugfixes"

* tag 'nfs-for-4.2-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (28 commits)
  nfs: Fix an oops caused by using other thread's stack space in ASYNC mode
  nfs: plug memory leak when ->prepare_layoutcommit fails
  SUNRPC: Report TCP errors to the caller
  sunrpc: translate -EAGAIN to -ENOBUFS when socket is writable.
  NFSv4.2: handle NFS-specific llseek errors
  NFS: Don't clear desc->pg_moreio in nfs_do_recoalesce()
  NFS: Fix a memory leak in nfs_do_recoalesce
  NFS: nfs_mark_for_revalidate should always set NFS_INO_REVAL_PAGECACHE
  NFS: Remove the "NFS_CAP_CHANGE_ATTR" capability
  NFS: Set NFS_INO_REVAL_PAGECACHE if the change attribute is uninitialised
  NFS: Don't revalidate the mapping if both size and change attr are up to date
  NFSv4/pnfs: Ensure we don't miss a file extension
  NFSv4: We must set NFS_OPEN_STATE flag in nfs_resync_open_stateid_locked
  SUNRPC: xprt_complete_bc_request must also decrement the free slot count
  SUNRPC: Fix a backchannel deadlock
  pNFS: Don't throw out valid layout segments
  pNFS: pnfs_roc_drain() fix a race with open
  pNFS: Fix races between return-on-close and layoutreturn.
  pNFS: pnfs_roc_drain should return 'true' when sleeping
  pNFS: Layoutreturn must invalidate all existing layout segments.
  ...
parents 2ee6b000 a49c2691

fs/nfs/client.c

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ static int nfs_init_server(struct nfs_server *server, 
	server->options = data->options;

	server->caps |= NFS_CAP_HARDLINKS|NFS_CAP_SYMLINKS|NFS_CAP_FILEID|

		NFS_CAP_MODE|NFS_CAP_NLINK|NFS_CAP_OWNER|NFS_CAP_OWNER_GROUP|

		NFS_CAP_ATIME|NFS_CAP_CTIME|NFS_CAP_MTIME|NFS_CAP_CHANGE_ATTR;

		NFS_CAP_ATIME|NFS_CAP_CTIME|NFS_CAP_MTIME;



	if (data->rsize)

		server->rsize = nfs_block_size(data->rsize, NULL);

fs/nfs/flexfilelayout/flexfilelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -1852,7 +1852,7 @@ ff_layout_mirror_prepare_stats(struct nfs42_layoutstat_args *args, 
	struct nfs42_layoutstat_devinfo *devinfo;

	int i;



	for (i = 0; i <= FF_LAYOUT_MIRROR_COUNT(pls); i++) {

	for (i = 0; i < FF_LAYOUT_MIRROR_COUNT(pls); i++) {

		if (*dev_count >= dev_limit)

			break;

		mirror = FF_LAYOUT_COMP(pls, i);

fs/nfs/inode.c

+8 −7
Original line number Diff line number Diff line
@@ -442,8 +442,9 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st 
			nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);

		if (fattr->valid & NFS_ATTR_FATTR_CHANGE)

			inode->i_version = fattr->change_attr;

		else if (nfs_server_capable(inode, NFS_CAP_CHANGE_ATTR))

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);

		else

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR

				| NFS_INO_REVAL_PAGECACHE);

		if (fattr->valid & NFS_ATTR_FATTR_SIZE)

			inode->i_size = nfs_size_to_loff_t(fattr->size);

		else
@@ -1244,9 +1245,11 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat 
	if (fattr->valid & NFS_ATTR_FATTR_SIZE) {

		cur_size = i_size_read(inode);

		new_isize = nfs_size_to_loff_t(fattr->size);

		if (cur_size != new_isize && nfsi->nrequests == 0)

		if (cur_size != new_isize)

			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;

	}

	if (nfsi->nrequests != 0)

		invalid &= ~NFS_INO_REVAL_PAGECACHE;



	/* Have any file permissions changed? */

	if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO))
@@ -1684,13 +1687,12 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			invalid |= NFS_INO_INVALID_ATTR

				| NFS_INO_INVALID_DATA

				| NFS_INO_INVALID_ACCESS

				| NFS_INO_INVALID_ACL

				| NFS_INO_REVAL_PAGECACHE;

				| NFS_INO_INVALID_ACL;

			if (S_ISDIR(inode->i_mode))

				nfs_force_lookup_revalidate(inode);

			inode->i_version = fattr->change_attr;

		}

	} else if (server->caps & NFS_CAP_CHANGE_ATTR)

	} else

		nfsi->cache_validity |= save_cache_validity;



	if (fattr->valid & NFS_ATTR_FATTR_MTIME) {
@@ -1717,7 +1719,6 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			if ((nfsi->nrequests == 0) || new_isize > cur_isize) {

				i_size_write(inode, new_isize);

				invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;

				invalid &= ~NFS_INO_REVAL_PAGECACHE;

			}

			dprintk("NFS: isize change on server for file %s/%ld "

					"(%Ld to %Ld)\n",

fs/nfs/internal.h

+21 −0
Original line number Diff line number Diff line
@@ -296,6 +296,22 @@ extern struct rpc_procinfo nfs4_procedures[]; 


#ifdef CONFIG_NFS_V4_SECURITY_LABEL

extern struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags);

static inline struct nfs4_label *

nfs4_label_copy(struct nfs4_label *dst, struct nfs4_label *src)

{

	if (!dst || !src)

		return NULL;



	if (src->len > NFS4_MAXLABELLEN)

		return NULL;



	dst->lfs = src->lfs;

	dst->pi = src->pi;

	dst->len = src->len;

	memcpy(dst->label, src->label, src->len);



	return dst;

}

static inline void nfs4_label_free(struct nfs4_label *label)

{

	if (label) {
@@ -316,6 +332,11 @@ static inline void nfs4_label_free(void *label) {} 
static inline void nfs_zap_label_cache_locked(struct nfs_inode *nfsi)

{

}

static inline struct nfs4_label *

nfs4_label_copy(struct nfs4_label *dst, struct nfs4_label *src)

{

	return NULL;

}

#endif /* CONFIG_NFS_V4_SECURITY_LABEL */



/* proc.c */

fs/nfs/nfs42proc.c

+18 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int nfs42_proc_deallocate(struct file *filep, loff_t offset, loff_t len) 
	return err;

}



loff_t nfs42_proc_llseek(struct file *filep, loff_t offset, int whence)

static loff_t _nfs42_proc_llseek(struct file *filep, loff_t offset, int whence)

{

	struct inode *inode = file_inode(filep);

	struct nfs42_seek_args args = {
@@ -171,6 +171,23 @@ loff_t nfs42_proc_llseek(struct file *filep, loff_t offset, int whence) 
	return vfs_setpos(filep, res.sr_offset, inode->i_sb->s_maxbytes);

}



loff_t nfs42_proc_llseek(struct file *filep, loff_t offset, int whence)

{

	struct nfs_server *server = NFS_SERVER(file_inode(filep));

	struct nfs4_exception exception = { };

	int err;



	do {

		err = _nfs42_proc_llseek(filep, offset, whence);

		if (err == -ENOTSUPP)

			return -EOPNOTSUPP;

		err = nfs4_handle_exception(server, err, &exception);

	} while (exception.retry);



	return err;

}





static void

nfs42_layoutstat_prepare(struct rpc_task *task, void *calldata)

{