On Thu 08-01-26 12:13:10, Jeff Layton wrote:
> Add the setlease file_operation to ocfs2_fops, ocfs2_dops,
> ocfs2_fops_no_plocks, and ocfs2_dops_no_plocks, pointing to
> generic_setlease. A future patch will change the default behavior to
> reject lease attempts with -EINVAL when there is no setlease file
> operation defined. Add generic_setlease to retain the ability to set
> leases on this filesystem.
>
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/ocfs2/file.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
> index 732c61599159ccb1f8fbcbb44e848f78678221d9..ed961a854983d5e7abe935e160e3029c48e6fca4 100644
> --- a/fs/ocfs2/file.c
> +++ b/fs/ocfs2/file.c
> @@ -19,6 +19,7 @@
> #include <linux/mount.h>
> #include <linux/writeback.h>
> #include <linux/falloc.h>
> +#include <linux/filelock.h>
> #include <linux/quotaops.h>
> #include <linux/blkdev.h>
> #include <linux/backing-dev.h>
> @@ -2823,6 +2824,7 @@ const struct file_operations ocfs2_fops = {
> .fallocate = ocfs2_fallocate,
> .remap_file_range = ocfs2_remap_file_range,
> .fop_flags = FOP_ASYNC_LOCK,
> + .setlease = generic_setlease,
> };
>
> WRAP_DIR_ITER(ocfs2_readdir) // FIXME!
> @@ -2840,6 +2842,7 @@ const struct file_operations ocfs2_dops = {
> .lock = ocfs2_lock,
> .flock = ocfs2_flock,
> .fop_flags = FOP_ASYNC_LOCK,
> + .setlease = generic_setlease,
> };
>
> /*
> @@ -2871,6 +2874,7 @@ const struct file_operations ocfs2_fops_no_plocks = {
> .splice_write = iter_file_splice_write,
> .fallocate = ocfs2_fallocate,
> .remap_file_range = ocfs2_remap_file_range,
> + .setlease = generic_setlease,
> };
>
> const struct file_operations ocfs2_dops_no_plocks = {
> @@ -2885,4 +2889,5 @@ const struct file_operations ocfs2_dops_no_plocks = {
> .compat_ioctl = ocfs2_compat_ioctl,
> #endif
> .flock = ocfs2_flock,
> + .setlease = generic_setlease,
> };
>
> --
> 2.52.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR