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
mm/migrate: correct failure handling if !hugepage_migration_support()
[firefly-linux-kernel-4.4.55.git]
/
fs
/
block_dev.c
diff --git
a/fs/block_dev.c
b/fs/block_dev.c
index 1173a4ee0830a41fd39d1546921af239645d9507..1e86823a9cbda37f8451269d91a50f90d00c9566 100644
(file)
--- a/
fs/block_dev.c
+++ b/
fs/block_dev.c
@@
-592,7
+592,7
@@
static struct block_device *bd_acquire(struct inode *inode)
return bdev;
}
return bdev;
}
-
static inline
int sb_is_blkdev_sb(struct super_block *sb)
+int sb_is_blkdev_sb(struct super_block *sb)
{
return sb == blockdev_superblock;
}
{
return sb == blockdev_superblock;
}
@@
-1542,7
+1542,7
@@
static ssize_t blkdev_aio_read(struct kiocb *iocb, const struct iovec *iov,
return 0;
size -= pos;
return 0;
size -= pos;
- if (size < iocb->ki_
left
)
+ if (size < iocb->ki_
nbytes
)
nr_segs = iov_shorten((struct iovec *)iov, nr_segs, size);
return generic_file_aio_read(iocb, iov, nr_segs, pos);
}
nr_segs = iov_shorten((struct iovec *)iov, nr_segs, size);
return generic_file_aio_read(iocb, iov, nr_segs, pos);
}