Commit 4ec30cb9 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] Change NFSEXP_CROSSMNT to NFSEXP_CROSSMOUNT

NFSEXP_CROSSMNT used to mean something different, so
using a different name reduces the chance of confusion.
Also there is currently a surplus of vowels, so there is
no need to be frugal
parent 6ed499a9
......@@ -999,7 +999,7 @@ struct flags {
{ NFSEXP_KERBEROS, { "kerberos", ""}},
{ NFSEXP_SUNSECURE, { "sunsecure", ""}},
{ NFSEXP_NOHIDE, {"nohide", ""}},
{ NFSEXP_CROSSMNT, {"crossmnt", ""}},
{ NFSEXP_CROSSMOUNT, {"crossmnt", ""}},
{ NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}},
{ NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},
#ifdef MSNFS
......
......@@ -99,7 +99,7 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
mntput(mnt);
goto out;
}
if (exp2 && ((exp->ex_flags & NFSEXP_CROSSMNT) || EX_NOHIDE(exp2))) {
if (exp2 && ((exp->ex_flags & NFSEXP_CROSSMOUNT) || EX_NOHIDE(exp2))) {
/* successfully crossed mount point */
exp_put(exp);
*expp = exp2;
......
......@@ -40,7 +40,7 @@
#define NFSEXP_NOAUTHNLM 0x0800 /* Don't authenticate NLM requests - just trust */
#define NFSEXP_MSNFS 0x1000 /* do silly things that MS clients expect */
#define NFSEXP_FSID 0x2000
#define NFSEXP_CROSSMNT 0x4000
#define NFSEXP_CROSSMOUNT 0x4000
#define NFSEXP_ALLFLAGS 0x7FFF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment