Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux.git] / fs / cifs / dir.c

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index be424e81e3ad98e20f65de41572d87a569a28c7b..dd5ac841aefa7fa45a9fe63cc24d1d07de4dd593 100644 (file)
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -125,7 +125,7 @@ build_path_from_dentry_optional_prefix(struct dentry *direntry, bool prefix)
        }
        rcu_read_unlock();
 
-       full_path = kmalloc(namelen+1, GFP_KERNEL);
+       full_path = kmalloc(namelen+1, GFP_ATOMIC);
        if (full_path == NULL)
                return full_path;
        full_path[namelen] = 0; /* trailing null */