dnotify: Handle errors from fsnotify_add_mark_locked() in fcntl_dirnotify()

[sfrench/cifs-2.6.git] / fs / notify / dnotify / dnotify.c

diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index cba32831592952b750ebea310b002c7a27b5cb6e..63a1ca4b9deee22a786822229b8421bcdcf74e31 100644 (file)
--- a/fs/notify/dnotify/dnotify.c
+++ b/fs/notify/dnotify/dnotify.c
@@ -319,7 +319,11 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
                dn_mark = container_of(fsn_mark, struct dnotify_mark, fsn_mark);
                spin_lock(&fsn_mark->lock);
        } else {
-               fsnotify_add_mark_locked(new_fsn_mark, inode, NULL, 0);
+               error = fsnotify_add_mark_locked(new_fsn_mark, inode, NULL, 0);
+               if (error) {
+                       mutex_unlock(&dnotify_group->mark_mutex);
+                       goto out_err;
+               }
                spin_lock(&new_fsn_mark->lock);
                fsn_mark = new_fsn_mark;
                dn_mark = new_dn_mark;
@@ -345,6 +349,7 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
                 */
                if (dn_mark == new_dn_mark)
                        destroy = 1;
+               error = 0;
                goto out;
        }