diff options
| -rw-r--r-- | block/blk.h | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 17 | ||||
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
3 files changed, 1 insertions, 28 deletions
diff --git a/block/blk.h b/block/blk.h index 231fb77ef910..7814aa207153 100644 --- a/block/blk.h +++ b/block/blk.h @@ -249,16 +249,6 @@ static inline unsigned int bio_allowed_max_sectors(struct request_queue *q) } /* - * The max size one bio can handle is UINT_MAX becasue bvec_iter.bi_size - * is defined as 'unsigned int', meantime it has to aligned to with logical - * block size which is the minimum accepted unit by hardware. - */ -static inline unsigned int bio_allowed_max_sectors(struct request_queue *q) -{ - return round_down(UINT_MAX, queue_logical_block_size(q)) >> 9; -} - -/* * Internal io_context interface */ void get_io_context(struct io_context *ioc); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index fab708e8adb0..f38130ff4bf8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2829,23 +2829,6 @@ static void fixup_active_planes(struct intel_crtc_state *crtc_state) crtc_state->active_planes |= BIT(to_intel_plane(plane)->id); } -static void fixup_active_planes(struct intel_crtc_state *crtc_state) -{ - struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); - struct drm_plane *plane; - - /* - * Active_planes aliases if multiple "primary" or cursor planes - * have been used on the same (or wrong) pipe. plane_mask uses - * unique ids, hence we can use that to reconstruct active_planes. - */ - crtc_state->active_planes = 0; - - drm_for_each_plane_mask(plane, &dev_priv->drm, - crtc_state->base.plane_mask) - crtc_state->active_planes |= BIT(to_intel_plane(plane)->id); -} - static void intel_plane_disable_noatomic(struct intel_crtc *crtc, struct intel_plane *plane) { diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 6442c330f588..e62a381fc32f 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3901,7 +3901,7 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src, * if the file size is not blocksize aligned. So we don't need to check * for that case here. */ - if (off + len == src->i_size) + if (off + len == src->i_size) { len = ALIGN(src->i_size, bs) - off; } |