From: Peng Tao <bergwolf@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
"John L. Hammond" <john.hammond@intel.com>,
Peng Tao <bergwolf@gmail.com>,
Andreas Dilger <andreas.dilger@intel.com>
Subject: [PATCH v2 07/12] staging/lustre/llite: don't check for O_CREAT in it_create_mode
Date: Tue, 26 Nov 2013 23:04:41 +0800 [thread overview]
Message-ID: <1385478286-5525-8-git-send-email-bergwolf@gmail.com> (raw)
In-Reply-To: <1385478286-5525-1-git-send-email-bergwolf@gmail.com>
From: "John L. Hammond" <john.hammond@intel.com>
ll_lookup_it() checks for O_CREAT in struct lookup_intent's
it_create_mode member which is nonsensical, as it_create_mode is used
for file mode bits (S_IFREG, S_IRUSR, ...). Fix this by just checking
for IT_CREATE in it_op and do the same in llu_lookup_it(). This will
not affect the behavior of either function, since if O_CREATE (0100)
is actually set in o_create_mode then IT_CREATE must have been set in
it_op. In ll_atomic_open() check for O_CREAT in the open_flags
parameter rather than testing mode.
Lustre-change: http://review.whamcloud.com/6786
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3517
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: Peng Tao <bergwolf@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
---
drivers/staging/lustre/lustre/llite/namei.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 804451f..5242233 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -523,8 +523,7 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
icbd.icbd_childp = &dentry;
icbd.icbd_parent = parent;
- if (it->it_op & IT_CREAT ||
- (it->it_op & IT_OPEN && it->it_create_mode & O_CREAT))
+ if (it->it_op & IT_CREAT)
opc = LUSTRE_OPC_CREATE;
else
opc = LUSTRE_OPC_ANY;
@@ -623,7 +622,7 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
return -ENOMEM;
it->it_op = IT_OPEN;
- if (mode) {
+ if (open_flags & O_CREAT) {
it->it_op |= IT_CREAT;
lookup_flags |= LOOKUP_CREATE;
}
--
1.7.9.5
next prev parent reply other threads:[~2013-11-26 15:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-26 15:04 [PATCH v2 00/12] staging/lustre: sync with extern tree, set 2 Peng Tao
2013-11-26 15:04 ` [PATCH v2 01/12] Revert "staging/lustre/nfs: writing to new files will return ENOENT" Peng Tao
2013-11-26 15:04 ` [PATCH v2 02/12] staging/lustre/llog: MGC to use OSD API for backup logs Peng Tao
2013-11-26 18:33 ` Levente Kurusa
2013-11-26 15:04 ` [PATCH v2 03/12] staging/lustre: constify uuid argument of obd_uuid2str Peng Tao
2013-11-26 15:04 ` [PATCH v2 04/12] staging/lustre: make obd_uuid_equals return bool Peng Tao
2013-11-26 15:04 ` [PATCH v2 05/12] staging/lustre/scrub: OI scrub on OST Peng Tao
2013-11-26 15:04 ` [PATCH v2 06/12] staging/lustre: make code align in lma_incompat Peng Tao
2013-11-26 15:04 ` Peng Tao [this message]
2013-11-26 15:04 ` [PATCH v2 08/12] staging/lustre/build: clean up unused variables and dead code Peng Tao
2013-11-26 15:04 ` [PATCH v2 09/12] staging/lustre/build: fix compilation issue with is_compat_task Peng Tao
2013-11-26 15:04 ` [PATCH v2 10/12] staging/lustre/ptlrpc: Fix a crash when dereferencing NULL pointer Peng Tao
2013-11-26 15:04 ` [PATCH v2 11/12] staging/lustre/hsm: Add hsm_release feature Peng Tao
2013-11-26 15:04 ` [PATCH v2 12/12] staging/lustre/llite: extended attribute cache Peng Tao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1385478286-5525-8-git-send-email-bergwolf@gmail.com \
--to=bergwolf@gmail.com \
--cc=andreas.dilger@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=john.hammond@intel.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.