Commit 1e8a576e authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman

staging/lustre/llite: don't check for O_CREAT in it_create_mode

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. 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-3517Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarLai Siyao <lai.siyao@intel.com>
Reviewed-by: default avatarPeng Tao <bergwolf@gmail.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c03a98b4
...@@ -523,8 +523,7 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry, ...@@ -523,8 +523,7 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
icbd.icbd_childp = &dentry; icbd.icbd_childp = &dentry;
icbd.icbd_parent = parent; icbd.icbd_parent = parent;
if (it->it_op & IT_CREAT || if (it->it_op & IT_CREAT)
(it->it_op & IT_OPEN && it->it_create_mode & O_CREAT))
opc = LUSTRE_OPC_CREATE; opc = LUSTRE_OPC_CREATE;
else else
opc = LUSTRE_OPC_ANY; opc = LUSTRE_OPC_ANY;
...@@ -623,7 +622,7 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry, ...@@ -623,7 +622,7 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
return -ENOMEM; return -ENOMEM;
it->it_op = IT_OPEN; it->it_op = IT_OPEN;
if (mode) { if (open_flags & O_CREAT) {
it->it_op |= IT_CREAT; it->it_op |= IT_CREAT;
lookup_flags |= LOOKUP_CREATE; lookup_flags |= LOOKUP_CREATE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment