Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] uml: hostfs: unuse ROOT_DEV

Minimal patch removing uses of ROOT_DEV; next patch unexports it. I've
opposed this, but I've planned to reintroduce the functionality without using
ROOT_DEV.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Paolo 'Blaisorblade' Giarrusso and committed by
Linus Torvalds
a0d43df9 20d00213

-9
-9
fs/hostfs/hostfs_kern.c
··· 15 15 #include <linux/pagemap.h> 16 16 #include <linux/blkdev.h> 17 17 #include <linux/list.h> 18 - #include <linux/root_dev.h> 19 18 #include <linux/statfs.h> 20 19 #include <linux/kdev_t.h> 21 20 #include <asm/uaccess.h> ··· 159 160 ino->i_size = i_size; 160 161 ino->i_blksize = i_blksize; 161 162 ino->i_blocks = i_blocks; 162 - if((ino->i_sb->s_dev == ROOT_DEV) && (ino->i_uid == getuid())) 163 - ino->i_uid = 0; 164 163 return(0); 165 164 } 166 165 ··· 838 841 attrs.ia_mode = attr->ia_mode; 839 842 } 840 843 if(attr->ia_valid & ATTR_UID){ 841 - if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 842 - (attr->ia_uid == 0)) 843 - attr->ia_uid = getuid(); 844 844 attrs.ia_valid |= HOSTFS_ATTR_UID; 845 845 attrs.ia_uid = attr->ia_uid; 846 846 } 847 847 if(attr->ia_valid & ATTR_GID){ 848 - if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 849 - (attr->ia_gid == 0)) 850 - attr->ia_gid = getgid(); 851 848 attrs.ia_valid |= HOSTFS_ATTR_GID; 852 849 attrs.ia_gid = attr->ia_gid; 853 850 }