Merge tag 'configfs-for-5.4' of git://git.infradead.org/users/hch/configfs

[linux-2.6-block.git] / fs / configfs / inode.c

diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index ab0284321912a3784cd847e4da3e2184bb921440..680aba9c00d5a51306317e2d52db37a6ab30b244 100644 (file)
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -76,14 +76,14 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
        if (ia_valid & ATTR_GID)
                sd_iattr->ia_gid = iattr->ia_gid;
        if (ia_valid & ATTR_ATIME)
-               sd_iattr->ia_atime = timespec64_trunc(iattr->ia_atime,
-                                                     inode->i_sb->s_time_gran);
+               sd_iattr->ia_atime = timestamp_truncate(iattr->ia_atime,
+                                                     inode);
        if (ia_valid & ATTR_MTIME)
-               sd_iattr->ia_mtime = timespec64_trunc(iattr->ia_mtime,
-                                                     inode->i_sb->s_time_gran);
+               sd_iattr->ia_mtime = timestamp_truncate(iattr->ia_mtime,
+                                                     inode);
        if (ia_valid & ATTR_CTIME)
-               sd_iattr->ia_ctime = timespec64_trunc(iattr->ia_ctime,
-                                                     inode->i_sb->s_time_gran);
+               sd_iattr->ia_ctime = timestamp_truncate(iattr->ia_ctime,
+                                                     inode);
        if (ia_valid & ATTR_MODE) {
                umode_t mode = iattr->ia_mode;
 
@@ -164,41 +164,27 @@ static void configfs_set_inode_lock_class(struct configfs_dirent *sd,
 
 #endif /* CONFIG_LOCKDEP */
 
-int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct inode *))
+struct inode *configfs_create(struct dentry *dentry, umode_t mode)
 {
-       int error = 0;
        struct inode *inode = NULL;
        struct configfs_dirent *sd;
        struct inode *p_inode;
 
        if (!dentry)
-               return -ENOENT;
+               return ERR_PTR(-ENOENT);
 
        if (d_really_is_positive(dentry))
-               return -EEXIST;
+               return ERR_PTR(-EEXIST);
 
        sd = dentry->d_fsdata;
        inode = configfs_new_inode(mode, sd, dentry->d_sb);
        if (!inode)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        p_inode = d_inode(dentry->d_parent);
        p_inode->i_mtime = p_inode->i_ctime = current_time(p_inode);
        configfs_set_inode_lock_class(sd, inode);
-
-       init(inode);
-       if (S_ISDIR(mode) || S_ISLNK(mode)) {
-               /*
-                * ->symlink(), ->mkdir(), configfs_register_subsystem() or
-                * create_default_group() - already hashed.
-                */
-               d_instantiate(dentry, inode);
-               dget(dentry);  /* pin link and directory dentries in core */
-       } else {
-               /* ->lookup() */
-               d_add(dentry, inode);
-       }
-       return error;
+       return inode;
 }
 
 /*