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

Commit 687265e5 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: switch some GFP_NOFS memory allocation to GFP_KERNEL 



GFP_NOFS memory allocation is required for page writeback path.
But there is no need to use GFP_NOFS in syscall path and readpage
path

Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
parent f66fd9f0

fs/ceph/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -187,10 +187,10 @@ int ceph_pre_init_acls(struct inode *dir, umode_t *mode, 
		val_size2 = posix_acl_xattr_size(default_acl->a_count);



	err = -ENOMEM;

	tmp_buf = kmalloc(max(val_size1, val_size2), GFP_NOFS);

	tmp_buf = kmalloc(max(val_size1, val_size2), GFP_KERNEL);

	if (!tmp_buf)

		goto out_err;

	pagelist = kmalloc(sizeof(struct ceph_pagelist), GFP_NOFS);

	pagelist = kmalloc(sizeof(struct ceph_pagelist), GFP_KERNEL);

	if (!pagelist)

		goto out_err;

	ceph_pagelist_init(pagelist);

fs/ceph/addr.c

+2 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) 


	/* build page vector */

	nr_pages = calc_pages_for(0, len);

	pages = kmalloc(sizeof(*pages) * nr_pages, GFP_NOFS);

	pages = kmalloc(sizeof(*pages) * nr_pages, GFP_KERNEL);

	ret = -ENOMEM;

	if (!pages)

		goto out;
@@ -362,7 +362,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) 
 		dout("start_read %p adding %p idx %lu\n", inode, page,

		     page->index);

		if (add_to_page_cache_lru(page, &inode->i_data, page->index,

					  GFP_NOFS)) {

					  GFP_KERNEL)) {

			ceph_fscache_uncache_page(inode, page);

			page_cache_release(page);

			dout("start_read %p add_to_page_cache failed %p\n",

fs/ceph/dir.c

+5 −5
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ int ceph_init_dentry(struct dentry *dentry) 
	if (dentry->d_fsdata)

		return 0;



	di = kmem_cache_alloc(ceph_dentry_cachep, GFP_NOFS | __GFP_ZERO);

	di = kmem_cache_alloc(ceph_dentry_cachep, GFP_KERNEL | __GFP_ZERO);

	if (!di)

		return -ENOMEM;          /* oh well */
@@ -231,7 +231,7 @@ static int note_last_dentry(struct ceph_file_info *fi, const char *name, 
			    int len)

{

	kfree(fi->last_name);

	fi->last_name = kmalloc(len+1, GFP_NOFS);

	fi->last_name = kmalloc(len+1, GFP_KERNEL);

	if (!fi->last_name)

		return -ENOMEM;

	memcpy(fi->last_name, name, len);
@@ -342,7 +342,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) 
		req->r_direct_hash = ceph_frag_value(frag);

		req->r_direct_is_hash = true;

		if (fi->last_name) {

			req->r_path2 = kstrdup(fi->last_name, GFP_NOFS);

			req->r_path2 = kstrdup(fi->last_name, GFP_KERNEL);

			if (!req->r_path2) {

				ceph_mdsc_put_request(req);

				return -ENOMEM;
@@ -764,7 +764,7 @@ static int ceph_symlink(struct inode *dir, struct dentry *dentry, 
		err = PTR_ERR(req);

		goto out;

	}

	req->r_path2 = kstrdup(dest, GFP_NOFS);

	req->r_path2 = kstrdup(dest, GFP_KERNEL);

	if (!req->r_path2) {

		err = -ENOMEM;

		ceph_mdsc_put_request(req);
@@ -1189,7 +1189,7 @@ static ssize_t ceph_read_dir(struct file *file, char __user *buf, size_t size, 
		return -EISDIR;



	if (!cf->dir_info) {

		cf->dir_info = kmalloc(bufsize, GFP_NOFS);

		cf->dir_info = kmalloc(bufsize, GFP_KERNEL);

		if (!cf->dir_info)

			return -ENOMEM;

		cf->dir_info_len =

fs/ceph/file.c

+4 −4
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int ceph_init_file(struct inode *inode, struct file *file, int fmode) 
	case S_IFDIR:

		dout("init_file %p %p 0%o (regular)\n", inode, file,

		     inode->i_mode);

		cf = kmem_cache_alloc(ceph_file_cachep, GFP_NOFS | __GFP_ZERO);

		cf = kmem_cache_alloc(ceph_file_cachep, GFP_KERNEL | __GFP_ZERO);

		if (cf == NULL) {

			ceph_put_fmode(ceph_inode(inode), fmode); /* clean up */

			return -ENOMEM;
@@ -483,7 +483,7 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *i, 
		}

	} else {

		num_pages = calc_pages_for(off, len);

		pages = ceph_alloc_page_vector(num_pages, GFP_NOFS);

		pages = ceph_alloc_page_vector(num_pages, GFP_KERNEL);

		if (IS_ERR(pages))

			return PTR_ERR(pages);

		ret = striped_read(inode, off, len, pages,
@@ -734,7 +734,7 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, 
		 */

		num_pages = (len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;



		pages = ceph_alloc_page_vector(num_pages, GFP_NOFS);

		pages = ceph_alloc_page_vector(num_pages, GFP_KERNEL);

		if (IS_ERR(pages)) {

			ret = PTR_ERR(pages);

			goto out;
@@ -858,7 +858,7 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to) 
		struct page *page = NULL;

		loff_t i_size;

		if (retry_op == READ_INLINE) {

			page = __page_cache_alloc(GFP_NOFS);

			page = __page_cache_alloc(GFP_KERNEL);

			if (!page)

				return -ENOMEM;

		}

fs/ceph/mds_client.c

+2 −1
Original line number Diff line number Diff line
@@ -1668,7 +1668,8 @@ int ceph_alloc_readdir_reply_buffer(struct ceph_mds_request *req, 


	order = get_order(size * num_entries);

	while (order >= 0) {

		rinfo->dir_in = (void*)__get_free_pages(GFP_NOFS | __GFP_NOWARN,

		rinfo->dir_in = (void*)__get_free_pages(GFP_KERNEL |

							__GFP_NOWARN,

							order);

		if (rinfo->dir_in)

			break;