diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-10 23:02:51 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-10 23:02:51 -0400 |
| commit | 3873691e5ab34fa26948643d038a2b98c4437298 (patch) | |
| tree | 5327469194c2167830bce38b56a618b754cdbeea /fs/debugfs | |
| parent | c2050a454c7f123d7a57fa1d76ff61bd43643abb (diff) | |
| parent | aadfa8019e8114539cfa0b1eb2e5a9c83094a590 (diff) | |
Merge remote-tracking branch 'ovl/rename2' into for-linus
Diffstat (limited to 'fs/debugfs')
| -rw-r--r-- | fs/debugfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 56a3c82a5785..f17fcf89e18e 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
| @@ -748,7 +748,7 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, | |||
| 748 | old_name = fsnotify_oldname_init(old_dentry->d_name.name); | 748 | old_name = fsnotify_oldname_init(old_dentry->d_name.name); |
| 749 | 749 | ||
| 750 | error = simple_rename(d_inode(old_dir), old_dentry, d_inode(new_dir), | 750 | error = simple_rename(d_inode(old_dir), old_dentry, d_inode(new_dir), |
| 751 | dentry); | 751 | dentry, 0); |
| 752 | if (error) { | 752 | if (error) { |
| 753 | fsnotify_oldname_free(old_name); | 753 | fsnotify_oldname_free(old_name); |
| 754 | goto exit; | 754 | goto exit; |