projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix copy_tree() regression
[firefly-linux-kernel-4.4.55.git]
/
fs
/
xfs
/
xfs_buf.c
diff --git
a/fs/xfs/xfs_buf.c
b/fs/xfs/xfs_buf.c
index cb10a0aaab3aa7b55f9a6735cf70500d509843f3..7a34a1ae655246e6e07fb0b71fabb3bac4c1b6c2 100644
(file)
--- a/
fs/xfs/xfs_buf.c
+++ b/
fs/xfs/xfs_buf.c
@@
-216,8
+216,7
@@
_xfs_buf_alloc(
STATIC int
_xfs_buf_get_pages(
xfs_buf_t *bp,
STATIC int
_xfs_buf_get_pages(
xfs_buf_t *bp,
- int page_count,
- xfs_buf_flags_t flags)
+ int page_count)
{
/* Make sure that we have a page list */
if (bp->b_pages == NULL) {
{
/* Make sure that we have a page list */
if (bp->b_pages == NULL) {
@@
-330,7
+329,7
@@
use_alloc_page:
end = (BBTOB(bp->b_maps[0].bm_bn + bp->b_length) + PAGE_SIZE - 1)
>> PAGE_SHIFT;
page_count = end - start;
end = (BBTOB(bp->b_maps[0].bm_bn + bp->b_length) + PAGE_SIZE - 1)
>> PAGE_SHIFT;
page_count = end - start;
- error = _xfs_buf_get_pages(bp, page_count
, flags
);
+ error = _xfs_buf_get_pages(bp, page_count);
if (unlikely(error))
return error;
if (unlikely(error))
return error;
@@
-778,7
+777,7
@@
xfs_buf_associate_memory(
bp->b_pages = NULL;
bp->b_addr = mem;
bp->b_pages = NULL;
bp->b_addr = mem;
- rval = _xfs_buf_get_pages(bp, page_count
, 0
);
+ rval = _xfs_buf_get_pages(bp, page_count);
if (rval)
return rval;
if (rval)
return rval;
@@
-811,7
+810,7
@@
xfs_buf_get_uncached(
goto fail;
page_count = PAGE_ALIGN(numblks << BBSHIFT) >> PAGE_SHIFT;
goto fail;
page_count = PAGE_ALIGN(numblks << BBSHIFT) >> PAGE_SHIFT;
- error = _xfs_buf_get_pages(bp, page_count
, 0
);
+ error = _xfs_buf_get_pages(bp, page_count);
if (error)
goto fail_free_buf;
if (error)
goto fail_free_buf;
@@
-1615,7
+1614,6
@@
xfs_free_buftarg(
int
xfs_setsize_buftarg(
xfs_buftarg_t *btp,
int
xfs_setsize_buftarg(
xfs_buftarg_t *btp,
- unsigned int blocksize,
unsigned int sectorsize)
{
/* Set up metadata sector size info */
unsigned int sectorsize)
{
/* Set up metadata sector size info */
@@
-1650,16
+1648,13
@@
xfs_setsize_buftarg_early(
xfs_buftarg_t *btp,
struct block_device *bdev)
{
xfs_buftarg_t *btp,
struct block_device *bdev)
{
- return xfs_setsize_buftarg(btp, PAGE_SIZE,
- bdev_logical_block_size(bdev));
+ return xfs_setsize_buftarg(btp, bdev_logical_block_size(bdev));
}
xfs_buftarg_t *
xfs_alloc_buftarg(
struct xfs_mount *mp,
}
xfs_buftarg_t *
xfs_alloc_buftarg(
struct xfs_mount *mp,
- struct block_device *bdev,
- int external,
- const char *fsname)
+ struct block_device *bdev)
{
xfs_buftarg_t *btp;
{
xfs_buftarg_t *btp;