2 files changed, 3 insertions, 10 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 83559dce4286..32accb6a672f 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1874,14 +1874,9 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
 
         /* We don't d_delete() NFS sillyrenamed files--they still exist. */
         if (!error && !(dentry->d_flags & DCACHE_NFSFS_RENAMED)) {
-#if defined(CONFIG_INOTIFY) || defined(CONFIG_DNOTIFY)
-                dget(dentry);
+                struct inode *inode = dentry->d_inode;
                 d_delete(dentry);
-                fsnotify_unlink(dentry, dir);
-                dput(dentry);
-#else
-                d_delete(dentry);
-#endif
+                fsnotify_unlink(dentry, inode, dir);
         }
 
         return error;
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index e96a4306ab3b..1cb4935348d8 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -46,10 +46,8 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
 /*
  * fsnotify_unlink - file was unlinked
  */
-static inline void fsnotify_unlink(struct dentry *dentry, struct inode *dir)
+static inline void fsnotify_unlink(struct dentry *dentry, struct inode *inode, struct inode *dir)
 {
-        struct inode *inode = dentry->d_inode;
-
         inode_dir_notify(dir, DN_DELETE);
         inotify_inode_queue_event(dir, IN_DELETE, 0, dentry->d_name.name);
         inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL);