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

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

Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux 

Pull nfsd bugfixes from J. Bruce Fields:
 "One bugfix, and one minor header fix from Jeff Layton while we're
  here"

* 'for-3.4' of git://linux-nfs.org/~bfields/linux:
  nfsd: include cld.h in the headers_install target
  nfsd: don't fail unchecked creates of non-special files
parents 19853301 d22053cd

fs/nfsd/nfs4proc.c

+4 −4
Original line number Diff line number Diff line
@@ -240,10 +240,10 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o 
		status = nfsd_lookup(rqstp, current_fh,

				     open->op_fname.data, open->op_fname.len, resfh);

		fh_unlock(current_fh);

	}

	if (status)

		goto out;

	status = nfsd_check_obj_isreg(resfh);

	}

	if (status)

		goto out;

fs/nfsd/vfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1458,7 +1458,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, 
		switch (createmode) {

		case NFS3_CREATE_UNCHECKED:

			if (! S_ISREG(dchild->d_inode->i_mode))

				err = nfserr_exist;

				goto out;

			else if (truncp) {

				/* in nfsv4, we need to treat this case a little

				 * differently.  we don't want to truncate the

include/linux/nfsd/Kbuild

+1 −0
Original line number Diff line number Diff line 
header-y += cld.h

header-y += debug.h

header-y += export.h

header-y += nfsfh.h