Branch HEAD

o=adilger
i=johann
i=tom.wang (wangdi)

Disable file join on production releases.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 440be75..522fc71 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -11,6 +11,7 @@ tbd  Sun Microsystems, Inc.
        * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
        * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
         removed cwd "./" (refer to Bugzilla 14399).
+       * File join has been disabled in this release, refer to Bugzilla 16929.
 
 Severity   : enhancement
 Bugzilla   : 15966

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 96961fc..a1b0ef6 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -2696,6 +2696,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;
 
@@ -2705,6 +2707,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));

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 0602ca4..7e7cb4b 100644 (file)
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -3,8 +3,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test:  3192 15528/3811 9977 15528/11549
-ALWAYS_EXCEPT="                 14b  19         28   29          $SANITYN_EXCEPT"
+# bug number for skipped test: 3192 15528/3811 16929 9977 15528/11549
+ALWAYS_EXCEPT="                14b  19         22    28   29          $SANITYN_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 # bug number for skipped test:                                                    12652 12652