projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] omap: hsmmc: new short connection id names
[firefly-linux-kernel-4.4.55.git]
/
fs
/
dcache.c
diff --git
a/fs/dcache.c
b/fs/dcache.c
index e88c23b85a32d4456bf7741a7f218315189153e1..937df0fb0da5aefbb1a69b94c6a06afbe1747439 100644
(file)
--- a/
fs/dcache.c
+++ b/
fs/dcache.c
@@
-1567,10
+1567,6
@@
void d_rehash(struct dentry * entry)
spin_unlock(&dcache_lock);
}
spin_unlock(&dcache_lock);
}
-#define do_switch(x,y) do { \
- __typeof__ (x) __tmp = x; \
- x = y; y = __tmp; } while (0)
-
/*
* When switching names, the actual string doesn't strictly have to
* be preserved in the target - because we're dropping the target
/*
* When switching names, the actual string doesn't strictly have to
* be preserved in the target - because we're dropping the target
@@
-1589,7
+1585,7
@@
static void switch_names(struct dentry *dentry, struct dentry *target)
/*
* Both external: swap the pointers
*/
/*
* Both external: swap the pointers
*/
-
do_switch
(target->d_name.name, dentry->d_name.name);
+
swap
(target->d_name.name, dentry->d_name.name);
} else {
/*
* dentry:internal, target:external. Steal target's
} else {
/*
* dentry:internal, target:external. Steal target's
@@
-1620,7
+1616,7
@@
static void switch_names(struct dentry *dentry, struct dentry *target)
return;
}
}
return;
}
}
-
do_switch
(dentry->d_name.len, target->d_name.len);
+
swap
(dentry->d_name.len, target->d_name.len);
}
/*
}
/*
@@
-1680,7
+1676,7
@@
already_unhashed:
/* Switch the names.. */
switch_names(dentry, target);
/* Switch the names.. */
switch_names(dentry, target);
-
do_switch
(dentry->d_name.hash, target->d_name.hash);
+
swap
(dentry->d_name.hash, target->d_name.hash);
/* ... and switch the parents */
if (IS_ROOT(dentry)) {
/* ... and switch the parents */
if (IS_ROOT(dentry)) {
@@
-1688,7
+1684,7
@@
already_unhashed:
target->d_parent = target;
INIT_LIST_HEAD(&target->d_u.d_child);
} else {
target->d_parent = target;
INIT_LIST_HEAD(&target->d_u.d_child);
} else {
-
do_switch
(dentry->d_parent, target->d_parent);
+
swap
(dentry->d_parent, target->d_parent);
/* And add them back to the (new) parent lists */
list_add(&target->d_u.d_child, &target->d_parent->d_subdirs);
/* And add them back to the (new) parent lists */
list_add(&target->d_u.d_child, &target->d_parent->d_subdirs);
@@
-1789,7
+1785,7
@@
static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon)
struct dentry *dparent, *aparent;
switch_names(dentry, anon);
struct dentry *dparent, *aparent;
switch_names(dentry, anon);
-
do_switch
(dentry->d_name.hash, anon->d_name.hash);
+
swap
(dentry->d_name.hash, anon->d_name.hash);
dparent = dentry->d_parent;
aparent = anon->d_parent;
dparent = dentry->d_parent;
aparent = anon->d_parent;
@@
-2096,7
+2092,7
@@
Elong:
* return NULL;
* }
*/
* return NULL;
* }
*/
-
asmlinkage long sys_getcwd(char __user *buf, unsigned long
size)
+
SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long,
size)
{
int error;
struct path pwd, root;
{
int error;
struct path pwd, root;