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

Commit a1033be7 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds
Browse files

knfsd: Fixed problem with NFS exporting directories which are mounted on. 



Recent changes in NFSd cause a directory which is mounted-on
to not appear properly when the filesystem containing it is exported.

*exp_get* now returns -ENOENT rather than NULL and when
  commit 5d3dbbea
removed the NULL checks, it didn't add a check for -ENOENT.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7d941432

fs/nfsd/vfs.c

+2 −1
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, 


	exp2 = rqst_exp_get_by_name(rqstp, mnt, mounts);

	if (IS_ERR(exp2)) {

		if (PTR_ERR(exp2) != -ENOENT)

			err = PTR_ERR(exp2);

		dput(mounts);

		mntput(mnt);