Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev

* git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev: (66 commits)
  [PATCH] kill the rest of struct file propagation in block ioctls
  [PATCH] get rid of struct file use in blkdev_ioctl() BLKBSZSET
  [PATCH] get rid of blkdev_locked_ioctl()
  [PATCH] get rid of blkdev_driver_ioctl()
  [PATCH] sanitize blkdev_get() and friends
  [PATCH] remember mode of reiserfs journal
  [PATCH] propagate mode through swsusp_close()
  [PATCH] propagate mode through open_bdev_excl/close_bdev_excl
  [PATCH] pass fmode_t to blkdev_put()
  [PATCH] kill the unused bsize on the send side of /dev/loop
  [PATCH] trim file propagation in block/compat_ioctl.c
  [PATCH] end of methods switch: remove the old ones
  [PATCH] switch sr
  [PATCH] switch sd
  [PATCH] switch ide-scsi
  [PATCH] switch tape_block
  [PATCH] switch dcssblk
  [PATCH] switch dasd
  [PATCH] switch mtd_blkdevs
  [PATCH] switch mmc
  ...

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 39f6357e3b5d..8054ee839b3c 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -338,7 +338,7 @@ nvram_open(struct inode *inode, struct file *file)
 
         if ((nvram_open_cnt && (file->f_flags & O_EXCL)) ||
             (nvram_open_mode & NVRAM_EXCL) ||
-            ((file->f_mode & 2) && (nvram_open_mode & NVRAM_WRITE))) {
+            ((file->f_mode & FMODE_WRITE) && (nvram_open_mode & NVRAM_WRITE))) {
                 spin_unlock(&nvram_state_lock);
                 unlock_kernel();
                 return -EBUSY;
@@ -346,7 +346,7 @@ nvram_open(struct inode *inode, struct file *file)
 
         if (file->f_flags & O_EXCL)
                 nvram_open_mode |= NVRAM_EXCL;
-        if (file->f_mode & 2)
+        if (file->f_mode & FMODE_WRITE)
                 nvram_open_mode |= NVRAM_WRITE;
         nvram_open_cnt++;
 
@@ -366,7 +366,7 @@ nvram_release(struct inode *inode, struct file *file)
         /* if only one instance is open, clear the EXCL bit */
         if (nvram_open_mode & NVRAM_EXCL)
                 nvram_open_mode &= ~NVRAM_EXCL;
-        if (file->f_mode & 2)
+        if (file->f_mode & FMODE_WRITE)
                 nvram_open_mode &= ~NVRAM_WRITE;
 
         spin_unlock(&nvram_state_lock);
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index e139372d0e69..96adf28a17e4 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -65,7 +65,7 @@ static int raw_open(struct inode *inode, struct file *filp)
         if (!bdev)
                 goto out;
         igrab(bdev->bd_inode);
-        err = blkdev_get(bdev, filp->f_mode, 0);
+        err = blkdev_get(bdev, filp->f_mode);
         if (err)
                 goto out;
         err = bd_claim(bdev, raw_open);
@@ -87,7 +87,7 @@ static int raw_open(struct inode *inode, struct file *filp)
 out2:
         bd_release(bdev);
 out1:
-        blkdev_put(bdev);
+        blkdev_put(bdev, filp->f_mode);
 out:
         mutex_unlock(&raw_mutex);
         return err;
@@ -112,7 +112,7 @@ static int raw_release(struct inode *inode, struct file *filp)
         mutex_unlock(&raw_mutex);
 
         bd_release(bdev);
-        blkdev_put(bdev);
+        blkdev_put(bdev, filp->f_mode);
         return 0;
 }
 
@@ -125,7 +125,7 @@ raw_ioctl(struct inode *inode, struct file *filp,
 {
         struct block_device *bdev = filp->private_data;
 
-        return blkdev_ioctl(bdev->bd_inode, NULL, command, arg);
+        return blkdev_ioctl(bdev, 0, command, arg);
 }
 
 static void bind_device(struct raw_config_request *rq)