[PATCH] kNFSd: Rename NFSEXP_CROSSMNT to NFSEXP_NOHIDE

becase nohide is the user-space visible name
for the flag, and we are about to define a real
CROSSMNT.

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index dfb58e34aefa00126b40c8a6f1084d49653b8af6..00caf0afa1be795707403226955f2014f8c539c6 100644 (file)
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -917,7 +917,7 @@ struct flags {
        { NFSEXP_UIDMAP, {"uidmap", ""}},
        { NFSEXP_KERBEROS, { "kerberos", ""}},
        { NFSEXP_SUNSECURE, { "sunsecure", ""}},
-       { NFSEXP_CROSSMNT, {"nohide", ""}},
+       { NFSEXP_NOHIDE, {"nohide", ""}},
        { NFSEXP_NOSUBTREECHECK, {"no_subtree_check", ""}},
        { NFSEXP_NOAUTHNLM, {"insecure_locks", ""}},
 #ifdef MSNFS

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 088ee1438f54f487a456af7adfa1ef27962222c5..e869ef882cd619526c25080435c919e58870bdf1 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -79,7 +79,7 @@ static struct raparms *               raparm_cache;
  * N.B. After this call _both_ fhp and resfh need an fh_put
  *
  * If the lookup would cross a mountpoint, and the mounted filesystem
- * is exported to the client with NFSEXP_CROSSMNT, then the lookup is
+ * is exported to the client with NFSEXP_NOHIDE, then the lookup is
  * accepted as it stands and the mounted directory is
  * returned. Otherwise the covered directory is returned.
  * NOTE: this mountpoint crossing is not supported properly by all
@@ -115,7 +115,7 @@ nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name,
                        read_lock(&dparent_lock);
                        dentry = dget(dparent->d_parent);
                        read_unlock(&dparent_lock);
-               } else  if (!EX_CROSSMNT(exp))
+               } else  if (!EX_NOHIDE(exp))
                        dentry = dget(dparent); /* .. == . just like at / */
                else {
                        /* checking mountpoint crossing is very different when stepping up */
@@ -159,7 +159,7 @@ nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name,
                                ;
                        exp2 = exp_get_by_name(exp->ex_client, mnt, 
                                               mounts, &rqstp->rq_chandle);
-                       if (exp2 && EX_CROSSMNT(exp2)) {
+                       if (exp2 && EX_NOHIDE(exp2)) {
                                /* successfully crossed mount point */
                                exp_put(exp);
                                exp = exp2;

diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index 864e3b801f0f8a4e539f0b7ddcf197429f2496e1..c37f57ae878b983d9fe082952ae606a38af87dbd 100644 (file)
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -35,7 +35,7 @@
 #define NFSEXP_UIDMAP          0x0040
 #define NFSEXP_KERBEROS                0x0080          /* not available */
 #define NFSEXP_SUNSECURE       0x0100
-#define NFSEXP_CROSSMNT                0x0200
+#define NFSEXP_NOHIDE          0x0200
 #define NFSEXP_NOSUBTREECHECK  0x0400
 #define        NFSEXP_NOAUTHNLM        0x0800          /* Don't authenticate NLM requests - just trust */
 #define NFSEXP_MSNFS           0x1000  /* do silly things that MS clients expect */
@@ -73,7 +73,7 @@ struct svc_expkey {
 #define EX_SECURE(exp)         (!((exp)->ex_flags & NFSEXP_INSECURE_PORT))
 #define EX_ISSYNC(exp)         (!((exp)->ex_flags & NFSEXP_ASYNC))
 #define EX_RDONLY(exp)         ((exp)->ex_flags & NFSEXP_READONLY)
-#define EX_CROSSMNT(exp)       ((exp)->ex_flags & NFSEXP_CROSSMNT)
+#define EX_NOHIDE(exp) ((exp)->ex_flags & NFSEXP_NOHIDE)
 #define EX_SUNSECURE(exp)      ((exp)->ex_flags & NFSEXP_SUNSECURE)
 #define EX_WGATHER(exp)                ((exp)->ex_flags & NFSEXP_GATHERED_WRITES)