1 files changed, 15 insertions, 2 deletions

diff --git a/include/linux/bio.h b/include/linux/bio.h
index da3a127c9958..f0291cf64cc5 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -290,7 +290,21 @@ static inline unsigned bio_segments(struct bio *bio)
  * returns. and then bio would be freed memory when if (bio->bi_flags ...)
  * runs
  */
-#define bio_get(bio)    atomic_inc(&(bio)->bi_cnt)
+static inline void bio_get(struct bio *bio)
+{
+        bio->bi_flags |= (1 << BIO_REFFED);
+        smp_mb__before_atomic();
+        atomic_inc(&bio->__bi_cnt);
+}
+
+static inline void bio_cnt_set(struct bio *bio, unsigned int count)
+{
+        if (count != 1) {
+                bio->bi_flags |= (1 << BIO_REFFED);
+                smp_mb__before_atomic();
+        }
+        atomic_set(&bio->__bi_cnt, count);
+}
 
 enum bip_flags {
         BIP_BLOCK_INTEGRITY     = 1 << 0, /* block layer owns integrity data */
@@ -413,7 +427,6 @@ static inline struct bio *bio_clone_kmalloc(struct bio *bio, gfp_t gfp_mask)
 }
 
 extern void bio_endio(struct bio *, int);
-extern void bio_endio_nodec(struct bio *, int);
 struct request_queue;
 extern int bio_phys_segments(struct request_queue *, struct bio *);