Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / fs / udf / inode.c

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 287ef9f587b7eac3f731ddc47995d51b74577d33..cbae1ed0b7c17dcb966f7d43ca823fa0dcb357bf 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -95,11 +95,33 @@ void udf_evict_inode(struct inode *inode)
        }
 }
 
+static void udf_write_failed(struct address_space *mapping, loff_t to)
+{
+       struct inode *inode = mapping->host;
+       struct udf_inode_info *iinfo = UDF_I(inode);
+       loff_t isize = inode->i_size;
+
+       if (to > isize) {
+               truncate_pagecache(inode, to, isize);
+               if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) {
+                       down_write(&iinfo->i_data_sem);
+                       udf_truncate_extents(inode);
+                       up_write(&iinfo->i_data_sem);
+               }
+       }
+}
+
 static int udf_writepage(struct page *page, struct writeback_control *wbc)
 {
        return block_write_full_page(page, udf_get_block, wbc);
 }
 
+static int udf_writepages(struct address_space *mapping,
+                       struct writeback_control *wbc)
+{
+       return mpage_writepages(mapping, wbc, udf_get_block);
+}
+
 static int udf_readpage(struct file *file, struct page *page)
 {
        return mpage_readpage(page, udf_get_block);
@@ -118,21 +140,24 @@ static int udf_write_begin(struct file *file, struct address_space *mapping,
        int ret;
 
        ret = block_write_begin(mapping, pos, len, flags, pagep, udf_get_block);
-       if (unlikely(ret)) {
-               struct inode *inode = mapping->host;
-               struct udf_inode_info *iinfo = UDF_I(inode);
-               loff_t isize = inode->i_size;
-
-               if (pos + len > isize) {
-                       truncate_pagecache(inode, pos + len, isize);
-                       if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) {
-                               down_write(&iinfo->i_data_sem);
-                               udf_truncate_extents(inode);
-                               up_write(&iinfo->i_data_sem);
-                       }
-               }
-       }
+       if (unlikely(ret))
+               udf_write_failed(mapping, pos + len);
+       return ret;
+}
 
+static ssize_t udf_direct_IO(int rw, struct kiocb *iocb,
+                            const struct iovec *iov,
+                            loff_t offset, unsigned long nr_segs)
+{
+       struct file *file = iocb->ki_filp;
+       struct address_space *mapping = file->f_mapping;
+       struct inode *inode = mapping->host;
+       ssize_t ret;
+
+       ret = blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs,
+                                 udf_get_block);
+       if (unlikely(ret < 0 && (rw & WRITE)))
+               udf_write_failed(mapping, offset + iov_length(iov, nr_segs));
        return ret;
 }
 
@@ -145,8 +170,10 @@ const struct address_space_operations udf_aops = {
        .readpage       = udf_readpage,
        .readpages      = udf_readpages,
        .writepage      = udf_writepage,
-       .write_begin            = udf_write_begin,
-       .write_end              = generic_write_end,
+       .writepages     = udf_writepages,
+       .write_begin    = udf_write_begin,
+       .write_end      = generic_write_end,
+       .direct_IO      = udf_direct_IO,
        .bmap           = udf_bmap,
 };
 
@@ -560,7 +587,6 @@ out:
 static sector_t inode_getblk(struct inode *inode, sector_t block,
                             int *err, int *new)
 {
-       static sector_t last_block;
        struct kernel_long_ad laarr[EXTENT_MERGE_SIZE];
        struct extent_position prev_epos, cur_epos, next_epos;
        int count = 0, startnum = 0, endnum = 0;
@@ -574,6 +600,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
        struct udf_inode_info *iinfo = UDF_I(inode);
        int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
        int lastblock = 0;
+       bool isBeyondEOF;
 
        *err = 0;
        *new = 0;
@@ -649,11 +676,10 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
                return newblock;
        }
 
-       last_block = block;
        /* Are we beyond EOF? */
        if (etype == -1) {
                int ret;
-
+               isBeyondEOF = 1;
                if (count) {
                        if (c)
                                laarr[0] = laarr[1];
@@ -691,11 +717,11 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
                        memset(&laarr[c].extLocation, 0x00,
                                sizeof(struct kernel_lb_addr));
                        count++;
-                       endnum++;
                }
                endnum = c + 1;
                lastblock = 1;
        } else {
+               isBeyondEOF = 0;
                endnum = startnum = ((count > 2) ? 2 : count);
 
                /* if the current extent is in position 0,
@@ -738,10 +764,13 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
                                goal, err);
                if (!newblocknum) {
                        brelse(prev_epos.bh);
+                       brelse(cur_epos.bh);
+                       brelse(next_epos.bh);
                        *err = -ENOSPC;
                        return 0;
                }
-               iinfo->i_lenExtents += inode->i_sb->s_blocksize;
+               if (isBeyondEOF)
+                       iinfo->i_lenExtents += inode->i_sb->s_blocksize;
        }
 
        /* if the extent the requsted block is located in contains multiple
@@ -768,6 +797,8 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
        udf_update_extents(inode, laarr, startnum, endnum, &prev_epos);
 
        brelse(prev_epos.bh);
+       brelse(cur_epos.bh);
+       brelse(next_epos.bh);
 
        newblock = udf_get_pblock(inode->i_sb, newblocknum,
                                iinfo->i_location.partitionReferenceNum, 0);