Merge branch 'master' into for-next

[mv-sheeva.git] / drivers / staging / pohmelfs / inode.c

diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
index fe8b093fb616871ae63e6aef30c5337227ce524c..e3f95f75975790fb92a1ee5f879d7475a61b0b73 100644 (file)
--- a/drivers/staging/pohmelfs/inode.c
+++ b/drivers/staging/pohmelfs/inode.c
@@ -29,7 +29,6 @@
 #include <linux/slab.h>
 #include <linux/statfs.h>
 #include <linux/writeback.h>
-#include <linux/quotaops.h>
 
 #include "netfs.h"
 
@@ -685,7 +684,7 @@ static int pohmelfs_readpages_trans_complete(struct page **__pages, unsigned int
                goto err_out_free;
        }
 
-       for (i=0; i<num; ++i) {
+       for (i = 0; i < num; ++i) {
                page = pages[i];
 
                if (err)
@@ -880,7 +879,7 @@ static struct inode *pohmelfs_alloc_inode(struct super_block *sb)
 /*
  * We want fsync() to work on POHMELFS.
  */
-static int pohmelfs_fsync(struct file *file, struct dentry *dentry, int datasync)
+static int pohmelfs_fsync(struct file *file, int datasync)
 {
        struct inode *inode = file->f_mapping->host;
        struct writeback_control wbc = {
@@ -969,13 +968,6 @@ int pohmelfs_setattr_raw(struct inode *inode, struct iattr *attr)
                goto err_out_exit;
        }
 
-       if ((attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
-           (attr->ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
-               err = dquot_transfer(inode, attr);
-               if (err)
-                       goto err_out_exit;
-       }
-
        err = inode_setattr(inode, attr);
        if (err) {
                dprintk("%s: ino: %llu, failed to set the attributes.\n", __func__, POHMELFS_I(inode)->ino);
@@ -1431,35 +1423,35 @@ static int pohmelfs_parse_options(char *options, struct pohmelfs_sb *psb, int re
                        continue;
 
                switch (token) {
-                       case pohmelfs_opt_idx:
-                               psb->idx = option;
-                               break;
-                       case pohmelfs_opt_trans_scan_timeout:
-                               psb->trans_scan_timeout = msecs_to_jiffies(option);
-                               break;
-                       case pohmelfs_opt_drop_scan_timeout:
-                               psb->drop_scan_timeout = msecs_to_jiffies(option);
-                               break;
-                       case pohmelfs_opt_wait_on_page_timeout:
-                               psb->wait_on_page_timeout = msecs_to_jiffies(option);
-                               break;
-                       case pohmelfs_opt_mcache_timeout:
-                               psb->mcache_timeout = msecs_to_jiffies(option);
-                               break;
-                       case pohmelfs_opt_trans_retries:
-                               psb->trans_retries = option;
-                               break;
-                       case pohmelfs_opt_crypto_thread_num:
-                               psb->crypto_thread_num = option;
-                               break;
-                       case pohmelfs_opt_trans_max_pages:
-                               psb->trans_max_pages = option;
-                               break;
-                       case pohmelfs_opt_crypto_fail_unsupported:
-                               psb->crypto_fail_unsupported = 1;
-                               break;
-                       default:
-                               return -EINVAL;
+               case pohmelfs_opt_idx:
+                       psb->idx = option;
+                       break;
+               case pohmelfs_opt_trans_scan_timeout:
+                       psb->trans_scan_timeout = msecs_to_jiffies(option);
+                       break;
+               case pohmelfs_opt_drop_scan_timeout:
+                       psb->drop_scan_timeout = msecs_to_jiffies(option);
+                       break;
+               case pohmelfs_opt_wait_on_page_timeout:
+                       psb->wait_on_page_timeout = msecs_to_jiffies(option);
+                       break;
+               case pohmelfs_opt_mcache_timeout:
+                       psb->mcache_timeout = msecs_to_jiffies(option);
+                       break;
+               case pohmelfs_opt_trans_retries:
+                       psb->trans_retries = option;
+                       break;
+               case pohmelfs_opt_crypto_thread_num:
+                       psb->crypto_thread_num = option;
+                       break;
+               case pohmelfs_opt_trans_max_pages:
+                       psb->trans_max_pages = option;
+                       break;
+               case pohmelfs_opt_crypto_fail_unsupported:
+                       psb->crypto_fail_unsupported = 1;
+                       break;
+               default:
+                       return -EINVAL;
                }
        }
 
@@ -1777,7 +1769,7 @@ static int pohmelfs_show_stats(struct seq_file *m, struct vfsmount *mnt)
                        seq_printf(m, "%pi6:%u", &sin->sin6_addr, ntohs(sin->sin6_port));
                } else {
                        unsigned int i;
-                       for (i=0; i<ctl->addrlen; ++i)
+                       for (i = 0; i < ctl->addrlen; ++i)
                                seq_printf(m, "%02x.", ctl->addr.addr[i]);
                }
 
@@ -2035,7 +2027,7 @@ err_out_exit:
 
 static void __exit exit_pohmel_fs(void)
 {
-        unregister_filesystem(&pohmel_fs_type);
+       unregister_filesystem(&pohmel_fs_type);
        pohmelfs_destroy_inodecache();
        pohmelfs_mcache_exit();
        pohmelfs_config_exit();