diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-02-20 12:58:52 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-02-20 12:58:52 +0300 |
| commit | ce7b9facdf43b42fb95bdff9069aefeddb7d0a69 (patch) | |
| tree | db49cfb72630e88172b51e586acfa9ddb22b5dc1 /fs/overlayfs/copy_up.c | |
| parent | a95104fd3393080e8bcca348f51996f5f0f5ccb6 (diff) | |
| parent | 4330397e4e8a662f36d101659e2a59ce32e76ff4 (diff) | |
| download | linux-ce7b9facdf43b42fb95bdff9069aefeddb7d0a69.tar.xz | |
Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into for-next
Diffstat (limited to 'fs/overlayfs/copy_up.c')
| -rw-r--r-- | fs/overlayfs/copy_up.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index ea10a8719107..24f640441bd9 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.c @@ -191,7 +191,6 @@ int ovl_set_attr(struct dentry *upperdentry, struct kstat *stat) ovl_set_timestamps(upperdentry, stat); return err; - } static int ovl_copy_up_locked(struct dentry *workdir, struct dentry *upperdir, @@ -385,7 +384,7 @@ int ovl_copy_up(struct dentry *dentry) struct kstat stat; enum ovl_path_type type = ovl_path_type(dentry); - if (type != OVL_PATH_LOWER) + if (OVL_TYPE_UPPER(type)) break; next = dget(dentry); @@ -394,7 +393,7 @@ int ovl_copy_up(struct dentry *dentry) parent = dget_parent(next); type = ovl_path_type(parent); - if (type != OVL_PATH_LOWER) + if (OVL_TYPE_UPPER(type)) break; dput(next); |