diff --git a/[refs] b/[refs]
index 7fa2a7123774..2e06c4819519 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be50344e604f956891fc0013f1ba78823a758124
+refs/heads/master: f04b30de3c82528f1ab4c58b3dd4c975f5341901
diff --git a/trunk/fs/notify/inotify/inotify.c b/trunk/fs/notify/inotify/inotify.c
index dae3f28f30d4..331f2e88e284 100644
--- a/trunk/fs/notify/inotify/inotify.c
+++ b/trunk/fs/notify/inotify/inotify.c
@@ -156,7 +156,7 @@ static int inotify_handle_get_wd(struct inotify_handle *ih,
 	int ret;
 
 	do {
-		if (unlikely(!idr_pre_get(&ih->idr, GFP_KERNEL)))
+		if (unlikely(!idr_pre_get(&ih->idr, GFP_NOFS)))
 			return -ENOSPC;
 		ret = idr_get_new_above(&ih->idr, watch, ih->last_wd+1, &watch->wd);
 	} while (ret == -EAGAIN);