aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2014-04-29 17:09:54 -0400
committerJiri Slaby <jslaby@suse.cz>2014-05-05 11:19:42 +0200
commit12716b1214464dc9b5d418f8e7a9f465ae03e241 (patch)
tree8033542ec2ee551d3d97b9a4fbd77d674f1cc2e2
parentec44c106c1641a532faaed93a7d26d4b3e90cc25 (diff)
dcache: restore error on restart in prepend_path
We need to restore all variables including error (as it is done in the upstream kernel). The variable error was errorneously not restored when backporting the patch ede4cebce16f5643c61aedd6d88d9070a1d23a68 (prepend_path() needs to reinitialize dentry/vfsmount/mnt on restarts). This should be applied only to the 3.12 series. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--fs/dcache.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dcache.c b/fs/dcache.c
index 30b38e23caa7..008f524e195a 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -2893,6 +2893,7 @@ static int prepend_path(const struct path *path,
restart:
bptr = *buffer;
blen = *buflen;
+ error = 0;
dentry = path->dentry;
vfsmnt = path->mnt;
mnt = real_mount(vfsmnt);