Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

[firefly-linux-kernel-4.4.55.git] / fs / sysfs / inode.c

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index feb2d69396cff09c0fb27245a4b04fb767133daf..0ce3ccf7f401ba6748cb84735e54130fca403506 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -62,8 +62,8 @@ static struct sysfs_inode_attrs *sysfs_init_inode_attrs(struct sysfs_dirent *sd)
 
        /* assign default attributes */
        iattrs->ia_mode = sd->s_mode;
-       iattrs->ia_uid = 0;
-       iattrs->ia_gid = 0;
+       iattrs->ia_uid = GLOBAL_ROOT_UID;
+       iattrs->ia_gid = GLOBAL_ROOT_GID;
        iattrs->ia_atime = iattrs->ia_mtime = iattrs->ia_ctime = CURRENT_TIME;
 
        return attrs;
@@ -310,7 +310,7 @@ void sysfs_evict_inode(struct inode *inode)
        struct sysfs_dirent *sd  = inode->i_private;
 
        truncate_inode_pages(&inode->i_data, 0);
-       end_writeback(inode);
+       clear_inode(inode);
        sysfs_put(sd);
 }