Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

3 files changed, 42 insertions, 24 deletions

diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
index e0f0f098a523..74363a7aacbc 100644
--- a/fs/reiserfs/ioctl.c
+++ b/fs/reiserfs/ioctl.c
@@ -4,6 +4,7 @@
 
 #include <linux/capability.h>
 #include <linux/fs.h>
+#include <linux/mount.h>
 #include <linux/reiserfs_fs.h>
 #include <linux/time.h>
 #include <asm/uaccess.h>
@@ -25,6 +26,7 @@ int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                    unsigned long arg)
 {
         unsigned int flags;
+        int err = 0;
 
         switch (cmd) {
         case REISERFS_IOC_UNPACK:
@@ -48,50 +50,67 @@ int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                         if (!reiserfs_attrs(inode->i_sb))
                                 return -ENOTTY;
 
-                        if (IS_RDONLY(inode))
-                                return -EROFS;
+                        err = mnt_want_write(filp->f_path.mnt);
+                        if (err)
+                                return err;
 
-                        if (!is_owner_or_cap(inode))
-                                return -EPERM;
-
-                        if (get_user(flags, (int __user *)arg))
-                                return -EFAULT;
-
-                        /* Is it quota file? Do not allow user to mess with it. */
-                        if (IS_NOQUOTA(inode))
-                                return -EPERM;
+                        if (!is_owner_or_cap(inode)) {
+                                err = -EPERM;
+                                goto setflags_out;
+                        }
+                        if (get_user(flags, (int __user *)arg)) {
+                                err = -EFAULT;
+                                goto setflags_out;
+                        }
+                        /*
+                         * Is it quota file? Do not allow user to mess with it
+                         */
+                        if (IS_NOQUOTA(inode)) {
+                                err = -EPERM;
+                                goto setflags_out;
+                        }
                         if (((flags ^ REISERFS_I(inode)->
                               i_attrs) & (REISERFS_IMMUTABLE_FL |
                                           REISERFS_APPEND_FL))
-                            && !capable(CAP_LINUX_IMMUTABLE))
-                                return -EPERM;
-
+                            && !capable(CAP_LINUX_IMMUTABLE)) {
+                                err = -EPERM;
+                                goto setflags_out;
+                        }
                         if ((flags & REISERFS_NOTAIL_FL) &&
                             S_ISREG(inode->i_mode)) {
                                 int result;
 
                                 result = reiserfs_unpack(inode, filp);
-                                if (result)
-                                        return result;
+                                if (result) {
+                                        err = result;
+                                        goto setflags_out;
+                                }
                         }
                         sd_attrs_to_i_attrs(flags, inode);
                         REISERFS_I(inode)->i_attrs = flags;
                         inode->i_ctime = CURRENT_TIME_SEC;
                         mark_inode_dirty(inode);
-                        return 0;
+setflags_out:
+                        mnt_drop_write(filp->f_path.mnt);
+                        return err;
                 }
         case REISERFS_IOC_GETVERSION:
                 return put_user(inode->i_generation, (int __user *)arg);
         case REISERFS_IOC_SETVERSION:
                 if (!is_owner_or_cap(inode))
                         return -EPERM;
-                if (IS_RDONLY(inode))
-                        return -EROFS;
-                if (get_user(inode->i_generation, (int __user *)arg))
-                        return -EFAULT;
+                err = mnt_want_write(filp->f_path.mnt);
+                if (err)
+                        return err;
+                if (get_user(inode->i_generation, (int __user *)arg)) {
+                        err = -EFAULT;
+                        goto setversion_out;
+                }
                 inode->i_ctime = CURRENT_TIME_SEC;
                 mark_inode_dirty(inode);
-                return 0;
+setversion_out:
+                mnt_drop_write(filp->f_path.mnt);
+                return err;
         default:
                 return -ENOTTY;
         }
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index bb05a3e51b93..060eb3f598e7 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -38,7 +38,7 @@
 #include <asm/system.h>
 
 #include <linux/time.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <linux/vmalloc.h>
 #include <linux/reiserfs_fs.h>
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index 344b9b96cc56..d7c4935c1034 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -44,7 +44,6 @@
 #include <net/checksum.h>
 #include <linux/smp_lock.h>
 #include <linux/stat.h>
-#include <asm/semaphore.h>
 
 #define FL_READONLY 128
 #define FL_DIR_SEM_HELD 256