diff options
author | Dave Chinner <dchinner@redhat.com> | 2013-08-12 06:49:43 -0400 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2013-08-12 17:46:08 -0400 |
commit | c5c249b42464cbcda3ac5cbdc114f6a6d5b0b7ac (patch) | |
tree | 26870433ba4e8a002497260f94394391b00d782e /fs/xfs/xfs_attr_remote.c | |
parent | 6898811459ff523ed256c07d1d5c54ba915d51ac (diff) |
xfs: minor cleanups
These come from syncing the shared userspace and kernel code. Small
whitespace and trivial cleanups.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_attr_remote.c')
-rw-r--r-- | fs/xfs/xfs_attr_remote.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/xfs/xfs_attr_remote.c b/fs/xfs/xfs_attr_remote.c index 13a0ed9cb40a..b42926a5400d 100644 --- a/fs/xfs/xfs_attr_remote.c +++ b/fs/xfs/xfs_attr_remote.c | |||
@@ -251,7 +251,7 @@ xfs_attr_rmtval_copyout( | |||
251 | int hdr_size = 0; | 251 | int hdr_size = 0; |
252 | int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, XFS_LBSIZE(mp)); | 252 | int byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, XFS_LBSIZE(mp)); |
253 | 253 | ||
254 | byte_cnt = min_t(int, *valuelen, byte_cnt); | 254 | byte_cnt = min(*valuelen, byte_cnt); |
255 | 255 | ||
256 | if (xfs_sb_version_hascrc(&mp->m_sb)) { | 256 | if (xfs_sb_version_hascrc(&mp->m_sb)) { |
257 | if (!xfs_attr3_rmt_hdr_ok(mp, src, ino, *offset, | 257 | if (!xfs_attr3_rmt_hdr_ok(mp, src, ino, *offset, |
@@ -545,11 +545,6 @@ xfs_attr_rmtval_remove( | |||
545 | 545 | ||
546 | /* | 546 | /* |
547 | * Roll through the "value", invalidating the attribute value's blocks. | 547 | * Roll through the "value", invalidating the attribute value's blocks. |
548 | * Note that args->rmtblkcnt is the minimum number of data blocks we'll | ||
549 | * see for a CRC enabled remote attribute. Each extent will have a | ||
550 | * header, and so we may have more blocks than we realise here. If we | ||
551 | * fail to map the blocks correctly, we'll have problems with the buffer | ||
552 | * lookups. | ||
553 | */ | 548 | */ |
554 | lblkno = args->rmtblkno; | 549 | lblkno = args->rmtblkno; |
555 | blkcnt = args->rmtblkcnt; | 550 | blkcnt = args->rmtblkcnt; |
@@ -630,4 +625,3 @@ xfs_attr_rmtval_remove( | |||
630 | } | 625 | } |
631 | return(0); | 626 | return(0); |
632 | } | 627 | } |
633 | |||