diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2021-06-08 09:22:34 -0700 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2021-06-08 09:22:34 -0700 |
| commit | 8b943d21d40d5d7f8306e833b156f8d11094470f (patch) | |
| tree | 02417dc80e38042ff9e4fc0b35c2a5c1ab70c427 /fs/xfs/libxfs/xfs_bmap.c | |
| parent | f52edf6c54d94987e6bc1541d0fdea2f12e68064 (diff) | |
| parent | 977ec4ddf0b75b30afa443cf71ae80e20f501b15 (diff) | |
| download | linux-8b943d21d40d5d7f8306e833b156f8d11094470f.tar.gz linux-8b943d21d40d5d7f8306e833b156f8d11094470f.tar.bz2 linux-8b943d21d40d5d7f8306e833b156f8d11094470f.zip | |
Merge tag 'assorted-fixes-5.14-1_2021-06-03' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux into xfs-5.14-merge2
xfs: assorted fixes for 5.14, part 1
This branch contains the first round of various small fixes for 5.14.
* tag 'assorted-fixes-5.14-1_2021-06-03' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux:
xfs: don't take a spinlock unconditionally in the DIO fastpath
xfs: mark xfs_bmap_set_attrforkoff static
xfs: Remove redundant assignment to busy
xfs: sort variable alphabetically to avoid repeated declaration
Diffstat (limited to 'fs/xfs/libxfs/xfs_bmap.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 7ae826cfe5a5..948092babb6a 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -1029,7 +1029,7 @@ xfs_bmap_add_attrfork_local( /* * Set an inode attr fork offset based on the format of the data fork. */ -int +static int xfs_bmap_set_attrforkoff( struct xfs_inode *ip, int size, |