The miscdevice core now sets file->private_data to the struct miscdevice
so don't fail when this is not NULL.
Reported-by: Giedrius Statkevicius <giedriusw...@gmail.com>
Signed-off-by: Martin Kepplinger <mart...@posteo.de>
---
sorry, I can't read ;) Is this a fix for your problem (instead of the first
patch)?
in case of fuse_ctl_add_conn(fc) failing things should proceed as before.
fs/fuse/inode.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 03246cd..a97a475 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1092,9 +1092,6 @@ static int fuse_fill_super(struct super_block *sb, void
*data, int silent)
}
mutex_lock(&fuse_mutex);
- err = -EINVAL;
- if (file->private_data)
- goto err_unlock;
err = fuse_ctl_add_conn(fc);
if (err)
@@ -1117,6 +1114,7 @@ static int fuse_fill_super(struct super_block *sb, void
*data, int silent)
return 0;
err_unlock:
+ file->private_data = NULL;
mutex_unlock(&fuse_mutex);
err_free_init_req:
fuse_request_free(init_req);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
