git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
fs
/
configfs
/
dir.c
diff --git
a/fs/configfs/dir.c
b/fs/configfs/dir.c
index
df02545
..
5f95218
100644
(file)
--- a/
fs/configfs/dir.c
+++ b/
fs/configfs/dir.c
@@
-211,7
+211,7
@@
static void remove_dir(struct dentry * d)
struct configfs_dirent * sd;
sd = d->d_fsdata;
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);
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)
ret = configfs_detach_prep(sd->s_dentry);
if (!ret)
- continue;
+ continue;
} else
ret = -ENOTEMPTY;
} 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)) {
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);
error = config_item_set_name(item, "%s", new_name);
if (!error) {
d_add(new_dentry, NULL);
@@
-1009,7
+1009,8
@@
static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
/* fallthrough */
default:
if (filp->f_pos == 2) {
/* fallthrough */
default:
if (filp->f_pos == 2) {
- list_move(q, &parent_sd->s_children);
+ list_del(q);
+ list_add(q, &parent_sd->s_children);
}
for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
struct configfs_dirent *next;
}
for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
struct configfs_dirent *next;
@@
-1032,7
+1033,8
@@
static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
dt_type(next)) < 0)
return 0;
dt_type(next)) < 0)
return 0;
- list_move(q, p);
+ list_del(q);
+ list_add(q, p);
p = q;
filp->f_pos++;
}
p = q;
filp->f_pos++;
}