Commit c3f5e692 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-5.18-rc7' of https://github.com/ceph/ceph-client 

Pull ceph fix from Ilya Dryomov:
 "Two fixes to properly maintain xattrs on async creates and thus
  preserve SELinux context on newly created files and to avoid improper
  usage of folio->private field which triggered BUG_ONs.

  Both marked for stable"

* tag 'ceph-for-5.18-rc7' of https://github.com/ceph/ceph-client:
  ceph: check folio PG_private bit instead of folio->private
  ceph: fix setting of xattrs on async created inodes
parents 6dd5884d 642d51fb

fs/ceph/addr.c

+7 −4
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static bool ceph_dirty_folio(struct address_space *mapping, struct folio *folio) 
	if (folio_test_dirty(folio)) {

		dout("%p dirty_folio %p idx %lu -- already dirty\n",

		     mapping->host, folio, folio->index);

		BUG_ON(!folio_get_private(folio));

		VM_BUG_ON_FOLIO(!folio_test_private(folio), folio);

		return false;

	}
@@ -122,7 +122,7 @@ static bool ceph_dirty_folio(struct address_space *mapping, struct folio *folio) 
	 * Reference snap context in folio->private.  Also set

	 * PagePrivate so that we get invalidate_folio callback.

	 */

	BUG_ON(folio_get_private(folio));

	VM_BUG_ON_FOLIO(folio_test_private(folio), folio);

	folio_attach_private(folio, snapc);



	return ceph_fscache_dirty_folio(mapping, folio);
@@ -150,7 +150,7 @@ static void ceph_invalidate_folio(struct folio *folio, size_t offset, 
	}



	WARN_ON(!folio_test_locked(folio));

	if (folio_get_private(folio)) {

	if (folio_test_private(folio)) {

		dout("%p invalidate_folio idx %lu full dirty page\n",

		     inode, folio->index);
@@ -729,8 +729,11 @@ static void writepages_finish(struct ceph_osd_request *req) 


	/* clean all pages */

	for (i = 0; i < req->r_num_ops; i++) {

		if (req->r_ops[i].op != CEPH_OSD_OP_WRITE)

		if (req->r_ops[i].op != CEPH_OSD_OP_WRITE) {

			pr_warn("%s incorrect op %d req %p index %d tid %llu\n",

				__func__, req->r_ops[i].op, req, i, req->r_tid);

			break;

		}



		osd_data = osd_req_op_extent_osd_data(req, i);

		BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_PAGES);

fs/ceph/file.c

+13 −3
Original line number Diff line number Diff line
@@ -629,9 +629,15 @@ static int ceph_finish_async_create(struct inode *dir, struct dentry *dentry, 
	iinfo.change_attr = 1;

	ceph_encode_timespec64(&iinfo.btime, &now);



	if (req->r_pagelist) {

		iinfo.xattr_len = req->r_pagelist->length;

		iinfo.xattr_data = req->r_pagelist->mapped_tail;

	} else {

		/* fake it */

		iinfo.xattr_len = ARRAY_SIZE(xattr_buf);

		iinfo.xattr_data = xattr_buf;

		memset(iinfo.xattr_data, 0, iinfo.xattr_len);

	}



	in.ino = cpu_to_le64(vino.ino);

	in.snapid = cpu_to_le64(CEPH_NOSNAP);
@@ -743,6 +749,10 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, 
		err = ceph_security_init_secctx(dentry, mode, &as_ctx);

		if (err < 0)

			goto out_ctx;

		/* Async create can't handle more than a page of xattrs */

		if (as_ctx.pagelist &&

		    !list_is_singular(&as_ctx.pagelist->head))

			try_async = false;

	} else if (!d_in_lookup(dentry)) {

		/* If it's not being looked up, it's negative */

		return -ENOENT;