diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/configfs/dir.c | 6 | ||||
-rw-r--r-- | fs/configfs/symlink.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index 207f8006fd6c..df025453dd97 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c | |||
@@ -211,7 +211,7 @@ static void remove_dir(struct dentry * d) | |||
211 | struct configfs_dirent * sd; | 211 | struct configfs_dirent * sd; |
212 | 212 | ||
213 | sd = d->d_fsdata; | 213 | sd = d->d_fsdata; |
214 | list_del_init(&sd->s_sibling); | 214 | list_del_init(&sd->s_sibling); |
215 | configfs_put(sd); | 215 | configfs_put(sd); |
216 | if (d->d_inode) | 216 | if (d->d_inode) |
217 | simple_rmdir(parent->d_inode,d); | 217 | simple_rmdir(parent->d_inode,d); |
@@ -330,7 +330,7 @@ static int configfs_detach_prep(struct dentry *dentry) | |||
330 | 330 | ||
331 | ret = configfs_detach_prep(sd->s_dentry); | 331 | ret = configfs_detach_prep(sd->s_dentry); |
332 | if (!ret) | 332 | if (!ret) |
333 | continue; | 333 | continue; |
334 | } else | 334 | } else |
335 | ret = -ENOTEMPTY; | 335 | ret = -ENOTEMPTY; |
336 | 336 | ||
@@ -931,7 +931,7 @@ int configfs_rename_dir(struct config_item * item, const char *new_name) | |||
931 | 931 | ||
932 | new_dentry = lookup_one_len(new_name, parent, strlen(new_name)); | 932 | new_dentry = lookup_one_len(new_name, parent, strlen(new_name)); |
933 | if (!IS_ERR(new_dentry)) { | 933 | if (!IS_ERR(new_dentry)) { |
934 | if (!new_dentry->d_inode) { | 934 | if (!new_dentry->d_inode) { |
935 | error = config_item_set_name(item, "%s", new_name); | 935 | error = config_item_set_name(item, "%s", new_name); |
936 | if (!error) { | 936 | if (!error) { |
937 | d_add(new_dentry, NULL); | 937 | d_add(new_dentry, NULL); |
diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c index e5512e295cf2..fb65e0800a86 100644 --- a/fs/configfs/symlink.c +++ b/fs/configfs/symlink.c | |||
@@ -66,7 +66,7 @@ static void fill_item_path(struct config_item * item, char * buffer, int length) | |||
66 | } | 66 | } |
67 | 67 | ||
68 | static int create_link(struct config_item *parent_item, | 68 | static int create_link(struct config_item *parent_item, |
69 | struct config_item *item, | 69 | struct config_item *item, |
70 | struct dentry *dentry) | 70 | struct dentry *dentry) |
71 | { | 71 | { |
72 | struct configfs_dirent *target_sd = item->ci_dentry->d_fsdata; | 72 | struct configfs_dirent *target_sd = item->ci_dentry->d_fsdata; |