Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5795
b: refs/heads/master
c: 89204c4
h: refs/heads/master
i:
  5793: 8f78a4f
  5791: a70f423
v: v3
  • Loading branch information
John McCutchan authored and Linus Torvalds committed Aug 15, 2005
1 parent 78f41bc commit a35e60a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0bf955ce98cb3cf40e20d0cc435299eb76e8819e
refs/heads/master: 89204c40a03346cd951e698d854105db4cfedc28
3 changes: 2 additions & 1 deletion trunk/fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -2216,7 +2216,8 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry);
if (!error) {
const char *new_name = old_dentry->d_name.name;
fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir, new_dentry->d_inode);
fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir,
new_dentry->d_inode, old_dentry->d_inode);
}
fsnotify_oldname_free(old_name);

Expand Down
6 changes: 5 additions & 1 deletion trunk/include/linux/fsnotify.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
const char *old_name, const char *new_name,
int isdir, struct inode *target)
int isdir, struct inode *target, struct inode *source)
{
u32 cookie = inotify_get_cookie();

Expand All @@ -41,6 +41,10 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL);
inotify_inode_is_dead(target);
}

if (source) {
inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL);
}
}

/*
Expand Down
4 changes: 3 additions & 1 deletion trunk/include/linux/inotify.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ struct inotify_event {
#define IN_CREATE 0x00000100 /* Subfile was created */
#define IN_DELETE 0x00000200 /* Subfile was deleted */
#define IN_DELETE_SELF 0x00000400 /* Self was deleted */
#define IN_MOVE_SELF 0x00000800 /* Self was moved */

/* the following are legal events. they are sent as needed to any watch */
#define IN_UNMOUNT 0x00002000 /* Backing fs was unmounted */
Expand All @@ -56,7 +57,8 @@ struct inotify_event {
*/
#define IN_ALL_EVENTS (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF)
IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \
IN_MOVE_SELF)

#ifdef __KERNEL__

Expand Down

0 comments on commit a35e60a

Please sign in to comment.