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

Commit 5d3dbbea authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

nfsd: remove unnecessary NULL checks from nfsd_cross_mnt 



We can now assume that rqst_exp_get_by_name() does not return NULL; so clean
up some unnecessary checks.

Signed-off-by: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9a25b96c

fs/nfsd/vfs.c

+2 −2
Original line number Diff line number Diff line
@@ -120,14 +120,14 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, 
		mntput(mnt);

		goto out;

	}

	if (exp2 && ((exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2))) {

	if ((exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2)) {

		/* successfully crossed mount point */

		exp_put(exp);

		*expp = exp2;

		dput(dentry);

		*dpp = mounts;

	} else {

		if (exp2) exp_put(exp2);

		exp_put(exp2);

		dput(mounts);

	}

	mntput(mnt);