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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs fixes from Al Viro:
 "A bunch of endianness fixes and a couple of nfsd error value fixes.

  Speaking of endianness stuff, I'm rather tempted to slap

	ccflags-y += -D__CHECK_ENDIAN__

  in fs/Makefile, if not making it default for the entire tree; nfsd
  regressions I've caught make one hell of a pile and we'd obviously
  benefit from having that kind of stuff caught earlier..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  lockd: fix the endianness bug
  ocfs2: ->e_leaf_clusters endianness breakage
  ocfs2: ->rl_count endianness breakage
  ocfs: ->rl_used breakage on big-endian
  ocfs2: ->l_next_free_req breakage on big-endian
  btrfs: btrfs_root_readonly() broken on big-endian
  ext4: fix endianness breakage in ext4_split_extent_at()
  nfsd: fix compose_entry_fh() failure exits
  nfsd: fix error value on allocation failure in nfsd4_decode_test_stateid()
  nfsd: fix endianness breakage in TEST_STATEID handling
  nfsd: fix error values returned by nfsd4_lockt() when nfsd_open() fails
  nfsd: fix b0rken error value for setattr on read-only mount
parents bc0cf58e e847469b

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -2166,7 +2166,7 @@ BTRFS_SETGET_STACK_FUNCS(root_last_snapshot, struct btrfs_root_item, 


static inline bool btrfs_root_readonly(struct btrfs_root *root)

{

	return root->root_item.flags & BTRFS_ROOT_SUBVOL_RDONLY;

	return (root->root_item.flags & cpu_to_le64(BTRFS_ROOT_SUBVOL_RDONLY)) != 0;

}



/* struct btrfs_root_backup */

fs/ext4/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -2882,7 +2882,7 @@ static int ext4_split_extent_at(handle_t *handle, 
		if (err)

			goto fix_extent_len;

		/* update the extent length and mark as initialized */

		ex->ee_len = cpu_to_le32(ee_len);

		ex->ee_len = cpu_to_le16(ee_len);

		ext4_ext_try_to_merge(inode, path, ex);

		err = ext4_ext_dirty(handle, inode, path + depth);

		goto out;

fs/lockd/clnt4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int decode_nlm4_stat(struct xdr_stream *xdr, __be32 *stat) 
	p = xdr_inline_decode(xdr, 4);

	if (unlikely(p == NULL))

		goto out_overflow;

	if (unlikely(*p > nlm4_failed))

	if (unlikely(ntohl(*p) > ntohl(nlm4_failed)))

		goto out_bad_xdr;

	*stat = *p;

	return 0;

fs/lockd/clntxdr.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int decode_nlm_stat(struct xdr_stream *xdr, 
	p = xdr_inline_decode(xdr, 4);

	if (unlikely(p == NULL))

		goto out_overflow;

	if (unlikely(*p > nlm_lck_denied_grace_period))

	if (unlikely(ntohl(*p) > ntohl(nlm_lck_denied_grace_period)))

		goto out_enum;

	*stat = *p;

	return 0;

fs/nfsd/nfs3xdr.c

+8 −14
Original line number Diff line number Diff line
@@ -803,13 +803,13 @@ encode_entry_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name, 
	return p;

}



static int

static __be32

compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp,

		const char *name, int namlen)

{

	struct svc_export	*exp;

	struct dentry		*dparent, *dchild;

	int rv = 0;

	__be32 rv = nfserr_noent;



	dparent = cd->fh.fh_dentry;

	exp  = cd->fh.fh_export;
@@ -817,26 +817,20 @@ compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp, 
	if (isdotent(name, namlen)) {

		if (namlen == 2) {

			dchild = dget_parent(dparent);

			if (dchild == dparent) {

			/* filesystem root - cannot return filehandle for ".." */

				dput(dchild);

				return -ENOENT;

			}

			if (dchild == dparent)

				goto out;

		} else

			dchild = dget(dparent);

	} else

		dchild = lookup_one_len(name, dparent, namlen);

	if (IS_ERR(dchild))

		return -ENOENT;

	rv = -ENOENT;

		return rv;

	if (d_mountpoint(dchild))

		goto out;

	rv = fh_compose(fhp, exp, dchild, &cd->fh);

	if (rv)

		goto out;

	if (!dchild->d_inode)

		goto out;

	rv = 0;

	rv = fh_compose(fhp, exp, dchild, &cd->fh);

out:

	dput(dchild);

	return rv;
@@ -845,7 +839,7 @@ out: 
static __be32 *encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name, int namlen)

{

	struct svc_fh	fh;

	int err;

	__be32 err;



	fh_init(&fh, NFS3_FHSIZE);

	err = compose_entry_fh(cd, &fh, name, namlen);

CRA Git | Maintained and supported by SUSTech CRA and CCSE