Skip to content

Commit

Permalink
do_last(): reorder and simplify a bit
Browse files Browse the repository at this point in the history
bugger off on negatives a bit earlier, simplify the tests

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Mar 5, 2016
1 parent 05ef1c5 commit 6583fe2
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -3118,6 +3118,7 @@ static int do_last(struct nameidata *nd,
return error;

BUG_ON(nd->inode != dir->d_inode);
BUG_ON(nd->flags & LOOKUP_RCU);
} else {
/* create side of things */
/*
Expand Down Expand Up @@ -3171,12 +3172,6 @@ static int do_last(struct nameidata *nd,
goto finish_open_created;
}

/*
* create/update audit record if it already exists.
*/
if (d_is_positive(path.dentry))
audit_inode(nd->name, path.dentry, 0);

/*
* If atomic_open() acquired write access it is dropped now due to
* possible mount and symlink following (this might be optimized away if
Expand All @@ -3187,6 +3182,16 @@ static int do_last(struct nameidata *nd,
got_write = false;
}

if (unlikely(d_is_negative(path.dentry))) {
path_to_nameidata(&path, nd);
return -ENOENT;
}

/*
* create/update audit record if it already exists.
*/
audit_inode(nd->name, path.dentry, 0);

if (unlikely((open_flag & (O_EXCL | O_CREAT)) == (O_EXCL | O_CREAT))) {
path_to_nameidata(&path, nd);
return -EEXIST;
Expand All @@ -3196,12 +3201,7 @@ static int do_last(struct nameidata *nd,
if (unlikely(error < 0))
return error;

BUG_ON(nd->flags & LOOKUP_RCU);
seq = 0; /* out of RCU mode, so the value doesn't matter */
if (unlikely(d_is_negative(path.dentry))) {
path_to_nameidata(&path, nd);
return -ENOENT;
}
inode = d_backing_inode(path.dentry);
finish_lookup:
if (nd->depth)
Expand Down

0 comments on commit 6583fe2

Please sign in to comment.