Move some directory related code in else block. This is pure code
reorganization and no functionality change.
Next patch enables redirect processing on metacopy files and needs this
change. By keeping non-functional changes in a separate patch, next patch
looks much smaller and cleaner.
Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
---
fs/overlayfs/namei.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index b25e32cf5916..880c7faea41a 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -269,22 +269,23 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,
d->stop = !err;
d->metacopy = !!err;
goto out;
- }
- if (last_element) {
- if (d->metacopy) {
- err = -ESTALE;
- goto out_err;
+ } else {
+ if (last_element) {
+ if (d->metacopy) {
+ err = -ESTALE;
+ goto out_err;
+ }
+ d->is_dir = true;
}
- d->is_dir = true;
- }
- if (d->last)
- goto out;
+ if (d->last)
+ goto out;
- if (ovl_is_opaquedir(this)) {
- d->stop = true;
- if (last_element)
- d->opaque = true;
- goto out;
+ if (ovl_is_opaquedir(this)) {
+ d->stop = true;
+ if (last_element)
+ d->opaque = true;
+ goto out;
+ }
}
err = ovl_check_redirect(this, d, prelen, post);
if (err)
--
2.13.6
--
To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
