David Howells <dhowells@xxxxxxxxxx> writes:
> I'd also recommend changing the "ok" and "common" labels in do_last() to
> something a bit more meaningful, perhaps:
>
> common -> finish_open
> ok -> finish_open_may_want_write
Okay. I'll do a separate label cleanup patch.
>
> Also, does it make sense to combine:
>
> if (!S_ISREG(nd->inode->i_mode))
> will_truncate = 0;
>
> with:
>
> int will_truncate = open_flag & O_TRUNC;
>
> up at the top of the function.
We need to check nd->inode->i_mode *after* the lookup. So top of the
function is not a good place.
>
> As the code stands, if ->atomic_open() opens the file but does not create it,
> handle_truncate() will be called on it even if it is not a regular file,
> whereas by the normal path, it won't.
Right, that appears to be a bug. Thanks for spotting.
>
> I would also be tempted to move the body of:
>
> if (filp == ERR_PTR(-EOPENSTALE) && save_parent.dentry && !retried) {
> BUG_ON(save_parent.dentry != dir);
> path_put(&nd->path);
> nd->path = save_parent;
> nd->inode = dir->d_inode;
> save_parent.mnt = NULL;
> save_parent.dentry = NULL;
> if (want_write) {
> mnt_drop_write(nd->path.mnt);
> want_write = 0;
> }
> retried = true;
> goto retry_lookup;
> }
>
> before the retry_lookup label and then goto around it from the preceding
> if-else statement or place it at the bottom to make the "common:" block simpler
> to read. Also, you could nest the if (filp == ERR_PTR(-EOPENSTALE)...) inside
> if (IS_ERR(filp)).
Yeah, moving to the bottom sounds like a good cleanup.
>
> Can I also suggest being consistent about the use of int v bool? "created"
> and "retried" are bool, but "will_truncate", "want_write" and "symlink_ok" are
> not. Granted some of this is likely inherited from the previous
> incarnation.
Yes, will do a cleanup patch.
Thanks,
Miklos
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
