From: adilger <adilger>
Date: Fri, 30 Jan 2009 21:05:43 +0000 (+0000)
Subject: Branch HEAD
X-Git-Tag: v1_9_160~59
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=fcbca1719787e1772e2c06257e34c872714ed84f;p=fs%2Flustre-release.git

Branch HEAD
Change incorrect error message about file join.
---

diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c
index 96b1d8d..ba2d4c2 100644
--- a/lustre/mdt/mdt_open.c
+++ b/lustre/mdt/mdt_open.c
@@ -896,9 +896,9 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc)
         LASSERT(info->mti_pill->rc_fmt == &RQF_LDLM_INTENT_OPEN);
         ldlm_rep = req_capsule_server_get(info->mti_pill, &RMF_DLM_REP);
 
-        /* TODO: JOIN file */
+        /* JOIN file was deprecated since 1.6.5, but may be revived one day */
         if (create_flags & MDS_OPEN_JOIN_FILE) {
-                CERROR("JOIN file will be supported soon\n");
+                CERROR("file join is unsupported in this version of Lustre\n");
                 GOTO(out, result = err_serious(-EOPNOTSUPP));
         }
         msg_flags = lustre_msg_get_flags(req->rq_reqmsg);