diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-03 17:12:40 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-03-03 17:12:40 -0500 |
| commit | 9643f5d94aadd47a5fa9754fb60f2c957de05903 (patch) | |
| tree | c299736cbcdd7f971c1c308433e248198060fefa /fs/debugfs | |
| parent | 2bd3a997befc226ab4b504f05c5cbba305f3e0e6 (diff) | |
| parent | c44dcc56d2b5c79ba3063d20f76e5347e2e418f6 (diff) | |
Merge branch 'for-fsnotify' 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 274ac865bae8..049d6c36da09 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
| @@ -496,7 +496,7 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, | |||
| 496 | } | 496 | } |
| 497 | d_move(old_dentry, dentry); | 497 | d_move(old_dentry, dentry); |
| 498 | fsnotify_move(old_dir->d_inode, new_dir->d_inode, old_name, | 498 | fsnotify_move(old_dir->d_inode, new_dir->d_inode, old_name, |
| 499 | old_dentry->d_name.name, S_ISDIR(old_dentry->d_inode->i_mode), | 499 | S_ISDIR(old_dentry->d_inode->i_mode), |
| 500 | NULL, old_dentry); | 500 | NULL, old_dentry); |
| 501 | fsnotify_oldname_free(old_name); | 501 | fsnotify_oldname_free(old_name); |
| 502 | unlock_rename(new_dir, old_dir); | 502 | unlock_rename(new_dir, old_dir); |