Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Xiu Jianfeng <xiujianfeng@huawei.com>
CC:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "rafael@kernel.org" <rafael@kernel.org>,
        Al Viro <viro@zeniv.linux.org.uk>,
        Christian Brauner <brauner@kernel.org>,
        David Howells <dhowells@redhat.com>,
        "code@tyhicks.com" <code@tyhicks.com>,
        "hirofumi@mail.parknet.co.jp" <hirofumi@mail.parknet.co.jp>,
        Namjae Jeon <linkinjeon@kernel.org>,
        Steve French <sfrench@samba.org>,
        Sergey Senozhatsky <senozhatsky@chromium.org>,
        Tom Talpey <tom@talpey.com>, Jeff Layton <jlayton@kernel.org>,
        Miklos Szeredi <miklos@szeredi.hu>,
        "paul@paul-moore.com" <paul@paul-moore.com>,
        "jmorris@namei.org" <jmorris@namei.org>,
        "serge@hallyn.com" <serge@hallyn.com>,
        "stephen.smalley.work@gmail.com" <stephen.smalley.work@gmail.com>,
        "eparis@parisplace.org" <eparis@parisplace.org>,
        "casey@schaufler-ca.com" <casey@schaufler-ca.com>,
        "dchinner@redhat.com" <dchinner@redhat.com>,
        "john.johansen@canonical.com" <john.johansen@canonical.com>,
        Luis Chamberlain <mcgrof@kernel.org>,
        "mortonm@chromium.org" <mortonm@chromium.org>,
        "fred@cloudflare.com" <fred@cloudflare.com>,
        "mic@digikod.net" <mic@digikod.net>,
        Michael Ellerman <mpe@ellerman.id.au>,
        "nathanl@linux.ibm.com" <nathanl@linux.ibm.com>,
        "gnoack3000@gmail.com" <gnoack3000@gmail.com>,
        "roberto.sassu@huawei.com" <roberto.sassu@huawei.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        linux-fsdevel <linux-fsdevel@vger.kernel.org>,
        "linux-cachefs@redhat.com" <linux-cachefs@redhat.com>,
        "ecryptfs@vger.kernel.org" <ecryptfs@vger.kernel.org>,
        CIFS <linux-cifs@vger.kernel.org>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        "linux-unionfs@vger.kernel.org" <linux-unionfs@vger.kernel.org>,
        "linux-security-module@vger.kernel.org" 
        <linux-security-module@vger.kernel.org>,
        "selinux@vger.kernel.org" <selinux@vger.kernel.org>,
        "wangweiyang2@huawei.com" <wangweiyang2@huawei.com>
Subject: Re: [PATCH -next 1/2] Change notify_change() to take struct path
 argument
Thread-Topic: [PATCH -next 1/2] Change notify_change() to take struct path
 argument
Thread-Index: AQHZf3YrmvK3dThuLEiKy+nYmX5Fhw==
Date:   Fri, 5 May 2023 17:22:29 +0000
Message-ID: <4B2B4BA9-BD13-4AEB-B1C4-DFC400074990@oracle.com>
References: <20230505081200.254449-1-xiujianfeng@huawei.com>
 <20230505081200.254449-2-xiujianfeng@huawei.com>
In-Reply-To: <20230505081200.254449-2-xiujianfeng@huawei.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?KK4JA1XO8OWiwky9F5BEKwCnbE3nMuaGdwpkbFQBOPjxZmPQ1KSukkvXRA8M?=
 =?us-ascii?Q?SPBgYYv5/sUpIbTOphTqWt2CNEM1G/nKJJQ1dRQA0aerpdHs9f/tissOWAdM?=
 =?us-ascii?Q?SNn+zJOWIXKwqEelyata9//iFNrauuo+4oTOEXezrl8cxy9nHMzbLH5vR9nC?=
 =?us-ascii?Q?ZGGefU042tozOsXk8knxhamQNzGTEp8CVJuNdkq3ndvgTri81+KjqUEUlI52?=
 =?us-ascii?Q?XPp5sr+gOGrKFbiPCauAWOEnejcepQoRCeDA5Las0TuoLnI00wHIVz56Mrrq?=
 =?us-ascii?Q?Sq5u8BQTW2FGjj1YEZhQ8G5QSwjgS2hQjaITFkb9YXg8qIkUb/BhddVLepGH?=
 =?us-ascii?Q?BL6BmFcP3Ighbc93FHjVRwcCWJu5VPeyTQkegHdg+1vKbNr+QECGxHyrWvaC?=
 =?us-ascii?Q?da6w9ofJlzxOWUqK6QFDg0IlirDMzUjCioZfFzbf4CJTYaEEein/NeeZ56St?=
 =?us-ascii?Q?88ommhP5iPlE/VmCsbhNz4tC+hAAtDH/xmk3L2CwAg1mFADrpTb2vmLwq8xJ?=
 =?us-ascii?Q?/4Sz06xNgjSP3sq5Wj7gOeScTb1AIZFp7m4bgwPOxpPcjFqRxGZGf+FpG/qI?=
 =?us-ascii?Q?b/TV0UTEJtwZZ66f5S3tzUKJycCev6rtoM2DLFe6pIQLJUZRyCv5bcCBji+0?=
 =?us-ascii?Q?9+MtCYIMzsJQIDn1IC1SUk9WR7TBFmy6YN15nDjh37VGjTZNbdpHk3OLf2n5?=
 =?us-ascii?Q?OFlpEEs9aZaalirsnoa61MM+tR7T0THtifc0Di1xie7w7gTSS74WM0qxfRMj?=
 =?us-ascii?Q?goKGFLd6a5SOK/zR8jTwX8Xcb1RtMIoY93C1fVAIQfoaBif/YtRyUR4O+xSY?=
 =?us-ascii?Q?n5pspwpf9IQFjG0BVtzHrw0SDPgRVTqakPFu2AfTOtvIZGCvi4xYaHpctkSL?=
 =?us-ascii?Q?Jf0WvqL6sFKFapKRDiHjH3yiBC9pi5wOz3T4Fz1p1zwHbr4b8BMf7Uqgwqo4?=
 =?us-ascii?Q?cBKd1WdpZ0/s3BKx8PgVCFpEQ5266VVYCgtaEb0LenSNr5wO737sW7QmboNk?=
 =?us-ascii?Q?ovFslaKrdKWlUP/nqlDAv9nDwemSYUMGH6HJdnzQ0O/DPr/EBMs6tJLwJzPH?=
 =?us-ascii?Q?pxlVcUnz1ubYpZ8e39Xef97CcDmxOzfEs/yQeVxmX+4LUetSsf3TYpRIGV5F?=
 =?us-ascii?Q?Nk2mcTJBw6rvgr2N/5DJkI9gpAaI1L+aqOtBov99+PlZuSFMOLuNI1S/yKq1?=
 =?us-ascii?Q?fEXQF39jrq9uXxV8RKXn7+Dqk6nw30ov4Tj55O5PampAGR4fEGNuT8OeJits?=
 =?us-ascii?Q?qyHBqKaBg9q+Cpei6h+9aHs42HLgHMUkKVGONso0cEwDQ/N7wGqy/K2EZq1R?=
 =?us-ascii?Q?F7dp2K4+/x1rawEcIyGsNd2aviz9KUfrp9ObcPzT4ymDM05bzGcFtFhZedEK?=
 =?us-ascii?Q?olYFQFKHEssa4Uc5LlGW+YGJ4NkYSdJeoypQFuH8S1zOeeJ3zWvE8hRUt4Nr?=
 =?us-ascii?Q?NsltXLmdKDTvUldU4T5id+Kf8mCx3yzs6mzISSMTXGaIcnHwYtjXxmgEVrli?=
 =?us-ascii?Q?8kzFeAnFACuCtyj9JZ4AoU+V1PUQ+MLdnVN42zI9d1+9n/1/MZPIPWFN/j/w?=
 =?us-ascii?Q?v8fuaSo8+aGkM+HMp7H7gDyxgDBs8m9cERbyfuVLTZzMZF4yj4sN1X9sXf0r?=
 =?us-ascii?Q?Yw=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <31B92849520C5844BB1F4D6BB2671EB2@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?JgBIIPeiXuIebzDFCW9llVlOwxWFZrIRNVe6KznZq04NIf7WCThcBGGpc2U7?=
 =?us-ascii?Q?2m5RBmkNsdrZcT6a9JnyAEIT3G24QK11Txux0bv2L8Ovx0nFVGWYfDT93sfj?=
 =?us-ascii?Q?z1b0H32SHWoGrzJNr771IMjqWyFQve3jb2YCeMddpte622wPC8f9MwZYKH3x?=
 =?us-ascii?Q?x0GEypsJRR1QiUggmGf70qYWp21laLL5BoUaN8BCxlGd4AvmVrTjWLQOLmKZ?=
 =?us-ascii?Q?rXCIqAAEDq4UbXrq9sXGc6Lsdd1Dxis36j+EXy5sc9a0C9q4lx5zM37Xg7PD?=
 =?us-ascii?Q?Ftmk043QGcxK/2PAuSxBSqwAEaUFURotEiHHWdmEoeiz3dsC1rJALryWq6J2?=
 =?us-ascii?Q?gkcIynoGn7h61YDkK6l54zKqkkvW6y4secz8anOgeoKzCaXsUgizM1jLGkuK?=
 =?us-ascii?Q?sY8nY9wXsYNbl3qzz5FBHOkXCAlhrW3KNlHrfe2Q7yTdZ0QYvFSGholHQnvc?=
 =?us-ascii?Q?ROe78ayneK1RkFTAIbBPfD6nIaILG5luOstPmk+rfwKtTZIUChoyffqZlyQS?=
 =?us-ascii?Q?M66rh91otBy/5fgXGZQm7+xZS2a6lQtK35PkzwQZTIvKHOb/XoKV/e0yfrtO?=
 =?us-ascii?Q?jGdgB1W3Xq7u9QYejuUZM2cAy9dS4lRtPwNZpNr1dMIUqo81mT+rYuwJ8DF3?=
 =?us-ascii?Q?fk256zy5X3WFJymGy5RU088/aax+hcbL0/pC0WMG3DTY4W/Ky0ykhyxU0uvO?=
 =?us-ascii?Q?1AmeWmKmpMNl7Yn/c+lha4PFQso1CA0phFTOV/ecjJz4Y8BkUrlwhpBkjp6h?=
 =?us-ascii?Q?b6TQUDAjrg5cVHwGgSra7jwzRCmXPg2EVuNBXQx1k9zEZB6yEGcPETpeAlhe?=
 =?us-ascii?Q?FumWnGTCS4/+7eX/GrHBnP56VnsSJODoosLk2Ah35yVnqC94l5SggYxPz3pK?=
 =?us-ascii?Q?mYYqW/oVuAOjgHZh6VhbRG7QsYI3uMows1/39+zb5I0ipgHs+v87H5pTBy3A?=
 =?us-ascii?Q?J0scAoOOD2FIa3q0beOBwcAlUFls6sjN/fmAgqbx5j1X8fp08/vffi7ibenV?=
 =?us-ascii?Q?XaR0mJ6jVXwO3E5BW/pViwqTR0gQqbqXytMfc6AQHn1D7571JJnpcA3OlFho?=
 =?us-ascii?Q?/gb4LodFX+NXdGsRAKFLI+dUrJYlZcjTppdKbERX7O6mu40PFb0f8Eyz6GWD?=
 =?us-ascii?Q?kMqDxyTz/zLQPStECQ2m1BHn8G4ncbWpFAKNwEW0yzUUcX3ayqG5vRej05Ux?=
 =?us-ascii?Q?n0/E/LRWLOhKaT5Vr0gD0JBUiBko3sLrWv9Rc0/MJ4T1KvH+xACk/4AF7rOV?=
 =?us-ascii?Q?doo0aoIeCABRNcSq+f6bEJofLCmHWMhBwwlibgQuQ72C9/NwBYE/lTBVYivW?=
 =?us-ascii?Q?LvhFhNGcnhK3p+KMg0inA6XKv8z4Mj3xZXiDZLjOFXWoBX0yOmkdGOP4P+SN?=
 =?us-ascii?Q?9xDO6IaNMayCjUO3ojx4nVkNp3/ojCtNVxcQHtX+BL+sFTlG3nl14e+X8/zs?=
 =?us-ascii?Q?VOXixnpUhPxGXwmnuvNqr8ykWfhAbIVd7nl2JqcNpDMzz6sNjkq5atzBOssB?=
 =?us-ascii?Q?3Ul3sXRzROJehiKKzPZGH9Ap1Aa1vWZ/fPmz7ro4ait9OUnnTawE93kF7Gn7?=
 =?us-ascii?Q?WadmZyp040nObC27c3w=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 61f653fc-accd-4331-6bfe-08db4d8d4e2a
X-MS-Exchange-CrossTenant-originalarrivaltime: 05 May 2023 17:22:29.9731
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: yNpGhwZvmgSzrMyUu8vOIX111ewEiCpoCRgAVvauxnLTzh6uNffUrky94r7HNvvy2z/u28j7HP8RBLS09xXTIA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5127
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-05_23,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0
 mlxlogscore=999 spamscore=0 phishscore=0 adultscore=0 mlxscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2305050143
X-Proofpoint-GUID: wPDLz_fH6a0iiSK8jwrTNMykOf3B8sur
X-Proofpoint-ORIG-GUID: wPDLz_fH6a0iiSK8jwrTNMykOf3B8sur
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On May 5, 2023, at 4:11 AM, Xiu Jianfeng <xiujianfeng@huawei.com> wrote:
>=20
> For path-based LSMs such as Landlock, struct path instead of struct
> dentry is required to make sense of attr/xattr accesses. notify_change()
> is the main caller of security_inode_setattr(), so refactor it first
> before lsm hook inode_setattr().
>=20
> This patch also touches do_truncate() and other related callers.
>=20
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---
> drivers/base/devtmpfs.c   |  5 +++--
> fs/attr.c                 |  5 +++--
> fs/cachefiles/interface.c |  4 ++--
> fs/coredump.c             |  2 +-
> fs/ecryptfs/inode.c       | 18 +++++++++---------
> fs/inode.c                |  8 +++++---
> fs/ksmbd/smb2pdu.c        |  6 +++---
> fs/ksmbd/smbacl.c         |  2 +-
> fs/namei.c                |  2 +-
> fs/nfsd/vfs.c             | 12 ++++++++----
> fs/open.c                 | 19 ++++++++++---------
> fs/overlayfs/overlayfs.h  |  4 +++-
> fs/utimes.c               |  2 +-
> include/linux/fs.h        |  4 ++--
> 14 files changed, 52 insertions(+), 41 deletions(-)
>=20
> diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
> index b848764ef018..e67dd258984c 100644
> --- a/drivers/base/devtmpfs.c
> +++ b/drivers/base/devtmpfs.c
> @@ -220,13 +220,14 @@ static int handle_create(const char *nodename, umod=
e_t mode, kuid_t uid,
> dev->devt);
> if (!err) {
> struct iattr newattrs;
> + struct path new =3D { .mnt =3D path.mnt, .dentry =3D dentry };
>=20
> newattrs.ia_mode =3D mode;
> newattrs.ia_uid =3D uid;
> newattrs.ia_gid =3D gid;
> newattrs.ia_valid =3D ATTR_MODE|ATTR_UID|ATTR_GID;
> inode_lock(d_inode(dentry));
> - notify_change(&nop_mnt_idmap, dentry, &newattrs, NULL);
> + notify_change(&nop_mnt_idmap, &new, &newattrs, NULL);
> inode_unlock(d_inode(dentry));
>=20
> /* mark as kernel-created inode */
> @@ -334,7 +335,7 @@ static int handle_remove(const char *nodename, struct=
 device *dev)
> newattrs.ia_valid =3D
> ATTR_UID|ATTR_GID|ATTR_MODE;
> inode_lock(d_inode(dentry));
> - notify_change(&nop_mnt_idmap, dentry, &newattrs, NULL);
> + notify_change(&nop_mnt_idmap, &p, &newattrs, NULL);
> inode_unlock(d_inode(dentry));
> err =3D vfs_unlink(&nop_mnt_idmap, d_inode(parent.dentry),
> dentry, NULL);
> diff --git a/fs/attr.c b/fs/attr.c
> index d60dc1edb526..eecd78944b83 100644
> --- a/fs/attr.c
> +++ b/fs/attr.c
> @@ -354,7 +354,7 @@ EXPORT_SYMBOL(may_setattr);
> /**
>  * notify_change - modify attributes of a filesytem object
>  * @idmap: idmap of the mount the inode was found from
> - * @dentry: object affected
> + * @path: path of object affected
>  * @attr: new attributes
>  * @delegated_inode: returns inode, if the inode is delegated
>  *
> @@ -378,9 +378,10 @@ EXPORT_SYMBOL(may_setattr);
>  * permissions. On non-idmapped mounts or if permission checking is to be
>  * performed on the raw inode simply pass @nop_mnt_idmap.
>  */
> -int notify_change(struct mnt_idmap *idmap, struct dentry *dentry,
> +int notify_change(struct mnt_idmap *idmap, const struct path *path,
>  struct iattr *attr, struct inode **delegated_inode)
> {
> + struct dentry *dentry =3D path->dentry;
> struct inode *inode =3D dentry->d_inode;
> umode_t mode =3D inode->i_mode;
> int error;
> diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c
> index 40052bdb3365..4700285a76f0 100644
> --- a/fs/cachefiles/interface.c
> +++ b/fs/cachefiles/interface.c
> @@ -138,7 +138,7 @@ static int cachefiles_adjust_size(struct cachefiles_o=
bject *object)
> newattrs.ia_size =3D oi_size & PAGE_MASK;
> ret =3D cachefiles_inject_remove_error();
> if (ret =3D=3D 0)
> - ret =3D notify_change(&nop_mnt_idmap, file->f_path.dentry,
> + ret =3D notify_change(&nop_mnt_idmap, &file->f_path,
>    &newattrs, NULL);
> if (ret < 0)
> goto truncate_failed;
> @@ -148,7 +148,7 @@ static int cachefiles_adjust_size(struct cachefiles_o=
bject *object)
> newattrs.ia_size =3D ni_size;
> ret =3D cachefiles_inject_write_error();
> if (ret =3D=3D 0)
> - ret =3D notify_change(&nop_mnt_idmap, file->f_path.dentry,
> + ret =3D notify_change(&nop_mnt_idmap, &file->f_path,
>    &newattrs, NULL);
>=20
> truncate_failed:
> diff --git a/fs/coredump.c b/fs/coredump.c
> index ece7badf701b..01bef4830bfa 100644
> --- a/fs/coredump.c
> +++ b/fs/coredump.c
> @@ -736,7 +736,7 @@ void do_coredump(const kernel_siginfo_t *siginfo)
> }
> if (!(cprm.file->f_mode & FMODE_CAN_WRITE))
> goto close_fail;
> - if (do_truncate(idmap, cprm.file->f_path.dentry,
> + if (do_truncate(idmap, &cprm.file->f_path,
> 0, 0, cprm.file))
> goto close_fail;
> }
> diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
> index 83274915ba6d..423bd457623e 100644
> --- a/fs/ecryptfs/inode.c
> +++ b/fs/ecryptfs/inode.c
> @@ -853,12 +853,12 @@ int ecryptfs_truncate(struct dentry *dentry, loff_t=
 new_length)
>=20
> rc =3D truncate_upper(dentry, &ia, &lower_ia);
> if (!rc && lower_ia.ia_valid & ATTR_SIZE) {
> - struct dentry *lower_dentry =3D ecryptfs_dentry_to_lower(dentry);
> + const struct path *lower_path =3D ecryptfs_dentry_to_lower_path(dentry)=
;
>=20
> - inode_lock(d_inode(lower_dentry));
> - rc =3D notify_change(&nop_mnt_idmap, lower_dentry,
> + inode_lock(d_inode(lower_path->dentry));
> + rc =3D notify_change(&nop_mnt_idmap, lower_path,
>   &lower_ia, NULL);
> - inode_unlock(d_inode(lower_dentry));
> + inode_unlock(d_inode(lower_path->dentry));
> }
> return rc;
> }
> @@ -888,7 +888,7 @@ static int ecryptfs_setattr(struct mnt_idmap *idmap,
>    struct dentry *dentry, struct iattr *ia)
> {
> int rc =3D 0;
> - struct dentry *lower_dentry;
> + const struct path *lower_path;
> struct iattr lower_ia;
> struct inode *inode;
> struct inode *lower_inode;
> @@ -902,7 +902,7 @@ static int ecryptfs_setattr(struct mnt_idmap *idmap,
> }
> inode =3D d_inode(dentry);
> lower_inode =3D ecryptfs_inode_to_lower(inode);
> - lower_dentry =3D ecryptfs_dentry_to_lower(dentry);
> + lower_path =3D ecryptfs_dentry_to_lower_path(dentry);
> mutex_lock(&crypt_stat->cs_mutex);
> if (d_is_dir(dentry))
> crypt_stat->flags &=3D ~(ECRYPTFS_ENCRYPTED);
> @@ -964,9 +964,9 @@ static int ecryptfs_setattr(struct mnt_idmap *idmap,
> if (lower_ia.ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
> lower_ia.ia_valid &=3D ~ATTR_MODE;
>=20
> - inode_lock(d_inode(lower_dentry));
> - rc =3D notify_change(&nop_mnt_idmap, lower_dentry, &lower_ia, NULL);
> - inode_unlock(d_inode(lower_dentry));
> + inode_lock(d_inode(lower_path->dentry));
> + rc =3D notify_change(&nop_mnt_idmap, lower_path, &lower_ia, NULL);
> + inode_unlock(d_inode(lower_path->dentry));
> out:
> fsstack_copy_attr_all(inode, lower_inode);
> return rc;
> diff --git a/fs/inode.c b/fs/inode.c
> index 577799b7855f..4fa51d46f655 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -1973,7 +1973,7 @@ int dentry_needs_remove_privs(struct mnt_idmap *idm=
ap,
> }
>=20
> static int __remove_privs(struct mnt_idmap *idmap,
> -  struct dentry *dentry, int kill)
> +  struct path *path, int kill)
> {
> struct iattr newattrs;
>=20
> @@ -1982,13 +1982,15 @@ static int __remove_privs(struct mnt_idmap *idmap=
,
> * Note we call this on write, so notify_change will not
> * encounter any conflicting delegations:
> */
> - return notify_change(idmap, dentry, &newattrs, NULL);
> + return notify_change(idmap, path, &newattrs, NULL);
> }
>=20
> static int __file_remove_privs(struct file *file, unsigned int flags)
> {
> struct dentry *dentry =3D file_dentry(file);
> struct inode *inode =3D file_inode(file);
> + /* this path maybe incorrect */
> + struct path path =3D {.mnt =3D file->f_path.mnt, .dentry =3D dentry};
> int error =3D 0;
> int kill;
>=20
> @@ -2003,7 +2005,7 @@ static int __file_remove_privs(struct file *file, u=
nsigned int flags)
> if (flags & IOCB_NOWAIT)
> return -EAGAIN;
>=20
> - error =3D __remove_privs(file_mnt_idmap(file), dentry, kill);
> + error =3D __remove_privs(file_mnt_idmap(file), &path, kill);
> }
>=20
> if (!error)
> diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
> index cb93fd231f4e..2b7e5c446397 100644
> --- a/fs/ksmbd/smb2pdu.c
> +++ b/fs/ksmbd/smb2pdu.c
> @@ -5644,8 +5644,8 @@ static int set_file_basic_info(struct ksmbd_file *f=
p,
> }
>=20
> if (attrs.ia_valid) {
> - struct dentry *dentry =3D filp->f_path.dentry;
> - struct inode *inode =3D d_inode(dentry);
> + struct path *path =3D &filp->f_path;
> + struct inode *inode =3D d_inode(path->dentry);
>=20
> if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
> return -EACCES;
> @@ -5653,7 +5653,7 @@ static int set_file_basic_info(struct ksmbd_file *f=
p,
> inode_lock(inode);
> inode->i_ctime =3D attrs.ia_ctime;
> attrs.ia_valid &=3D ~ATTR_CTIME;
> - rc =3D notify_change(idmap, dentry, &attrs, NULL);
> + rc =3D notify_change(idmap, path, &attrs, NULL);
> inode_unlock(inode);
> }
> return rc;
> diff --git a/fs/ksmbd/smbacl.c b/fs/ksmbd/smbacl.c
> index 6d6cfb6957a9..39d8aff3ae1b 100644
> --- a/fs/ksmbd/smbacl.c
> +++ b/fs/ksmbd/smbacl.c
> @@ -1403,7 +1403,7 @@ int set_info_sec(struct ksmbd_conn *conn, struct ks=
mbd_tree_connect *tcon,
> }
>=20
> inode_lock(inode);
> - rc =3D notify_change(idmap, path->dentry, &newattrs, NULL);
> + rc =3D notify_change(idmap, path, &newattrs, NULL);
> inode_unlock(inode);
> if (rc)
> goto out;
> diff --git a/fs/namei.c b/fs/namei.c
> index e4fe0879ae55..ec7075a8505d 100644
> --- a/fs/namei.c
> +++ b/fs/namei.c
> @@ -3292,7 +3292,7 @@ static int handle_truncate(struct mnt_idmap *idmap,=
 struct file *filp)
>=20
> error =3D security_file_truncate(filp);
> if (!error) {
> - error =3D do_truncate(idmap, path->dentry, 0,
> + error =3D do_truncate(idmap, path, 0,
>    ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,
>    filp);
> }
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index bb9d47172162..4b51fd2f05e3 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -410,7 +410,7 @@ nfsd_get_write_access(struct svc_rqst *rqstp, struct =
svc_fh *fhp,
> return nfserrno(get_write_access(inode));
> }
>=20
> -static int __nfsd_setattr(struct dentry *dentry, struct iattr *iap)
> +static int __nfsd_setattr(struct path *path, struct iattr *iap)
> {
> int host_err;
>=20
> @@ -430,7 +430,7 @@ static int __nfsd_setattr(struct dentry *dentry, stru=
ct iattr *iap)
> if (iap->ia_size < 0)
> return -EFBIG;
>=20
> - host_err =3D notify_change(&nop_mnt_idmap, dentry, &size_attr, NULL);
> + host_err =3D notify_change(&nop_mnt_idmap, path, &size_attr, NULL);
> if (host_err)
> return host_err;
> iap->ia_valid &=3D ~ATTR_SIZE;
> @@ -448,7 +448,7 @@ static int __nfsd_setattr(struct dentry *dentry, stru=
ct iattr *iap)
> return 0;
>=20
> iap->ia_valid |=3D ATTR_CTIME;
> - return notify_change(&nop_mnt_idmap, dentry, iap, NULL);
> + return notify_change(&nop_mnt_idmap, path, iap, NULL);
> }
>=20
> /**
> @@ -471,6 +471,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *f=
hp,
>     struct nfsd_attrs *attr,
>     int check_guard, time64_t guardtime)
> {
> + struct path path;
> struct dentry *dentry;
> struct inode *inode;
> struct iattr *iap =3D attr->na_iattr;
> @@ -534,9 +535,12 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *=
fhp,
> return err;
> }
>=20
> + path.mnt =3D fhp->fh_export->ex_path.mnt;
> + path.dentry =3D fhp->fh_dentry;
> +
> inode_lock(inode);
> for (retries =3D 1;;) {
> - host_err =3D __nfsd_setattr(dentry, iap);
> + host_err =3D __nfsd_setattr(&path, iap);
> if (host_err !=3D -EAGAIN || !retries--)
> break;
> if (!nfsd_wait_for_delegreturn(rqstp, inode))

Acked-by: Chuck Lever <chuck.lever@oracle.com <mailto:chuck.lever@oracle.co=
m>>


> diff --git a/fs/open.c b/fs/open.c
> index 4478adcc4f3a..7a7841606285 100644
> --- a/fs/open.c
> +++ b/fs/open.c
> @@ -37,11 +37,12 @@
>=20
> #include "internal.h"
>=20
> -int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry,
> +int do_truncate(struct mnt_idmap *idmap, const struct path *path,
> loff_t length, unsigned int time_attrs, struct file *filp)
> {
> int ret;
> struct iattr newattrs;
> + struct dentry *dentry =3D path->dentry;
>=20
> /* Not pretty: "inode->i_size" shouldn't really be signed. But it is. */
> if (length < 0)
> @@ -63,7 +64,7 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry =
*dentry,
>=20
> inode_lock(dentry->d_inode);
> /* Note any delegations or leases have already been broken: */
> - ret =3D notify_change(idmap, dentry, &newattrs, NULL);
> + ret =3D notify_change(idmap, path, &newattrs, NULL);
> inode_unlock(dentry->d_inode);
> return ret;
> }
> @@ -109,7 +110,7 @@ long vfs_truncate(const struct path *path, loff_t len=
gth)
>=20
> error =3D security_path_truncate(path);
> if (!error)
> - error =3D do_truncate(idmap, path->dentry, length, 0, NULL);
> + error =3D do_truncate(idmap, path, length, 0, NULL);
>=20
> put_write_and_out:
> put_write_access(inode);
> @@ -157,7 +158,7 @@ COMPAT_SYSCALL_DEFINE2(truncate, const char __user *,=
 path, compat_off_t, length
> long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
> {
> struct inode *inode;
> - struct dentry *dentry;
> + struct path *path;
> struct fd f;
> int error;
>=20
> @@ -173,8 +174,8 @@ long do_sys_ftruncate(unsigned int fd, loff_t length,=
 int small)
> if (f.file->f_flags & O_LARGEFILE)
> small =3D 0;
>=20
> - dentry =3D f.file->f_path.dentry;
> - inode =3D dentry->d_inode;
> + path =3D &f.file->f_path;
> + inode =3D d_inode(path->dentry);
> error =3D -EINVAL;
> if (!S_ISREG(inode->i_mode) || !(f.file->f_mode & FMODE_WRITE))
> goto out_putf;
> @@ -191,7 +192,7 @@ long do_sys_ftruncate(unsigned int fd, loff_t length,=
 int small)
> sb_start_write(inode->i_sb);
> error =3D security_file_truncate(f.file);
> if (!error)
> - error =3D do_truncate(file_mnt_idmap(f.file), dentry, length,
> + error =3D do_truncate(file_mnt_idmap(f.file), path, length,
>    ATTR_MTIME | ATTR_CTIME, f.file);
> sb_end_write(inode->i_sb);
> out_putf:
> @@ -640,7 +641,7 @@ int chmod_common(const struct path *path, umode_t mod=
e)
> goto out_unlock;
> newattrs.ia_mode =3D (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
> newattrs.ia_valid =3D ATTR_MODE | ATTR_CTIME;
> - error =3D notify_change(mnt_idmap(path->mnt), path->dentry,
> + error =3D notify_change(mnt_idmap(path->mnt), path,
>      &newattrs, &delegated_inode);
> out_unlock:
> inode_unlock(inode);
> @@ -771,7 +772,7 @@ int chown_common(const struct path *path, uid_t user,=
 gid_t group)
> from_vfsuid(idmap, fs_userns, newattrs.ia_vfsuid),
> from_vfsgid(idmap, fs_userns, newattrs.ia_vfsgid));
> if (!error)
> - error =3D notify_change(idmap, path->dentry, &newattrs,
> + error =3D notify_change(idmap, path, &newattrs,
>      &delegated_inode);
> inode_unlock(inode);
> if (delegated_inode) {
> diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
> index 4d0b278f5630..d1a1eaa1c00c 100644
> --- a/fs/overlayfs/overlayfs.h
> +++ b/fs/overlayfs/overlayfs.h
> @@ -141,7 +141,9 @@ static inline int ovl_do_notify_change(struct ovl_fs =
*ofs,
>       struct dentry *upperdentry,
>       struct iattr *attr)
> {
> - return notify_change(ovl_upper_mnt_idmap(ofs), upperdentry, attr, NULL)=
;
> + struct path path =3D { .mnt =3D ovl_upper_mnt(ofs), .dentry =3D upperde=
ntry };
> +
> + return notify_change(ovl_upper_mnt_idmap(ofs), &path, attr, NULL);
> }
>=20
> static inline int ovl_do_rmdir(struct ovl_fs *ofs,
> diff --git a/fs/utimes.c b/fs/utimes.c
> index 3701b3946f88..1e6b82b27899 100644
> --- a/fs/utimes.c
> +++ b/fs/utimes.c
> @@ -63,7 +63,7 @@ int vfs_utimes(const struct path *path, struct timespec=
64 *times)
> }
> retry_deleg:
> inode_lock(inode);
> - error =3D notify_change(mnt_idmap(path->mnt), path->dentry, &newattrs,
> + error =3D notify_change(mnt_idmap(path->mnt), path, &newattrs,
>      &delegated_inode);
> inode_unlock(inode);
> if (delegated_inode) {
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index 21a981680856..dbba36ab4a1b 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -2333,7 +2333,7 @@ static inline bool is_idmapped_mnt(const struct vfs=
mount *mnt)
> }
>=20
> extern long vfs_truncate(const struct path *, loff_t);
> -int do_truncate(struct mnt_idmap *, struct dentry *, loff_t start,
> +int do_truncate(struct mnt_idmap *, const struct path *, loff_t start,
> unsigned int time_attrs, struct file *filp);
> extern int vfs_fallocate(struct file *file, int mode, loff_t offset,
> loff_t len);
> @@ -2488,7 +2488,7 @@ static inline int bmap(struct inode *inode,  sector=
_t *block)
> }
> #endif
>=20
> -int notify_change(struct mnt_idmap *, struct dentry *,
> +int notify_change(struct mnt_idmap *, const struct path *,
>  struct iattr *, struct inode **);
> int inode_permission(struct mnt_idmap *, struct inode *, int);
> int generic_permission(struct mnt_idmap *, struct inode *, int);
> --=20
> 2.17.1
>=20

--
Chuck Lever