Merge tag 'ceph-for-6.6-rc4' of https://github.com/ceph/ceph-client

Pull ceph fixes from Ilya Dryomov:
 "A series that fixes an involved 'double watch error' deadlock in RBD
  marked for stable and two cleanups"

* tag 'ceph-for-6.6-rc4' of https://github.com/ceph/ceph-client:
  rbd: take header_rwsem in rbd_dev_refresh() only when updating
  rbd: decouple parent info read-in from updating rbd_dev
  rbd: decouple header read-in from updating rbd_dev->header
  rbd: move rbd_dev_refresh() definition
  Revert "ceph: make members in struct ceph_mds_request_args_ext a union"
  ceph: remove unnecessary check for NULL in parse_longname()

fs/ceph/crypto.c

@@ -249,11 +249,9 @@ static struct inode *parse_longname(const struct inode *parent,
 	if (!dir) {
 		/* This can happen if we're not mounting cephfs on the root */
 		dir = ceph_get_inode(parent->i_sb, vino, NULL);
-		if (!dir)
-			dir = ERR_PTR(-ENOENT);
-	}
 		if (IS_ERR(dir))
 			dout("Can't find inode %s (%s)\n", inode_number, name);
+	}
 
 out:
 	kfree(inode_number);

include/linux/ceph/ceph_fs.h

@@ -467,7 +467,6 @@ union ceph_mds_request_args {
 } __attribute__ ((packed));
 
 union ceph_mds_request_args_ext {
-	union {
 	union ceph_mds_request_args old;
 	struct {
 		__le32 mode;
@@ -479,7 +478,6 @@ union ceph_mds_request_args_ext {
 		__le32 mask;                 /* CEPH_SETATTR_* */
 		struct ceph_timespec btime;
 	} __attribute__ ((packed)) setattr_ext;
-	};
 };
 
 #define CEPH_MDS_FLAG_REPLAY		1 /* this is a replayed op */