projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'omap_dss2/for-next'
[deliverable/linux.git]
/
security
/
tomoyo
/
realpath.c
diff --git
a/security/tomoyo/realpath.c
b/security/tomoyo/realpath.c
index 5077f1968841ab5717b88da5b965efa344961272..a97b275ca3afe476a4ca0d865ef332d3f45aa688 100644
(file)
--- a/
security/tomoyo/realpath.c
+++ b/
security/tomoyo/realpath.c
@@
-173,7
+173,7
@@
static char *tomoyo_get_local_path(struct dentry *dentry, char * const buffer,
* Use filesystem name if filesystem does not support rename()
* operation.
*/
* Use filesystem name if filesystem does not support rename()
* operation.
*/
- if (!inode->i_op->rename
&& !inode->i_op->rename2
)
+ if (!inode->i_op->rename)
goto prepend_filesystem_name;
}
/* Prepend device name. */
goto prepend_filesystem_name;
}
/* Prepend device name. */
@@
-283,7
+283,7
@@
char *tomoyo_realpath_from_path(const struct path *path)
* or dentry without vfsmount.
*/
if (!path->mnt ||
* or dentry without vfsmount.
*/
if (!path->mnt ||
- (!inode->i_op->rename
&& !inode->i_op->rename2
))
+ (!inode->i_op->rename))
pos = tomoyo_get_local_path(path->dentry, buf,
buf_len - 1);
/* Get absolute name for the rest. */
pos = tomoyo_get_local_path(path->dentry, buf,
buf_len - 1);
/* Get absolute name for the rest. */
This page took
0.024519 seconds
and
5
git commands to generate.