The definition in the implementation of nfs4_proc_setlease was originally changed without updating the definition in the header file.
Fixes: ("fs: Pass argument to fcntl_setlease as int") Signed-off-by: Luca Vizzarro Luca.Vizzarro@arm.com ---
Sending in a fix for a bug that was merged and was undetected by the build script and the CI. Credit goes to Beata for detecting this.
Luca
fs/nfs/nfs4_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index cfef738d765e..0f9bb0f2f6c5 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -326,7 +326,7 @@ extern int update_open_stateid(struct nfs4_state *state, const nfs4_stateid *open_stateid, const nfs4_stateid *deleg_stateid, fmode_t fmode); -extern int nfs4_proc_setlease(struct file *file, long arg, +extern int nfs4_proc_setlease(struct file *file, int arg, struct file_lock **lease, void **priv); extern int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo);
The commit is available at:
https://git.morello-project.org/Sevenarth/linux/-/commits/morello/fix-nfs4-f...
Best, Luca
On 01/03/2023 13:49, Luca Vizzarro wrote:
The definition in the implementation of nfs4_proc_setlease was originally changed without updating the definition in the header file.
Fixes: ("fs: Pass argument to fcntl_setlease as int") Signed-off-by: Luca Vizzarro Luca.Vizzarro@arm.com
Sending in a fix for a bug that was merged and was undetected by the build script and the CI. Credit goes to Beata for detecting this.
Luca
fs/nfs/nfs4_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index cfef738d765e..0f9bb0f2f6c5 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -326,7 +326,7 @@ extern int update_open_stateid(struct nfs4_state *state, const nfs4_stateid *open_stateid, const nfs4_stateid *deleg_stateid, fmode_t fmode); -extern int nfs4_proc_setlease(struct file *file, long arg, +extern int nfs4_proc_setlease(struct file *file, int arg, struct file_lock **lease, void **priv); extern int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo);
On 01/03/2023 14:49, Luca Vizzarro wrote:
The definition in the implementation of nfs4_proc_setlease was originally changed without updating the definition in the header file.
Fixes: ("fs: Pass argument to fcntl_setlease as int") Signed-off-by: Luca Vizzarro Luca.Vizzarro@arm.com
Sending in a fix for a bug that was merged and was undetected by the build script and the CI. Credit goes to Beata for detecting this.
Thanks both! That looks straightforward enough, applied on next.
Kevin
Luca
fs/nfs/nfs4_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index cfef738d765e..0f9bb0f2f6c5 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -326,7 +326,7 @@ extern int update_open_stateid(struct nfs4_state *state, const nfs4_stateid *open_stateid, const nfs4_stateid *deleg_stateid, fmode_t fmode); -extern int nfs4_proc_setlease(struct file *file, long arg, +extern int nfs4_proc_setlease(struct file *file, int arg, struct file_lock **lease, void **priv); extern int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo);
On Wed, Mar 01, 2023 at 01:49:58PM +0000, Luca Vizzarro wrote:
The definition in the implementation of nfs4_proc_setlease was originally changed without updating the definition in the header file.
I could only suggest changing the 'definition' to prototype in the header file. Otherwise - thanks for the fix. Though it seems I might be too late as it has already been merged ?
---BR B.
Fixes: ("fs: Pass argument to fcntl_setlease as int") Signed-off-by: Luca Vizzarro Luca.Vizzarro@arm.com
Sending in a fix for a bug that was merged and was undetected by the build script and the CI. Credit goes to Beata for detecting this.
Luca
fs/nfs/nfs4_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index cfef738d765e..0f9bb0f2f6c5 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -326,7 +326,7 @@ extern int update_open_stateid(struct nfs4_state *state, const nfs4_stateid *open_stateid, const nfs4_stateid *deleg_stateid, fmode_t fmode); -extern int nfs4_proc_setlease(struct file *file, long arg, +extern int nfs4_proc_setlease(struct file *file, int arg, struct file_lock **lease, void **priv); extern int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo); -- 2.34.1
linux-morello mailing list -- linux-morello@op-lists.linaro.org To unsubscribe send an email to linux-morello-leave@op-lists.linaro.org
On 01/03/2023 15:09, Beata Michalska wrote:
On Wed, Mar 01, 2023 at 01:49:58PM +0000, Luca Vizzarro wrote:
The definition in the implementation of nfs4_proc_setlease was originally changed without updating the definition in the header file.
I could only suggest changing the 'definition' to prototype in the header file. Otherwise - thanks for the fix. Though it seems I might be too late as it has already been merged ?
Sorry you're right, I missed that. Given it's already merged I think it's alright to leave it this way, to avoid force-pushing next.
Kevin
On Wed, Mar 01, 2023 at 05:05:14PM +0100, Kevin Brodsky wrote:
On 01/03/2023 15:09, Beata Michalska wrote:
On Wed, Mar 01, 2023 at 01:49:58PM +0000, Luca Vizzarro wrote:
The definition in the implementation of nfs4_proc_setlease was originally changed without updating the definition in the header file.
I could only suggest changing the 'definition' to prototype in the header file. Otherwise - thanks for the fix. Though it seems I might be too late as it has already been merged ?
Sorry you're right, I missed that. Given it's already merged I think it's alright to leave it this way, to avoid force-pushing next.
It's very minor so avoiding force-push seems like a good call.
--- BR. B
Kevin
linux-morello@op-lists.linaro.org
-
Beata Michalska -
Kevin Brodsky -
Luca Vizzarro