Merge tag 'platform-drivers-x86-v6.5-4' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / ntfs3 / attrlist.c

diff --git a/fs/ntfs3/attrlist.c b/fs/ntfs3/attrlist.c
index c0c6bcb..42631b3 100644 (file)
--- a/fs/ntfs3/attrlist.c
+++ b/fs/ntfs3/attrlist.c
@@ -52,7 +52,7 @@ int ntfs_load_attr_list(struct ntfs_inode *ni, struct ATTRIB *attr)
 
        if (!attr->non_res) {
                lsize = le32_to_cpu(attr->res.data_size);
-               le = kmalloc(al_aligned(lsize), GFP_NOFS);
+               le = kmalloc(al_aligned(lsize), GFP_NOFS | __GFP_NOWARN);
                if (!le) {
                        err = -ENOMEM;
                        goto out;
@@ -80,7 +80,7 @@ int ntfs_load_attr_list(struct ntfs_inode *ni, struct ATTRIB *attr)
                if (err < 0)
                        goto out;
 
-               le = kmalloc(al_aligned(lsize), GFP_NOFS);
+               le = kmalloc(al_aligned(lsize), GFP_NOFS | __GFP_NOWARN);
                if (!le) {
                        err = -ENOMEM;
                        goto out;
@@ -375,8 +375,7 @@ bool al_remove_le(struct ntfs_inode *ni, struct ATTR_LIST_ENTRY *le)
  * al_delete_le - Delete first le from the list which matches its parameters.
  */
 bool al_delete_le(struct ntfs_inode *ni, enum ATTR_TYPE type, CLST vcn,
-                 const __le16 *name, size_t name_len,
-                 const struct MFT_REF *ref)
+                 const __le16 *name, u8 name_len, const struct MFT_REF *ref)
 {
        u16 size;
        struct ATTR_LIST_ENTRY *le;