From: bobijam <bobijam>
Date: Thu, 25 Sep 2008 01:37:30 +0000 (+0000)
Subject: Branch b1_8_gate
X-Git-Tag: v1_7_110~1^66~1
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=dec76b8e4f19674eb6c71904ea3dca8b5efe8f2d;p=fs%2Flustre-release.git

Branch b1_8_gate
b=16929
o=adilger
i=johann
i=tom.wang (wangdi)

Disable file join on production releases.
---

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 7084756..33c34a5 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -2651,6 +2651,8 @@ error:
         case EXT3_IOC_GETVERSION:
                 RETURN(put_user(inode->i_generation, (int *)arg));
         case LL_IOC_JOIN: {
+#if LUSTRE_FIX >= 50
+                /* Allow file join in beta builds to allow debuggging */
                 char *ftail;
                 int rc;
 
@@ -2660,6 +2662,10 @@ error:
                 rc = ll_file_join(inode, file, ftail);
                 putname(ftail);
                 RETURN(rc);
+#else
+                CWARN("file join is not supported in this version of Lustre\n");
+                RETURN(-ENOTTY);
+#endif
         }
         case LL_IOC_GROUP_LOCK:
                 RETURN(ll_get_grouplock(inode, file, arg));