Merge remote-tracking branch 'driver-core/driver-core-next'

[karo-tx-linux.git] / fs / sysfs / inode.c

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 07193d720d925688a1d023641846e0b131f36e50..2cb1b6b8ccbc0ea0ed6bc95bc804a5ca92a89a84 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -260,7 +260,7 @@ static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode)
        case SYSFS_KOBJ_BIN_ATTR:
                bin_attr = sd->s_bin_attr.bin_attr;
                inode->i_size = bin_attr->size;
-               inode->i_fop = &bin_fops;
+               inode->i_fop = &sysfs_bin_operations;
                break;
        case SYSFS_KOBJ_LINK:
                inode->i_op = &sysfs_symlink_inode_operations;
@@ -326,11 +326,11 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name,
                return -ENOENT;
        }
 
-       sysfs_addrm_start(&acxt, dir_sd);
+       sysfs_addrm_start(&acxt);
 
        sd = sysfs_find_dirent(dir_sd, name, ns);
        if (sd)
-               sysfs_remove_one(&acxt, sd);
+               __sysfs_remove(&acxt, sd);
 
        sysfs_addrm_finish(&acxt);