Fix irq flags.

dacut · Jun 16, 2016 · a4d6340 · a4d6340
1 parent d5fabae
commit a4d6340
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/c++-client/s3.cc b/c++-client/s3.cc
@@ -860,9 +860,9 @@ void UBDS3Volume::readBlock(
                                    ios_base::out | ios_base::app);
 
                 fp << std::this_thread::get_id()
-                   << " readBlock " << block_id << '\n';
+                   << " readBlock " << block_id << " (" << key << ")\n";
                 for (size_t i = 0; i < m_block_size; i += 16) {
-                    fp << setw(8) << setfill('0') << hex << i;
+                    fp << setw(8) << setfill('0') << hex << (i + m_block_size * block_id);
 
                     for (size_t j = i; j < i + 16; ++j) {
                         fp << ' ' << setw(2) << setfill('0') << hex
@@ -934,9 +934,9 @@ void UBDS3Volume::writeBlock(
         auto fp = ofstream("/tmp/ubds3.audit", ios_base::out | ios_base::app);
 
         fp << std::this_thread::get_id()
-           << " writeBlock " << block_id << '\n';
+           << " writeBlock " << block_id << " (" << key << ")\n";
         for (size_t i = 0; i < m_block_size; i += 16) {
-            fp << setw(8) << setfill('0') << hex << i;
+            fp << setw(8) << setfill('0') << hex << (i + m_block_size * block_id);
 
             for (size_t j = i; j < i + 16; ++j) {
                 fp << ' ' << setw(2) << setfill('0') << hex

diff --git a/kernel/ublkdev.c b/kernel/ublkdev.c
@@ -1218,7 +1218,7 @@ static long ubdctl_ioctl_putreply(
             dest = bvec_kmap_irq(ubd_bvptr(bvec), &bvec_irq_flags);
             src_len = ubd_bvptr(bvec)->bv_len;
             n_uncopied = copy_from_user(dest, src, src_len);
-            bvec_kunmap_irq(dest, &lock_flags);
+            bvec_kunmap_irq(dest, &bvec_irq_flags);
 
             if (n_uncopied > 0) {
                 ubd_warning("Failed to copy %ld bytes of %u total bytes from "