super.c (13cf199d0088b77ab08a9594df2e73e775317ed2) | super.c (e6d2ebddbc5205635a021a910f2f0e93bc2aa534) |
---|---|
1/* 2 * 3 * Copyright (C) 2011 Novell Inc. 4 * 5 * This program is free software; you can redistribute it and/or modify it 6 * under the terms of the GNU General Public License version 2 as published by 7 * the Free Software Foundation. 8 */ --- 743 unchanged lines hidden (view full) --- 752 NULL 753}; 754 755static int ovl_fill_super(struct super_block *sb, void *data, int silent) 756{ 757 struct path upperpath = { }; 758 struct path workpath = { }; 759 struct dentry *root_dentry; | 1/* 2 * 3 * Copyright (C) 2011 Novell Inc. 4 * 5 * This program is free software; you can redistribute it and/or modify it 6 * under the terms of the GNU General Public License version 2 as published by 7 * the Free Software Foundation. 8 */ --- 743 unchanged lines hidden (view full) --- 752 NULL 753}; 754 755static int ovl_fill_super(struct super_block *sb, void *data, int silent) 756{ 757 struct path upperpath = { }; 758 struct path workpath = { }; 759 struct dentry *root_dentry; |
760 struct inode *realinode; | |
761 struct ovl_entry *oe; 762 struct ovl_fs *ufs; 763 struct path *stack = NULL; 764 char *lowertmp; 765 char *lower; 766 unsigned int numlower; 767 unsigned int stacklen = 0; 768 unsigned int i; --- 235 unchanged lines hidden (view full) --- 1004 for (i = 0; i < numlower; i++) { 1005 oe->lowerstack[i].dentry = stack[i].dentry; 1006 oe->lowerstack[i].mnt = ufs->lower_mnt[i]; 1007 } 1008 kfree(stack); 1009 1010 root_dentry->d_fsdata = oe; 1011 | 760 struct ovl_entry *oe; 761 struct ovl_fs *ufs; 762 struct path *stack = NULL; 763 char *lowertmp; 764 char *lower; 765 unsigned int numlower; 766 unsigned int stacklen = 0; 767 unsigned int i; --- 235 unchanged lines hidden (view full) --- 1003 for (i = 0; i < numlower; i++) { 1004 oe->lowerstack[i].dentry = stack[i].dentry; 1005 oe->lowerstack[i].mnt = ufs->lower_mnt[i]; 1006 } 1007 kfree(stack); 1008 1009 root_dentry->d_fsdata = oe; 1010 |
1012 realinode = d_inode(ovl_dentry_real(root_dentry)); 1013 ovl_inode_init(d_inode(root_dentry), realinode, !!upperpath.dentry); 1014 ovl_copyattr(realinode, d_inode(root_dentry)); | 1011 ovl_inode_init(d_inode(root_dentry), root_dentry); |
1015 1016 sb->s_root = root_dentry; 1017 1018 return 0; 1019 1020out_free_oe: 1021 kfree(oe); 1022out_put_cred: --- 82 unchanged lines hidden --- | 1012 1013 sb->s_root = root_dentry; 1014 1015 return 0; 1016 1017out_free_oe: 1018 kfree(oe); 1019out_put_cred: --- 82 unchanged lines hidden --- |