[PATCH] ceph: remove dead code in ceph_sync_write

[PATCH] ceph: remove dead code in ceph_sync_write

[Jeff Layton]

We've already checked these flags near the top of the function and
bailed out if either were set.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/ceph/file.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index d1755ac1d964..f55ca2c4c7de 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1834,12 +1834,8 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
 		goto retry_snap;
 	}
 
-	if (written >= 0) {
-		if ((map_flags & CEPH_OSDMAP_NEARFULL) ||
-		    (pool_flags & CEPH_POOL_FLAG_NEARFULL))
-			iocb->ki_flags |= IOCB_DSYNC;
+	if (written >= 0)
 		written = generic_write_sync(iocb, written);
-	}
 
 	goto out_unlocked;
 out:
-- 
2.31.1

Re: [PATCH] ceph: remove dead code in ceph_sync_write

[Luis Henriques]

Jeff Layton <jlayton@kernel.org> writes:

> We've already checked these flags near the top of the function and
> bailed out if either were set.

The flags being checked at the top of the function are CEPH_OSDMAP_FULL
and CEPH_POOL_FLAG_FULL; here we're checking the *_NEARFULL flags.
Right?  (I had to look a few times to make sure my eyes were not lying.)

Cheers,
-- 
Luis


>
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
>  fs/ceph/file.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index d1755ac1d964..f55ca2c4c7de 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -1834,12 +1834,8 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
>  		goto retry_snap;
>  	}
>  
> -	if (written >= 0) {
> -		if ((map_flags & CEPH_OSDMAP_NEARFULL) ||
> -		    (pool_flags & CEPH_POOL_FLAG_NEARFULL))
> -			iocb->ki_flags |= IOCB_DSYNC;
> +	if (written >= 0)
>  		written = generic_write_sync(iocb, written);
> -	}
>  
>  	goto out_unlocked;
>  out:
> -- 
>
> 2.31.1
>

Re: [PATCH] ceph: remove dead code in ceph_sync_write

[Jeff Layton]

On Wed, 2021-08-11 at 15:37 +0100, Luis Henriques wrote:
> Jeff Layton <jlayton@kernel.org> writes:
> 
> > We've already checked these flags near the top of the function and
> > bailed out if either were set.
> 
> The flags being checked at the top of the function are CEPH_OSDMAP_FULL
> and CEPH_POOL_FLAG_FULL; here we're checking the *_NEARFULL flags.
> Right?  (I had to look a few times to make sure my eyes were not lying.)
> 
> Cheers,

Oof. You're totally right. Dropping this patch!

Thanks,
-- 
Jeff Layton <jlayton@kernel.org>

Re: [PATCH] ceph: remove dead code in ceph_sync_write

[Ilya Dryomov]

On Wed, Aug 11, 2021 at 4:44 PM Jeff Layton <jlayton@kernel.org> wrote:
>
> On Wed, 2021-08-11 at 15:37 +0100, Luis Henriques wrote:
> > Jeff Layton <jlayton@kernel.org> writes:
> >
> > > We've already checked these flags near the top of the function and
> > > bailed out if either were set.
> >
> > The flags being checked at the top of the function are CEPH_OSDMAP_FULL
> > and CEPH_POOL_FLAG_FULL; here we're checking the *_NEARFULL flags.
> > Right?  (I had to look a few times to make sure my eyes were not lying.)
> >
> > Cheers,
>
> Oof. You're totally right. Dropping this patch!

But it would have made https://github.com/ceph/ceph/pull/42749
unfounded! ;)

Thanks,

                Ilya