12 files changed, 76 insertions, 46 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 58a0650293e1..f9eed6d79066 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -441,9 +441,6 @@ config OCFS2_FS
 
           Note: Features which OCFS2 does not support yet:
                   - extended attributes
-                  - shared writeable mmap
-                  - loopback is supported, but data written will not
-                    be cluster coherent.
                   - quotas
                   - cluster aware flock
                   - Directory change notification (F_NOTIFY)
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index a3684dcc76e7..6f8c96fb29eb 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -235,8 +235,8 @@ static void *afs_mntpt_follow_link(struct dentry *dentry, struct nameidata *nd)
         err = do_add_mount(newmnt, nd, MNT_SHRINKABLE, &afs_vfsmounts);
         switch (err) {
         case 0:
-                mntput(nd->mnt);
                 dput(nd->dentry);
+                mntput(nd->mnt);
                 nd->mnt = newmnt;
                 nd->dentry = dget(newmnt->mnt_root);
                 schedule_delayed_work(&afs_mntpt_expiry_timer,
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 22cfdd61c060..9537316a0714 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2578,8 +2578,11 @@ static int ext3_release_dquot(struct dquot *dquot)
 
         handle = ext3_journal_start(dquot_to_inode(dquot),
                                         EXT3_QUOTA_DEL_BLOCKS(dquot->dq_sb));
-        if (IS_ERR(handle))
+        if (IS_ERR(handle)) {
+                /* Release dquot anyway to avoid endless cycle in dqput() */
+                dquot_release(dquot);
                 return PTR_ERR(handle);
+        }
         ret = dquot_release(dquot);
         err = ext3_journal_stop(handle);
         if (!ret)
@@ -2712,6 +2715,12 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type,
         struct buffer_head *bh;
         handle_t *handle = journal_current_handle();
 
+        if (!handle) {
+                printk(KERN_WARNING "EXT3-fs: Quota write (off=%Lu, len=%Lu)"
+                        " cancelled because transaction is not started.\n",
+                        (unsigned long long)off, (unsigned long long)len);
+                return -EIO;
+        }
         mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
         while (towrite > 0) {
                 tocopy = sb->s_blocksize - offset < towrite ?
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4550b83ab1c9..3c1397fa83df 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2698,8 +2698,11 @@ static int ext4_release_dquot(struct dquot *dquot)
 
         handle = ext4_journal_start(dquot_to_inode(dquot),
                                         EXT4_QUOTA_DEL_BLOCKS(dquot->dq_sb));
-        if (IS_ERR(handle))
+        if (IS_ERR(handle)) {
+                /* Release dquot anyway to avoid endless cycle in dqput() */
+                dquot_release(dquot);
                 return PTR_ERR(handle);
+        }
         ret = dquot_release(dquot);
         err = ext4_journal_stop(handle);
         if (!ret)
@@ -2832,6 +2835,12 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
         struct buffer_head *bh;
         handle_t *handle = journal_current_handle();
 
+        if (!handle) {
+                printk(KERN_WARNING "EXT4-fs: Quota write (off=%Lu, len=%Lu)"
+                        " cancelled because transaction is not started.\n",
+                        (unsigned long long)off, (unsigned long long)len);
+                return -EIO;
+        }
         mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
         while (towrite > 0) {
                 tocopy = sb->s_blocksize - offset < towrite ?
diff --git a/fs/locks.c b/fs/locks.c
index 50857d2d3404..c795eaaf6c4c 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -782,7 +782,7 @@ find_conflict:
         if (request->fl_flags & FL_ACCESS)
                 goto out;
         locks_copy_lock(new_fl, request);
-        locks_insert_lock(&inode->i_flock, new_fl);
+        locks_insert_lock(before, new_fl);
         new_fl = NULL;
         error = 0;
 
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 4f517665c9a0..778a850b4634 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -5602,6 +5602,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
                                       clusters_to_del;
         spin_unlock(&OCFS2_I(inode)->ip_lock);
         le32_add_cpu(&fe->i_clusters, -clusters_to_del);
+        inode->i_blocks = ocfs2_inode_sector_count(inode);
 
         status = ocfs2_trim_tree(inode, path, handle, tc,
                                  clusters_to_del, &delete_blk);
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 460d440310f2..50cd8a209012 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -855,6 +855,7 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp,
                                   struct ocfs2_super *osb, loff_t pos,
                                   unsigned len, struct buffer_head *di_bh)
 {
+        u32 cend;
         struct ocfs2_write_ctxt *wc;
 
         wc = kzalloc(sizeof(struct ocfs2_write_ctxt), GFP_NOFS);
@@ -862,7 +863,8 @@ static int ocfs2_alloc_write_ctxt(struct ocfs2_write_ctxt **wcp,
                 return -ENOMEM;
 
         wc->w_cpos = pos >> osb->s_clustersize_bits;
-        wc->w_clen = ocfs2_clusters_for_bytes(osb->sb, len);
+        cend = (pos + len - 1) >> osb->s_clustersize_bits;
+        wc->w_clen = cend - wc->w_cpos + 1;
         get_bh(di_bh);
         wc->w_di_bh = di_bh;
 
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 4ffa715be09c..7e34e66159c6 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -314,7 +314,6 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
         }
 
         i_size_write(inode, new_i_size);
-        inode->i_blocks = ocfs2_align_bytes_to_sectors(new_i_size);
         inode->i_ctime = inode->i_mtime = CURRENT_TIME;
 
         di = (struct ocfs2_dinode *) fe_bh->b_data;
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index f2fc9a795deb..c034b5129c1e 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -81,8 +81,15 @@ static struct dentry *ocfs2_debugfs_root = NULL;
 MODULE_AUTHOR("Oracle");
 MODULE_LICENSE("GPL");
 
+struct mount_options
+{
+        unsigned long   mount_opt;
+        unsigned int    atime_quantum;
+        signed short    slot;
+};
+
 static int ocfs2_parse_options(struct super_block *sb, char *options,
-                               unsigned long *mount_opt, s16 *slot,
+                               struct mount_options *mopt,
                                int is_remount);
 static void ocfs2_put_super(struct super_block *sb);
 static int ocfs2_mount_volume(struct super_block *sb);
@@ -367,24 +374,23 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)
 {
         int incompat_features;
         int ret = 0;
-        unsigned long parsed_options;
-        s16 slot;
+        struct mount_options parsed_options;
         struct ocfs2_super *osb = OCFS2_SB(sb);
 
-        if (!ocfs2_parse_options(sb, data, &parsed_options, &slot, 1)) {
+        if (!ocfs2_parse_options(sb, data, &parsed_options, 1)) {
                 ret = -EINVAL;
                 goto out;
         }
 
         if ((osb->s_mount_opt & OCFS2_MOUNT_HB_LOCAL) !=
-            (parsed_options & OCFS2_MOUNT_HB_LOCAL)) {
+            (parsed_options.mount_opt & OCFS2_MOUNT_HB_LOCAL)) {
                 ret = -EINVAL;
                 mlog(ML_ERROR, "Cannot change heartbeat mode on remount\n");
                 goto out;
         }
 
         if ((osb->s_mount_opt & OCFS2_MOUNT_DATA_WRITEBACK) !=
-            (parsed_options & OCFS2_MOUNT_DATA_WRITEBACK)) {
+            (parsed_options.mount_opt & OCFS2_MOUNT_DATA_WRITEBACK)) {
                 ret = -EINVAL;
                 mlog(ML_ERROR, "Cannot change data mode on remount\n");
                 goto out;
@@ -435,7 +441,9 @@ unlock_osb:
 
                 /* Only save off the new mount options in case of a successful
                  * remount. */
-                osb->s_mount_opt = parsed_options;
+                osb->s_mount_opt = parsed_options.mount_opt;
+                osb->s_atime_quantum = parsed_options.atime_quantum;
+                osb->preferred_slot = parsed_options.slot;
         }
 out:
         return ret;
@@ -547,8 +555,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
 {
         struct dentry *root;
         int status, sector_size;
-        unsigned long parsed_opt;
-        s16 slot;
+        struct mount_options parsed_options;
         struct inode *inode = NULL;
         struct ocfs2_super *osb = NULL;
         struct buffer_head *bh = NULL;
@@ -556,14 +563,14 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
 
         mlog_entry("%p, %p, %i", sb, data, silent);
 
-        if (!ocfs2_parse_options(sb, data, &parsed_opt, &slot, 0)) {
+        if (!ocfs2_parse_options(sb, data, &parsed_options, 0)) {
                 status = -EINVAL;
                 goto read_super_error;
         }
 
         /* for now we only have one cluster/node, make sure we see it
          * in the heartbeat universe */
-        if (parsed_opt & OCFS2_MOUNT_HB_LOCAL) {
+        if (parsed_options.mount_opt & OCFS2_MOUNT_HB_LOCAL) {
                 if (!o2hb_check_local_node_heartbeating()) {
                         status = -EINVAL;
                         goto read_super_error;
@@ -585,8 +592,9 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
         }
         brelse(bh);
         bh = NULL;
-        osb->s_mount_opt = parsed_opt;
-        osb->preferred_slot = slot;
+        osb->s_mount_opt = parsed_options.mount_opt;
+        osb->s_atime_quantum = parsed_options.atime_quantum;
+        osb->preferred_slot = parsed_options.slot;
 
         sb->s_magic = OCFS2_SUPER_MAGIC;
 
@@ -728,8 +736,7 @@ static struct file_system_type ocfs2_fs_type = {
 
 static int ocfs2_parse_options(struct super_block *sb,
                                char *options,
-                               unsigned long *mount_opt,
-                               s16 *slot,
+                               struct mount_options *mopt,
                                int is_remount)
 {
         int status;
@@ -738,8 +745,9 @@ static int ocfs2_parse_options(struct super_block *sb,
         mlog_entry("remount: %d, options: \"%s\"\n", is_remount,
                    options ? options : "(none)");
 
-        *mount_opt = 0;
-        *slot = OCFS2_INVALID_SLOT;
+        mopt->mount_opt = 0;
+        mopt->atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;
+        mopt->slot = OCFS2_INVALID_SLOT;
 
         if (!options) {
                 status = 1;
@@ -749,7 +757,6 @@ static int ocfs2_parse_options(struct super_block *sb,
         while ((p = strsep(&options, ",")) != NULL) {
                 int token, option;
                 substring_t args[MAX_OPT_ARGS];
-                struct ocfs2_super * osb = OCFS2_SB(sb);
 
                 if (!*p)
                         continue;
@@ -757,10 +764,10 @@ static int ocfs2_parse_options(struct super_block *sb,
                 token = match_token(p, tokens, args);
                 switch (token) {
                 case Opt_hb_local:
-                        *mount_opt |= OCFS2_MOUNT_HB_LOCAL;
+                        mopt->mount_opt |= OCFS2_MOUNT_HB_LOCAL;
                         break;
                 case Opt_hb_none:
-                        *mount_opt &= ~OCFS2_MOUNT_HB_LOCAL;
+                        mopt->mount_opt &= ~OCFS2_MOUNT_HB_LOCAL;
                         break;
                 case Opt_barrier:
                         if (match_int(&args[0], &option)) {
@@ -768,27 +775,27 @@ static int ocfs2_parse_options(struct super_block *sb,
                                 goto bail;
                         }
                         if (option)
-                                *mount_opt |= OCFS2_MOUNT_BARRIER;
+                                mopt->mount_opt |= OCFS2_MOUNT_BARRIER;
                         else
-                                *mount_opt &= ~OCFS2_MOUNT_BARRIER;
+                                mopt->mount_opt &= ~OCFS2_MOUNT_BARRIER;
                         break;
                 case Opt_intr:
-                        *mount_opt &= ~OCFS2_MOUNT_NOINTR;
+                        mopt->mount_opt &= ~OCFS2_MOUNT_NOINTR;
                         break;
                 case Opt_nointr:
-                        *mount_opt |= OCFS2_MOUNT_NOINTR;
+                        mopt->mount_opt |= OCFS2_MOUNT_NOINTR;
                         break;
                 case Opt_err_panic:
-                        *mount_opt |= OCFS2_MOUNT_ERRORS_PANIC;
+                        mopt->mount_opt |= OCFS2_MOUNT_ERRORS_PANIC;
                         break;
                 case Opt_err_ro:
-                        *mount_opt &= ~OCFS2_MOUNT_ERRORS_PANIC;
+                        mopt->mount_opt &= ~OCFS2_MOUNT_ERRORS_PANIC;
                         break;
                 case Opt_data_ordered:
-                        *mount_opt &= ~OCFS2_MOUNT_DATA_WRITEBACK;
+                        mopt->mount_opt &= ~OCFS2_MOUNT_DATA_WRITEBACK;
                         break;
                 case Opt_data_writeback:
-                        *mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK;
+                        mopt->mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK;
                         break;
                 case Opt_atime_quantum:
                         if (match_int(&args[0], &option)) {
@@ -796,9 +803,7 @@ static int ocfs2_parse_options(struct super_block *sb,
                                 goto bail;
                         }
                         if (option >= 0)
-                                osb->s_atime_quantum = option;
-                        else
-                                osb->s_atime_quantum = OCFS2_DEFAULT_ATIME_QUANTUM;
+                                mopt->atime_quantum = option;
                         break;
                 case Opt_slot:
                         option = 0;
@@ -807,7 +812,7 @@ static int ocfs2_parse_options(struct super_block *sb,
                                 goto bail;
                         }
                         if (option)
-                                *slot = (s16)option;
+                                mopt->slot = (s16)option;
                         break;
                 default:
                         mlog(ML_ERROR,
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index a5b0dfd89a17..0e4d37c93eea 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -11,6 +11,7 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/completion.h>
+#include <linux/poll.h>
 #include <linux/file.h>
 #include <linux/limits.h>
 #include <linux/init.h>
@@ -232,7 +233,7 @@ static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t
 static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *pts)
 {
         struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
-        unsigned int rv = 0;
+        unsigned int rv = DEFAULT_POLLMASK;
         unsigned int (*poll)(struct file *, struct poll_table_struct *);
 
         spin_lock(&pde->pde_unload_lock);
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 5b68dd3f191a..a005451930b7 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1915,8 +1915,11 @@ static int reiserfs_release_dquot(struct dquot *dquot)
         ret =
             journal_begin(&th, dquot->dq_sb,
                           REISERFS_QUOTA_DEL_BLOCKS(dquot->dq_sb));
-        if (ret)
+        if (ret) {
+                /* Release dquot anyway to avoid endless cycle in dqput() */
+                dquot_release(dquot);
                 goto out;
+        }
         ret = dquot_release(dquot);
         err =
             journal_end(&th, dquot->dq_sb,
@@ -2067,6 +2070,12 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
         size_t towrite = len;
         struct buffer_head tmp_bh, *bh;
 
+        if (!current->journal_info) {
+                printk(KERN_WARNING "reiserfs: Quota write (off=%Lu, len=%Lu)"
+                        " cancelled because transaction is not started.\n",
+                        (unsigned long long)off, (unsigned long long)len);
+                return -EIO;
+        }
         mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
         while (towrite > 0) {
                 tocopy = sb->s_blocksize - offset < towrite ?
@@ -2098,7 +2107,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
                 data += tocopy;
                 blk++;
         }
-      out:
+out:
         if (len == towrite)
                 return err;
         if (inode->i_size < off + len - towrite)
diff --git a/fs/select.c b/fs/select.c
index a974082b0824..46dca31c607a 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -26,8 +26,6 @@
 
 #include <asm/uaccess.h>
 
-#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-
 struct poll_table_page {
         struct poll_table_page * next;
         struct poll_table_entry * entry;