From c38c4510fb62a0e593d278e9c474a94d5b3f0acc Mon Sep 17 00:00:00 2001 From: anserper Date: Mon, 13 Apr 2009 23:00:14 +0000 Subject: [PATCH] b=19115 i=Andreas Dilger i=Alexander Zarochentsev avoid oops coming from a wrong userspace flag passed to open(2); test 33b is temporarily disabled --- lustre/mdc/mdc_lib.c | 5 ++--- lustre/tests/sanity.sh | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c index 2df14f6..a7f4e83 100644 --- a/lustre/mdc/mdc_lib.c +++ b/lustre/mdc/mdc_lib.c @@ -237,9 +237,8 @@ void mdc_create_pack(struct ptlrpc_request *req, int offset, static __u32 mds_pack_open_flags(__u32 flags, __u32 mode) { __u32 cr_flags = (flags & (FMODE_READ | FMODE_WRITE | - MDS_OPEN_DELAY_CREATE | MDS_OPEN_HAS_EA | - MDS_OPEN_HAS_OBJS | MDS_OPEN_OWNEROVERRIDE | - MDS_OPEN_LOCK)); + MDS_OPEN_DELAY_CREATE | MDS_OPEN_HAS_OBJS | + MDS_OPEN_OWNEROVERRIDE | MDS_OPEN_LOCK)); if (flags & O_CREAT) cr_flags |= MDS_OPEN_CREAT; if (flags & O_EXCL) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index fb05e83..6c8c8f6 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -7,8 +7,8 @@ set -e ONLY=${ONLY:-"$*"} -# bug number for skipped test: 13297 2108 9789 3637 9789 3561 12622 15528/2330 5188 10764 16410 -ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27u 42a 42b 42c 42d 45 51d 62 68 75 76 $SANITY_EXCEPT"} +# bug number for skipped test: 13297 19115 2108 9789 3637 9789 3561 12622 15528/2330 5188 10764 16410 +ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27u 33b 42a 42b 42c 42d 45 51d 62 68 75 76 $SANITY_EXCEPT"} # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! # Tests that fail on uml, maybe elsewhere, FIXME -- 1.8.3.1