Pull ia64-clocksource into release branch
[pandora-kernel.git] / fs / udf / file.c
index df070be..67bf36b 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/udf_fs.h>
 #include <asm/uaccess.h>
 #include <linux/kernel.h>
-#include <linux/string.h> /* memset */
+#include <linux/string.h>      /* memset */
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/smp_lock.h>
@@ -41,7 +41,7 @@
 #include "udf_i.h"
 #include "udf_sb.h"
 
-static int udf_adinicb_readpage(struct file *file, struct page * page)
+static int udf_adinicb_readpage(struct file *file, struct page *page)
 {
        struct inode *inode = page->mapping->host;
        char *kaddr;
@@ -58,7 +58,8 @@ static int udf_adinicb_readpage(struct file *file, struct page * page)
        return 0;
 }
 
-static int udf_adinicb_writepage(struct page *page, struct writeback_control *wbc)
+static int udf_adinicb_writepage(struct page *page,
+                                struct writeback_control *wbc)
 {
        struct inode *inode = page->mapping->host;
        char *kaddr;
@@ -74,19 +75,21 @@ static int udf_adinicb_writepage(struct page *page, struct writeback_control *wb
        return 0;
 }
 
-static int udf_adinicb_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to)
+static int udf_adinicb_prepare_write(struct file *file, struct page *page,
+                                    unsigned offset, unsigned to)
 {
        kmap(page);
        return 0;
 }
 
-static int udf_adinicb_commit_write(struct file *file, struct page *page, unsigned offset, unsigned to)
+static int udf_adinicb_commit_write(struct file *file, struct page *page,
+                                   unsigned offset, unsigned to)
 {
        struct inode *inode = page->mapping->host;
        char *kaddr = page_address(page);
 
        memcpy(UDF_I_DATA(inode) + UDF_I_LENEATTR(inode) + offset,
-               kaddr + offset, to - offset);
+              kaddr + offset, to - offset);
        mark_inode_dirty(inode);
        SetPageUptodate(page);
        kunmap(page);
@@ -97,15 +100,15 @@ static int udf_adinicb_commit_write(struct file *file, struct page *page, unsign
 }
 
 const struct address_space_operations udf_adinicb_aops = {
-       .readpage               = udf_adinicb_readpage,
-       .writepage              = udf_adinicb_writepage,
-       .sync_page              = block_sync_page,
-       .prepare_write          = udf_adinicb_prepare_write,
-       .commit_write           = udf_adinicb_commit_write,
+       .readpage = udf_adinicb_readpage,
+       .writepage = udf_adinicb_writepage,
+       .sync_page = block_sync_page,
+       .prepare_write = udf_adinicb_prepare_write,
+       .commit_write = udf_adinicb_commit_write,
 };
 
 static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
-                             unsigned long nr_segs, loff_t ppos)
+                                 unsigned long nr_segs, loff_t ppos)
 {
        ssize_t retval;
        struct file *file = iocb->ki_filp;
@@ -113,25 +116,20 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
        int err, pos;
        size_t count = iocb->ki_left;
 
-       if (UDF_I_ALLOCTYPE(inode) == ICBTAG_FLAG_AD_IN_ICB)
-       {
+       if (UDF_I_ALLOCTYPE(inode) == ICBTAG_FLAG_AD_IN_ICB) {
                if (file->f_flags & O_APPEND)
                        pos = inode->i_size;
                else
                        pos = ppos;
 
-               if (inode->i_sb->s_blocksize < (udf_file_entry_alloc_offset(inode) +
-                       pos + count))
-               {
+               if (inode->i_sb->s_blocksize <
+                   (udf_file_entry_alloc_offset(inode) + pos + count)) {
                        udf_expand_file_adinicb(inode, pos + count, &err);
-                       if (UDF_I_ALLOCTYPE(inode) == ICBTAG_FLAG_AD_IN_ICB)
-                       {
+                       if (UDF_I_ALLOCTYPE(inode) == ICBTAG_FLAG_AD_IN_ICB) {
                                udf_debug("udf_expand_adinicb: err=%d\n", err);
                                return err;
                        }
-               }
-               else
-               {
+               } else {
                        if (pos + count > inode->i_size)
                                UDF_I_LENALLOC(inode) = pos + count;
                        else
@@ -181,48 +179,47 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
  *     Written, tested, and released.
  */
 int udf_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-       unsigned long arg)
+             unsigned long arg)
 {
        int result = -EINVAL;
 
-       if ( file_permission(filp, MAY_READ) != 0 )
-       {
-               udf_debug("no permission to access inode %lu\n",
-                                               inode->i_ino);
+       if (file_permission(filp, MAY_READ) != 0) {
+               udf_debug("no permission to access inode %lu\n", inode->i_ino);
                return -EPERM;
        }
 
-       if ( !arg )
-       {
+       if (!arg) {
                udf_debug("invalid argument to udf_ioctl\n");
                return -EINVAL;
        }
 
-       switch (cmd)
-       {
-               case UDF_GETVOLIDENT:
-                       return copy_to_user((char __user *)arg,
-                               UDF_SB_VOLIDENT(inode->i_sb), 32) ? -EFAULT : 0;
-               case UDF_RELOCATE_BLOCKS:
+       switch (cmd) {
+       case UDF_GETVOLIDENT:
+               return copy_to_user((char __user *)arg,
+                                   UDF_SB_VOLIDENT(inode->i_sb),
+                                   32) ? -EFAULT : 0;
+       case UDF_RELOCATE_BLOCKS:
                {
                        long old, new;
 
-                       if (!capable(CAP_SYS_ADMIN)) return -EACCES;
-                       if (get_user(old, (long __user *)arg)) return -EFAULT;
+                       if (!capable(CAP_SYS_ADMIN))
+                               return -EACCES;
+                       if (get_user(old, (long __user *)arg))
+                               return -EFAULT;
                        if ((result = udf_relocate_blocks(inode->i_sb,
-                                       old, &new)) == 0)
+                                                         old, &new)) == 0)
                                result = put_user(new, (long __user *)arg);
 
                        return result;
                }
-               case UDF_GETEASIZE:
-                       result = put_user(UDF_I_LENEATTR(inode), (int __user *)arg);
-                       break;
+       case UDF_GETEASIZE:
+               result = put_user(UDF_I_LENEATTR(inode), (int __user *)arg);
+               break;
 
-               case UDF_GETEABLOCK:
-                       result = copy_to_user((char __user *)arg, UDF_I_DATA(inode),
-                               UDF_I_LENEATTR(inode)) ? -EFAULT : 0;
-                       break;
+       case UDF_GETEABLOCK:
+               result = copy_to_user((char __user *)arg, UDF_I_DATA(inode),
+                                     UDF_I_LENEATTR(inode)) ? -EFAULT : 0;
+               break;
        }
 
        return result;
@@ -240,10 +237,9 @@ int udf_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
  * HISTORY
  *
  */
-static int udf_release_file(struct inode * inode, struct file * filp)
+static int udf_release_file(struct inode *inode, struct file *filp)
 {
-       if (filp->f_mode & FMODE_WRITE)
-       {
+       if (filp->f_mode & FMODE_WRITE) {
                lock_kernel();
                udf_discard_prealloc(inode);
                unlock_kernel();
@@ -252,18 +248,18 @@ static int udf_release_file(struct inode * inode, struct file * filp)
 }
 
 const struct file_operations udf_file_operations = {
-       .read                   = do_sync_read,
-       .aio_read               = generic_file_aio_read,
-       .ioctl                  = udf_ioctl,
-       .open                   = generic_file_open,
-       .mmap                   = generic_file_mmap,
-       .write                  = do_sync_write,
-       .aio_write              = udf_file_aio_write,
-       .release                = udf_release_file,
-       .fsync                  = udf_fsync_file,
-       .splice_read            = generic_file_splice_read,
+       .read = do_sync_read,
+       .aio_read = generic_file_aio_read,
+       .ioctl = udf_ioctl,
+       .open = generic_file_open,
+       .mmap = generic_file_mmap,
+       .write = do_sync_write,
+       .aio_write = udf_file_aio_write,
+       .release = udf_release_file,
+       .fsync = udf_fsync_file,
+       .splice_read = generic_file_splice_read,
 };
 
 const struct inode_operations udf_file_inode_operations = {
-       .truncate               = udf_truncate,
+       .truncate = udf_truncate,
 };