aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2016-09-27 05:03:58 -0400
committerMiklos Szeredi <mszeredi@redhat.com>2016-09-27 05:03:58 -0400
commit2773bf00aeb9bf39e022463272a61dd0ec9f55f4 (patch)
tree1d0cc9cf72e5ff955609e4dc43d8bcd075212ff1 /security
parent18fc84dafaac1fd63d5e6e600058eada8fc7914b (diff)
fs: rename "rename2" i_op to "rename"
Generated patch: sed -i "s/\.rename2\t/\.rename\t\t/" `git grep -wl rename2` sed -i "s/\brename2\b/rename/g" `git grep -wl rename2` Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'security')
-rw-r--r--security/tomoyo/realpath.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c
index 38bcdbc06bb2..a97b275ca3af 100644
--- 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,
173 * Use filesystem name if filesystem does not support rename() 173 * Use filesystem name if filesystem does not support rename()
174 * operation. 174 * operation.
175 */ 175 */
176 if (!inode->i_op->rename2) 176 if (!inode->i_op->rename)
177 goto prepend_filesystem_name; 177 goto prepend_filesystem_name;
178 } 178 }
179 /* Prepend device name. */ 179 /* Prepend device name. */
@@ -283,7 +283,7 @@ char *tomoyo_realpath_from_path(const struct path *path)
283 * or dentry without vfsmount. 283 * or dentry without vfsmount.
284 */ 284 */
285 if (!path->mnt || 285 if (!path->mnt ||
286 (!inode->i_op->rename2)) 286 (!inode->i_op->rename))
287 pos = tomoyo_get_local_path(path->dentry, buf, 287 pos = tomoyo_get_local_path(path->dentry, buf,
288 buf_len - 1); 288 buf_len - 1);
289 /* Get absolute name for the rest. */ 289 /* Get absolute name for the rest. */