Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca16d140 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

mm: don't access vm_flags as 'int' 



The type of vma->vm_flags is 'unsigned long'. Neither 'int' nor
'unsigned int'. This patch fixes such misuse.

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
[ Changed to use a typedef - we'll extend it to cover more cases
  later, since there has been discussion about making it a 64-bit
  type..                      - Linus ]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4db70f73

fs/hugetlbfs/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -921,7 +921,8 @@ static int can_do_hugetlb_shm(void) 
	return capable(CAP_IPC_LOCK) || in_group_p(sysctl_hugetlb_shm_group);

}



struct file *hugetlb_file_setup(const char *name, size_t size, int acctflag,

struct file *hugetlb_file_setup(const char *name, size_t size,

				vm_flags_t acctflag,

				struct user_struct **user, int creat_flags)

{

	int error = -ENOMEM;

fs/proc/task_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) 
{

	struct mm_struct *mm = vma->vm_mm;

	struct file *file = vma->vm_file;

	int flags = vma->vm_flags;

	vm_flags_t flags = vma->vm_flags;

	unsigned long ino = 0;

	unsigned long long pgoff = 0;

	unsigned long start, end;

include/linux/hugetlb.h

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, 
			unsigned long address, unsigned int flags);

int hugetlb_reserve_pages(struct inode *inode, long from, long to,

						struct vm_area_struct *vma,

						int acctflags);

						vm_flags_t vm_flags);

void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed);

int dequeue_hwpoisoned_huge_page(struct page *page);

void copy_huge_page(struct page *dst, struct page *src);
@@ -168,7 +168,7 @@ static inline struct hugetlbfs_sb_info *HUGETLBFS_SB(struct super_block *sb) 


extern const struct file_operations hugetlbfs_file_operations;

extern const struct vm_operations_struct hugetlb_vm_ops;

struct file *hugetlb_file_setup(const char *name, size_t size, int acct,

struct file *hugetlb_file_setup(const char *name, size_t size, vm_flags_t acct,

				struct user_struct **user, int creat_flags);

int hugetlb_get_quota(struct address_space *mapping, long delta);

void hugetlb_put_quota(struct address_space *mapping, long delta);
@@ -192,7 +192,7 @@ static inline void set_file_hugepages(struct file *file) 
#define is_file_hugepages(file)			0

#define set_file_hugepages(file)		BUG()

static inline struct file *hugetlb_file_setup(const char *name, size_t size,

		int acctflag, struct user_struct **user, int creat_flags)

		vm_flags_t acctflag, struct user_struct **user, int creat_flags)

{

	return ERR_PTR(-ENOSYS);

}

include/linux/hugetlb_inline.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


static inline int is_vm_hugetlb_page(struct vm_area_struct *vma)

{

	return vma->vm_flags & VM_HUGETLB;

	return !!(vma->vm_flags & VM_HUGETLB);

}



#else

include/linux/mm.h

+3 −3
Original line number Diff line number Diff line
@@ -165,12 +165,12 @@ extern pgprot_t protection_map[16]; 
 */

static inline int is_linear_pfn_mapping(struct vm_area_struct *vma)

{

	return (vma->vm_flags & VM_PFN_AT_MMAP);

	return !!(vma->vm_flags & VM_PFN_AT_MMAP);

}



static inline int is_pfn_mapping(struct vm_area_struct *vma)

{

	return (vma->vm_flags & VM_PFNMAP);

	return !!(vma->vm_flags & VM_PFNMAP);

}



/*
@@ -1432,7 +1432,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, 
	unsigned long flag, unsigned long pgoff);

extern unsigned long mmap_region(struct file *file, unsigned long addr,

	unsigned long len, unsigned long flags,

	unsigned int vm_flags, unsigned long pgoff);

	vm_flags_t vm_flags, unsigned long pgoff);



static inline unsigned long do_mmap(struct file *file, unsigned long addr,

	unsigned long len, unsigned long prot,