Skip to content

Commit

Permalink
Merge pull request dorimanx#45 from ava1ar/master
Browse files Browse the repository at this point in the history
Fixed compilation issues for kernel 3.15
  • Loading branch information
dorimanx committed Jun 13, 2014
2 parents 5b5dcd1 + cda06f6 commit 16cd471
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions exfat_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ static int exfat_write_end(struct file *file, struct address_space *mapping,
return err;
}

#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
static ssize_t exfat_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
loff_t offset)
#else
Expand All @@ -1586,7 +1586,7 @@ static ssize_t exfat_direct_IO(int rw, struct kiocb *iocb,
ssize_t ret;

if (rw == WRITE) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
if (EXFAT_I(inode)->mmu_private < (offset + iov_iter_count(iter)))
#else
#ifdef CONFIG_AIO_OPTIMIZATION
Expand All @@ -1599,7 +1599,7 @@ static ssize_t exfat_direct_IO(int rw, struct kiocb *iocb,
return 0;
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,00)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
ret = blockdev_direct_IO(rw, iocb, inode, iter,
offset, exfat_get_block);
#else
Expand All @@ -1618,7 +1618,7 @@ static ssize_t exfat_direct_IO(int rw, struct kiocb *iocb,

#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,34)
if ((ret < 0) && (rw & WRITE))
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
exfat_write_failed(mapping, offset+iov_iter_count(iter));
#else
#ifdef CONFIG_AIO_OPTIMIZATION
Expand Down

0 comments on commit 16cd471

Please sign in to comment.