Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31353
b: refs/heads/master
c: e7515d0
h: refs/heads/master
i:
  31351: 988d27b
v: v3
  • Loading branch information
Joel Becker authored and Mark Fasheh committed Jun 29, 2006
1 parent c6225ff commit f2050e6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 22dd0e88b70f5faa3a0101081e290431c3439189
refs/heads/master: e7515d065d09f6450c996a8fa206ad66569e183c
6 changes: 3 additions & 3 deletions trunk/fs/configfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/configfs/symlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f2050e6

Please sign in to comment.