From patchwork Tue Mar 19 08:02:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RnJhbmsgSHNpYW8g6JWt5rOV5a6j?= X-Patchwork-Id: 781624 Received: from HK3PR03CU002.outbound.protection.outlook.com (mail-eastasiaazon11021007.outbound.protection.outlook.com [52.101.128.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AA9C537E4 for ; Tue, 19 Mar 2024 08:02:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.128.7 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710835364; cv=fail; b=gDsh+307dNxcAPXMtmeLgCWqXfqFflH7YbRm7TLxbXp5Ru8F47moq0Ti8jLzwaZJJSWC79BQ6WPFh42iCWvMJVreL57kV+vv+pu3kG47UB8J+3qFBTehzWVpYWAVKc2Jg+W1PHylumXfnZbyTWPj3G7EJqsWHyXWGLoJmT51eoY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710835364; c=relaxed/simple; bh=uzUAmkESa80NMB2yF6KJJEbQIrTOc6Ywl1dR2lJqaNU=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=iMrITcCBj26oCYnH74UQedmgARy78+XJ72M7gnmXDLjIU6XEgQU9FtunwMkzmvOylIa00Oq6LgJ3AkDyQx9WjjmT6yfa6chc5ayuhxLcgKnhOTlbzz143SqA+fiAHLr6/X4E4Um4seMpYVpkpFQXgWtxNcyBuoELTkUr1QdGi94= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qnap.com; spf=pass smtp.mailfrom=qnap.com; dkim=pass (2048-bit key) header.d=qnap.com header.i=@qnap.com header.b=tMRkBeqJ; arc=fail smtp.client-ip=52.101.128.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qnap.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qnap.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qnap.com header.i=@qnap.com header.b="tMRkBeqJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XpKaTA1c9+pGi2wFUI1jAkSvtov6B+oWO6h7IZ4dMHcBLHdL1Vz78qvvEMDhvtRS9iADioeADgjkkFodPjQ8jD6quZYdRUKGLfyfAQ37nt8c+bPB37Pp7Y0g7boANF6NLiQgP6UE0TdmUQ8kRXh4XZIbTvNDqWNlmb1TEpARBJzOmJ2HXmc7b7tIZ4H5PndCYrqAWyMJyBrMxpPJguS+H1383MDprSEP9Gb5i7TxJiuvIuY/Rv9ayGWiW4mFxGCmBTL4u5oTLAhpS7kvCstnqzc6OtBukZn1IrXB/YZlg5P1CA4uUWw3h1xpMoMhv30y0Bs0HQea0HCVgLMpekQx8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xnsXhhKAlfsnN799bWoONAbQM1VwQMW+conGbkwdVj4=; b=ApH3CyZY93pn0VFzCaAtskdxq61XzE/lulwQ86nag3v/Abjs5PaPCJTBDAUcav+0Vu0wmaE34pA92Owx1RwowIo7fSnX+AxPORTI1oVkPilqj2QZXZ6vDh/r4ISV2TMeZmvRjZMM4UIMvR9gj5RtrFfaL5hI6wCkR5jJIGcVBsYtasmjeKXmIMICwHO8q/arRIlGDMXdkRTu4XAd8HPogzV0dTnC8Hi2txx6w+ZpmkgLroOvosyykvRwZ7qkveD6gM4HaZJGd7ATl9wfqlsOGuxDdEnI4JKRm7QE0RBUpErhFa3l7ODrKe/yi7m8eFPBLOjVIVhQ1eYQLDnDkZcClg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=qnap.com; dmarc=pass action=none header.from=qnap.com; dkim=pass header.d=qnap.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qnap.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xnsXhhKAlfsnN799bWoONAbQM1VwQMW+conGbkwdVj4=; b=tMRkBeqJq/eKy2ItwXgg8IipJdS8icdu+d6NkFBYBQ89h/rjfUunbAY8Ws8yz1Rnw3u3BkFpkxjZ0srFaVPf2+kX7cu87kOaHbapfkbcLE99KkAqjVcBuZzTX+futFTlt0wbl9jvCj+pU3z6+yTbWkDZfp6KcRPnQvOgB7A68eEwY+fxxuq3VDQPUXm59G4WiYxqatxI0v+tGDKaqmHcg+w0CpK2MT8lzriEaENqyXEwb97kzVJQbZKG0m6Vb7XsIuUJKjRZL3OCxAHAzLrkVHdc0VTb8whttb6lzaxW+fVueZxDaKb+udmQibn3KMxUMdYaqOCiaz0brxVh7cV5Ag== Received: from SEZPR04MB6972.apcprd04.prod.outlook.com (2603:1096:101:ef::7) by SEYPR04MB7400.apcprd04.prod.outlook.com (2603:1096:101:1b4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.23; Tue, 19 Mar 2024 08:02:36 +0000 Received: from SEZPR04MB6972.apcprd04.prod.outlook.com ([fe80::4aff:c1d:f18b:5e0]) by SEZPR04MB6972.apcprd04.prod.outlook.com ([fe80::4aff:c1d:f18b:5e0%4]) with mapi id 15.20.7386.025; Tue, 19 Mar 2024 08:02:36 +0000 From: =?iso-2022-jp?b?RnJhbmsgSHNpYW8gGyRCaStLIUBrGyhC?= To: "xiubli@redhat.com" CC: "ceph-devel@vger.kernel.org" , "idryomov@gmail.com" Subject: =?iso-2022-jp?b?GyRCMnNKJBsoQjogW1BBVENIIHYzIDIvMl0gY2VwaDogc2V0?= =?iso-2022-jp?b?IHRoZSBjb3JyZWN0IG1hc2sgZm9yIGdldGF0dHIgcmVxZXVzdCBmb3Ig?= =?iso-2022-jp?b?cmVhZA==?= Thread-Topic: [PATCH v3 2/2] ceph: set the correct mask for getattr reqeust for read Thread-Index: AQHaeZTuYuFNXjBs5UCeognteGrdDLE+tFnF Date: Tue, 19 Mar 2024 08:02:36 +0000 Message-ID: References: <20240319002925.1228063-1-xiubli@redhat.com> <20240319002925.1228063-3-xiubli@redhat.com> In-Reply-To: <20240319002925.1228063-3-xiubli@redhat.com> Accept-Language: zh-TW, en-US Content-Language: zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SEZPR04MB6972:EE_|SEYPR04MB7400:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zh+dIp52IjMlsFMB5eMELGuaCz45LdOlk8xziSzQKkwxMx7yjABo3c0sG5dSEWARZonhuKH4fxbHUVKQILQCGrl8f8QQFLvHENkXKY7/l645LFnRGXTzFx4WPQv98i3nElKVSQtirUv52VWw+p9BdY1FeJm1MxfZ0tMwJU4eAfv3UGURBm+WhAsC7XvjW23KejOlwMP/uxcqAywJlevh8dbCpZBjF0+RmdfElA1ujVgLJ+6Uo2kUSeESNv8OofS+F56yE68nHQ4b9dQiJc/M3EDahqogjLpL6ElOqqLislcY1DQsTAspcc6Iv7/tFxUOdgqmTPm/YyZ117PtpC+RhAAWBSa1fByYo5EkT7WRyAnx1Qye1EyVaMJeKRi+blrul4OgU1tQgbGoDYrgJPsG9eM0Cs2MqSh71YF+MChvLzKow9+oWDH+kUEIeWgYj6QYyepfn7Nn80ps5vuFqpZ0HGecS8xuzLZouf6VngmIstkEdFzWaBy/iYwaZk6sqoFVpI0LUM9bpX3INC7fMSriemPHMMxoF0b0MJoQC8qE3e5o7jNKmQ1h2E09l3oZk6Zuk55qN1+UKEuZ+BJviacr9gQrffl/CvwURCoDmJVkx9M= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:ja; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SEZPR04MB6972.apcprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(366007)(1800799015); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-2022-jp?b?QW1aQjBWVk5aWmNGTXJH?= =?iso-2022-jp?b?UzFCdjRFd0haMHMrVWZibnpZaGw4QUpjdEE3NGg3V2gyYjU3VEZCOExL?= =?iso-2022-jp?b?ODE0emM2ZGFiNmQ4TkRKQ2JsTERQR3h5WjRGUkZmOVNvVy9kU0FIZXRR?= =?iso-2022-jp?b?ZGhvM0ZBU3hMbTc5SHdGcnNKbnBYSFRzOXpGRDNWaFN2YVkrUmdLam9T?= =?iso-2022-jp?b?blM5b3kwUnlCdDg0VEY1RGRuUlEwZmN3a2pucldYb0ZzcGljKzRGYVc2?= =?iso-2022-jp?b?ZWxWOEZaejJrS2hESDZCRUNpOFc2TmhsWVNDUUR5b0tGUGVnSnIxeXdT?= =?iso-2022-jp?b?YzBvM0U0VzdWQUlFWUxLdnVqbGwwMy96WWhZWUFTOW8yeC9IekZGYXl0?= =?iso-2022-jp?b?akNpSk0wcnpRV0VuclJJV3ZTdVAwcVdQNmEwWS9ZcmpaWm1oN0NaWTFz?= =?iso-2022-jp?b?ck5sKzF4aGlWU1pSckpoYU45VklUcHA3b3dYSE5lYXBZY2hwWWgxU004?= =?iso-2022-jp?b?V041TEtVTXdOc0lBSWwremltWW9ZY0xSeU9ISitNZWtINGxnU2lEK21C?= =?iso-2022-jp?b?UldHNkM0TFBhMzBOWHE0YU5xcHVTYmZma3pkdm13MFBlSUxXRTk1eERs?= =?iso-2022-jp?b?WHU4eGpQUE41MG5LaU9XQkcvRzFvS2ZOdk53L1lNSzJwTmtWWmg3dDFC?= =?iso-2022-jp?b?dE91TU55ZThkaUN5K3lXSkd5K2w1SndaMTRDUVlobi84OVdPRkRWTjFQ?= =?iso-2022-jp?b?TFQvK2s4bzJJRy9MQy9HNWNVTXdHUUsrbjI3SXh0UDhtUVNGUzhrWTdI?= =?iso-2022-jp?b?dVlVWGxla0pVTlJuY1hhaGlERVZNd2FYeHpZSDRuU2RyQVhmcnhKY1BZ?= =?iso-2022-jp?b?ZWh3UWE2aWIwMVhXaUpnUnZnaWI3R09pbXJ3NDd4Tyt4aHQwYjVuMDVN?= =?iso-2022-jp?b?amZINGtPYTgyK2ZQZDl6SCt5M2lFZjNvKzNWK09WajUzZURSaDZHRzYx?= =?iso-2022-jp?b?bGNab3R6ckNKbytIQlBWVmZjZko2SWVVWDBGVWlXTkdMMmxTc05qRW1j?= =?iso-2022-jp?b?YXhLZXhlSGtLNWJZY2VGQWlPVHRYd1ZmU3BHdFB0QmdmRTRKb2l4THFY?= =?iso-2022-jp?b?by9UUzB0VVFVU1N1Unl4YkEvNHMxREdKM1JVVytPek9GNWZyMEtUaVhM?= =?iso-2022-jp?b?ay9DVTM3Q0d1RngwTjUrY0svcG56SHg2RVM5RTIrb1RLWWZNVzdYK09w?= =?iso-2022-jp?b?SjBZV0kwUEZDRFVpTGZzZ0hiRnhLVkZlTGoyMkgxbGlnTEhHcnlsT3pp?= =?iso-2022-jp?b?RllFa3Y2Znpnaml6SzQ2RFh6bjlyR0tHZXpzTWdWV050WVd4cHBmUHlJ?= =?iso-2022-jp?b?QndjeXNEUVB2YUhudFlPblFTMXZsYi9jb0k2NklTZkhZWnJBUkp3V0lp?= =?iso-2022-jp?b?Skc4ci9FUXpOTTFZMGZFcDk0UUliMTVzUk51ejlnM0R5aWhFeGJueDZi?= =?iso-2022-jp?b?MGhFSm9CaW1nQ1Rwd1FxUW9Uck5wU0xPSTIzMG5EUm1WUGlsdUNKeW9q?= =?iso-2022-jp?b?ZlpBak52OGpoQWJ5ZmpDNk0xV0dSOFRMZEYwYjhLSGI4QzV0V09WODFm?= =?iso-2022-jp?b?S0hXcmZ4YS8xVE5GaEtUVWhVbUtRRE96OWg3Q2VxYS83cVRKWC9HZkZZ?= =?iso-2022-jp?b?WEcxSE9kUmV4bnVkU3Y1VGdsZWo2aERLbndUV3VaUnFxemtpY2l4U2lz?= =?iso-2022-jp?b?VzkxUzJiUDRjcThUV2dFZHhZaElYVlBYcEd2blYxTS9UWjAzR1JPS0tJ?= =?iso-2022-jp?b?SEJUTGRnWmt6diswaWxOZDNYOWRTQzZKLy9TaVpSWkYwSmNuMEljaTg5?= =?iso-2022-jp?b?SCsxVmQxMWluREhLSmozTjdlRXV6U1p4Nzd1N2tVRDltVGUwSGYwY09Y?= =?iso-2022-jp?b?c2x0NmRzUE9TQ09wZ1V1ZzAwdHY5R0E1M205WTZBaDFvVU95MEhJMFMv?= =?iso-2022-jp?b?c1NNakxNNUw4R1l2YkxnQVFrZkN5ZktBOVNJdWdqZHJrb0s2Sjl4dHhE?= =?iso-2022-jp?b?OWpQN2wyUFNuMmo3eWNTZXgzb0V4dEZoQkVzVEFjbHBSZlozY1RqMzl4?= =?iso-2022-jp?b?eEJMeEp4WDhVY20rWHpSWXo0YnYzdFhqYjZnWTdaZnMxZlpVeC84VSsz?= =?iso-2022-jp?b?RFF6UU1zWk1vaHRqY1dYNlBqRTRXYmJpRXg1ZWVCOHJxN1dObjNnNUE4?= =?iso-2022-jp?b?VElZK3Fud3ZzbVJRS0QxajRlZkpFVmJUMGZieFZ4MFNCSHV3eEJ0VFdm?= =?iso-2022-jp?b?NkV1elA0OTBvcz0=?= Precedence: bulk X-Mailing-List: ceph-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: qnap.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SEZPR04MB6972.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eca85afc-2d84-456f-6ae4-08dc47eaf091 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2024 08:02:36.3368 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 6eba8807-6ef0-4e31-890c-a6ecfbb98568 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 7eHgCilzkDaKKMQ22oki/9RxgIGZ2r8xnkicEs+Yqais3Iq4EbYgzBXxC2BVBKRNWNzRZXHpHopUd5UUjoxWTQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR04MB7400 Reviewed-by: Frank Hsiao 蕭法宣 Tested-by: Frank Hsiao 蕭法宣 diff --git a/fs/ceph/file.c b/fs/ceph/file.c index c35878427985..a85f95c941fc 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -2191,14 +2191,16 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to) int statret; struct page *page = NULL; loff_t i_size; + int mask = CEPH_STAT_CAP_SIZE; if (retry_op == READ_INLINE) { page = __page_cache_alloc(GFP_KERNEL); if (!page) return -ENOMEM; } - statret = __ceph_do_getattr(inode, page, - CEPH_STAT_CAP_INLINE_DATA, !!page); + if (retry_op == READ_INLINE) + mask = CEPH_STAT_CAP_INLINE_DATA; + statret = __ceph_do_getattr(inode, page, mask, !!page); if (statret < 0) { if (page) __free_page(page); @@ -2239,7 +2241,7 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to) /* hit EOF or hole? */ if (retry_op == CHECK_EOF && iocb->ki_pos < i_size && ret < len) { - doutc(cl, "hit hole, ppos %lld < size %lld, reading more\n", + doutc(cl, "may hit hole, ppos %lld < size %lld, reading more\n", iocb->ki_pos, i_size); read += ret; From patchwork Tue Mar 19 00:29:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 781625 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDD1C1C3E for ; Tue, 19 Mar 2024 00:32:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710808348; cv=none; b=ExpUXuGwt/WzHyXTM7MF5JLIIWfrOdgb/tT6Nl77xmmSiXmBNcHnbEwvoXaZHythRuGqUFr8vp0TFf8IqjPuD99VvcrJzRr0tVKfuUlhWRrpMGyDvpkksqUQBZ91VDV5b2La9s+bbSRsU9poh7xlgTX2pdVlobM8r2lDj59BSQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710808348; c=relaxed/simple; bh=+ozlqxGhnhUJ1STxwXtWx/sVKL+KQbmbdFEEZc4PEt0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gWv3hb+KFT48p2Iaa9RTzTHToLIerbbWCD9dR9iqWwfuN/939Oa0wic6p9UcNIibBFNUpQpObwVgnnJkse1YVdBEzdC+NT5TI6F2f9TOj2NyrL6EFhnZyrWBvlrgPwS6Gl8km/BLOKMcDfMZ36CdjrbnBt63L228uTpEOCXe6E0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=duoiTs2h; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="duoiTs2h" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710808346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9AlHctE9hUf91KsACfc49Cjs2K+t5QwQ3PaHe1QAgoA=; b=duoiTs2hcC4IyntiQx0tWqPdkx9c7HGWVAXULWGBqGH/ev6oB7EfxRiRQ0aK6HyhxeS6Tv 6/eb7xdef/He1hDyO0QCagtFXK4HIDOs0NQ6iIcgxqSL+OFmeEbhJQwoU8DOGKd1A3u2Uo 1jHClZerN/Htlzqw5G+8b9puYpUux6g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-505-ve75TuTCMkW13vqKH-0Ytw-1; Mon, 18 Mar 2024 20:32:23 -0400 X-MC-Unique: ve75TuTCMkW13vqKH-0Ytw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 18BA3101A552; Tue, 19 Mar 2024 00:32:23 +0000 (UTC) Received: from li-a71a4dcc-35d1-11b2-a85c-951838863c8d.ibm.com.com (unknown [10.72.112.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB8E1492BDC; Tue, 19 Mar 2024 00:32:19 +0000 (UTC) From: xiubli@redhat.com To: ceph-devel@vger.kernel.org Cc: idryomov@gmail.com, jlayton@kernel.org, vshankar@redhat.com, mchangir@redhat.com, frankhsiao@qnap.com, Xiubo Li Subject: [PATCH v3 2/2] ceph: set the correct mask for getattr reqeust for read Date: Tue, 19 Mar 2024 08:29:25 +0800 Message-ID: <20240319002925.1228063-3-xiubli@redhat.com> In-Reply-To: <20240319002925.1228063-1-xiubli@redhat.com> References: <20240319002925.1228063-1-xiubli@redhat.com> Precedence: bulk X-Mailing-List: ceph-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 From: Xiubo Li In case of hitting the file EOF the ceph_read_iter() needs to retrieve the file size from MDS, and the Fr caps is not a neccessary. URL: https://patchwork.kernel.org/project/ceph-devel/list/?series=819323 Reported-by: Frank Hsiao 蕭法宣 Signed-off-by: Xiubo Li Tested-by: Frank Hsiao 蕭法宣 --- fs/ceph/file.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index c35878427985..a85f95c941fc 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -2191,14 +2191,16 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to) int statret; struct page *page = NULL; loff_t i_size; + int mask = CEPH_STAT_CAP_SIZE; if (retry_op == READ_INLINE) { page = __page_cache_alloc(GFP_KERNEL); if (!page) return -ENOMEM; } - statret = __ceph_do_getattr(inode, page, - CEPH_STAT_CAP_INLINE_DATA, !!page); + if (retry_op == READ_INLINE) + mask = CEPH_STAT_CAP_INLINE_DATA; + statret = __ceph_do_getattr(inode, page, mask, !!page); if (statret < 0) { if (page) __free_page(page); @@ -2239,7 +2241,7 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to) /* hit EOF or hole? */ if (retry_op == CHECK_EOF && iocb->ki_pos < i_size && ret < len) { - doutc(cl, "hit hole, ppos %lld < size %lld, reading more\n", + doutc(cl, "may hit hole, ppos %lld < size %lld, reading more\n", iocb->ki_pos, i_size); read += ret;