On 5/10/19 11:44 AM, Brian Foster wrote:
> On Fri, May 10, 2019 at 11:36:46AM -0500, Eric Sandeen wrote:
>> The flags value is always passed as 0 so remove the argument.
>>
>> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
>> ---
>>
> ...
>> diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
>> index 6b2bfe8..fd0eb81 100644
>> --- a/fs/xfs/xfs_mount.c
>> +++ b/fs/xfs/xfs_mount.c
>> @@ -1385,23 +1385,15 @@ xfs_mod_frextents(
>> * xfs_getsb() is called to obtain the buffer for the superblock.
>> * The buffer is returned locked and read in from disk.
>> * The buffer should be released with a call to xfs_brelse().
>> - *
>> - * If the flags parameter is BUF_TRYLOCK, then we'll only return
>> - * the superblock buffer if it can be locked without sleeping.
>> - * If it can't then we'll return NULL.
>> */
>> struct xfs_buf *
>> xfs_getsb(
>> - struct xfs_mount *mp,
>> - int flags)
>> + struct xfs_mount *mp)
>> {
>> struct xfs_buf *bp = mp->m_sb_bp;
>>
>> - if (!xfs_buf_trylock(bp)) {
>> - if (flags & XBF_TRYLOCK)
>> - return NULL;
>> + if (!xfs_buf_trylock(bp))
>> xfs_buf_lock(bp);
>
> Any reason to not just drop the trylock now? Looks fine either way:
>
> Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
oh good point, I'll send V2, and take your "either way" as
"you can keep my rvb" :)
>> - }
>>
>> xfs_buf_hold(bp);
>> ASSERT(bp->b_flags & XBF_DONE);
>> diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
>> index c81a5cd..11073b4 100644
>> --- a/fs/xfs/xfs_mount.h
>> +++ b/fs/xfs/xfs_mount.h
>> @@ -465,7 +465,7 @@ extern int xfs_mod_fdblocks(struct xfs_mount *mp, int64_t delta,
>> bool reserved);
>> extern int xfs_mod_frextents(struct xfs_mount *mp, int64_t delta);
>>
>> -extern struct xfs_buf *xfs_getsb(xfs_mount_t *, int);
>> +extern struct xfs_buf *xfs_getsb(xfs_mount_t *);
>> extern int xfs_readsb(xfs_mount_t *, int);
>> extern void xfs_freesb(xfs_mount_t *);
>> extern bool xfs_fs_writable(struct xfs_mount *mp, int level);
>> diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
>> index 912b42f..0746b32 100644
>> --- a/fs/xfs/xfs_trans.c
>> +++ b/fs/xfs/xfs_trans.c
>> @@ -452,7 +452,7 @@ xfs_trans_apply_sb_deltas(
>> xfs_buf_t *bp;
>> int whole = 0;
>>
>> - bp = xfs_trans_getsb(tp, tp->t_mountp, 0);
>> + bp = xfs_trans_getsb(tp, tp->t_mountp);
>> sbp = XFS_BUF_TO_SBP(bp);
>>
>> /*
>> diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
>> index c6e1c57..fd35da1 100644
>> --- a/fs/xfs/xfs_trans.h
>> +++ b/fs/xfs/xfs_trans.h
>> @@ -203,7 +203,7 @@ xfs_trans_read_buf(
>> flags, bpp, ops);
>> }
>>
>> -struct xfs_buf *xfs_trans_getsb(xfs_trans_t *, struct xfs_mount *, int);
>> +struct xfs_buf *xfs_trans_getsb(xfs_trans_t *, struct xfs_mount *);
>>
>> void xfs_trans_brelse(xfs_trans_t *, struct xfs_buf *);
>> void xfs_trans_bjoin(xfs_trans_t *, struct xfs_buf *);
>> diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
>> index 7d65ebf..a1764a1 100644
>> --- a/fs/xfs/xfs_trans_buf.c
>> +++ b/fs/xfs/xfs_trans_buf.c
>> @@ -174,8 +174,7 @@ xfs_trans_get_buf_map(
>> xfs_buf_t *
>> xfs_trans_getsb(
>> xfs_trans_t *tp,
>> - struct xfs_mount *mp,
>> - int flags)
>> + struct xfs_mount *mp)
>> {
>> xfs_buf_t *bp;
>> struct xfs_buf_log_item *bip;
>> @@ -185,7 +184,7 @@ xfs_trans_getsb(
>> * if tp is NULL.
>> */
>> if (tp == NULL)
>> - return xfs_getsb(mp, flags);
>> + return xfs_getsb(mp);
>>
>> /*
>> * If the superblock buffer already has this transaction
>> @@ -203,7 +202,7 @@ xfs_trans_getsb(
>> return bp;
>> }
>>
>> - bp = xfs_getsb(mp, flags);
>> + bp = xfs_getsb(mp);
>> if (bp == NULL)
>> return NULL;
>>
>>
