From f2050e6f4f0357ba5427ea66669dfd6e765f5b18 Mon Sep 17 00:00:00 2001 From: Joel Becker Date: Fri, 10 Mar 2006 11:42:30 -0800 Subject: [PATCH] --- yaml --- r: 31353 b: refs/heads/master c: e7515d065d09f6450c996a8fa206ad66569e183c h: refs/heads/master i: 31351: 988d27b9aee1e8d46c3874f72acc48457568fc71 v: v3 --- [refs] | 2 +- trunk/fs/configfs/dir.c | 6 +++--- trunk/fs/configfs/symlink.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c1323656230c..cfe03d9f5b85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22dd0e88b70f5faa3a0101081e290431c3439189 +refs/heads/master: e7515d065d09f6450c996a8fa206ad66569e183c diff --git a/trunk/fs/configfs/dir.c b/trunk/fs/configfs/dir.c index 207f8006fd6c..df025453dd97 100644 --- a/trunk/fs/configfs/dir.c +++ b/trunk/fs/configfs/dir.c @@ -211,7 +211,7 @@ static void remove_dir(struct dentry * d) struct configfs_dirent * sd; sd = d->d_fsdata; - list_del_init(&sd->s_sibling); + list_del_init(&sd->s_sibling); configfs_put(sd); if (d->d_inode) simple_rmdir(parent->d_inode,d); @@ -330,7 +330,7 @@ static int configfs_detach_prep(struct dentry *dentry) ret = configfs_detach_prep(sd->s_dentry); if (!ret) - continue; + continue; } else ret = -ENOTEMPTY; @@ -931,7 +931,7 @@ int configfs_rename_dir(struct config_item * item, const char *new_name) new_dentry = lookup_one_len(new_name, parent, strlen(new_name)); if (!IS_ERR(new_dentry)) { - if (!new_dentry->d_inode) { + if (!new_dentry->d_inode) { error = config_item_set_name(item, "%s", new_name); if (!error) { d_add(new_dentry, NULL); diff --git a/trunk/fs/configfs/symlink.c b/trunk/fs/configfs/symlink.c index e5512e295cf2..fb65e0800a86 100644 --- a/trunk/fs/configfs/symlink.c +++ b/trunk/fs/configfs/symlink.c @@ -66,7 +66,7 @@ static void fill_item_path(struct config_item * item, char * buffer, int length) } static int create_link(struct config_item *parent_item, - struct config_item *item, + struct config_item *item, struct dentry *dentry) { struct configfs_dirent *target_sd = item->ci_dentry->d_fsdata;