[PATCH] introduce fmode_t, do annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

14 files changed, 30 insertions, 30 deletions

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 7516baff3bb9..d19c5a939fe8 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1560,9 +1560,9 @@ static int floppy_open(struct inode *inode, struct file *filp)
         if (fd_ref[drive] && old_dev != system)
                 return -EBUSY;
 
-        if (filp && filp->f_mode & 3) {
+        if (filp && filp->f_mode & (FMODE_READ|FMODE_WRITE)) {
                 check_disk_change(inode->i_bdev);
-                if (filp->f_mode & 2 ) {
+                if (filp->f_mode & FMODE_WRITE ) {
                         int wrprot;
 
                         get_fdc(drive);
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 432cf4018291..e1db285b72cd 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1826,9 +1826,9 @@ static int floppy_open( struct inode *inode, struct file *filp )
         if (filp->f_flags & O_NDELAY)
                 return 0;
 
-        if (filp->f_mode & 3) {
+        if (filp->f_mode & (FMODE_READ|FMODE_WRITE)) {
                 check_disk_change(inode->i_bdev);
-                if (filp->f_mode & 2) {
+                if (filp->f_mode & FMODE_WRITE) {
                         if (p->wpstat) {
                                 if (p->ref < 0)
                                         p->ref = 0;
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 2cea27aba9a0..ae3ef8945f3f 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3761,14 +3761,14 @@ static int floppy_open(struct inode *inode, struct file *filp)
                 UFDCS->rawcmd = 2;
 
         if (!(filp->f_flags & O_NDELAY)) {
-                if (filp->f_mode & 3) {
+                if (filp->f_mode & (FMODE_READ|FMODE_WRITE)) {
                         UDRS->last_checked = 0;
                         check_disk_change(inode->i_bdev);
                         if (UTESTF(FD_DISK_CHANGED))
                                 goto out;
                 }
                 res = -EROFS;
-                if ((filp->f_mode & 2) && !(UTESTF(FD_DISK_WRITABLE)))
+                if ((filp->f_mode & FMODE_WRITE) && !(UTESTF(FD_DISK_WRITABLE)))
                         goto out;
         }
         mutex_unlock(&open_lock);
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index e7fe6ca97dd8..a902d84fd330 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -305,7 +305,7 @@ static int pf_open(struct inode *inode, struct file *file)
         if (pf->media_status == PF_NM)
                 return -ENODEV;
 
-        if ((pf->media_status == PF_RO) && (file->f_mode & 2))
+        if ((pf->media_status == PF_RO) && (file->f_mode & FMODE_WRITE))
                 return -EROFS;
 
         pf->access++;
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 5ae229656eaa..1e4006e18f03 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -667,7 +667,7 @@ static int pt_open(struct inode *inode, struct file *file)
                 goto out;
 
         err = -EROFS;
-        if ((!(tape->flags & PT_WRITE_OK)) && (file->f_mode & 2))
+        if ((!(tape->flags & PT_WRITE_OK)) && (file->f_mode & FMODE_WRITE))
                 goto out;
 
         if (!(iminor(inode) & 128))
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 195ca7c720f5..4d581e8ba9f6 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2320,7 +2320,7 @@ static int pkt_open_write(struct pktcdvd_device *pd)
 /*
  * called at open time.
  */
-static int pkt_open_dev(struct pktcdvd_device *pd, int write)
+static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)
 {
         int ret;
         long lba;
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 730ccea78e45..a53ca54bee12 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -908,13 +908,13 @@ static int floppy_open(struct inode *inode, struct file *filp)
                 return -EBUSY;
 
         if (err == 0 && (filp->f_flags & O_NDELAY) == 0
-            && (filp->f_mode & 3)) {
+            && (filp->f_mode & (FMODE_READ|FMODE_WRITE))) {
                 check_disk_change(inode->i_bdev);
                 if (fs->ejected)
                         err = -ENXIO;
         }
 
-        if (err == 0 && (filp->f_mode & 2)) {
+        if (err == 0 && (filp->f_mode & FMODE_WRITE)) {
                 if (fs->write_prot < 0)
                         fs->write_prot = swim3_readbit(fs, WRITE_PROT);
                 if (fs->write_prot)
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/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
index 409e4c15f9b7..0d5f5054ab64 100644
--- a/drivers/ide/ide-floppy_ioctl.c
+++ b/drivers/ide/ide-floppy_ioctl.c
@@ -250,7 +250,7 @@ static int ide_floppy_format_ioctl(ide_drive_t *drive, struct file *file,
         case IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY:
                 return ide_floppy_get_format_capacities(drive, argp);
         case IDEFLOPPY_IOCTL_FORMAT_START:
-                if (!(file->f_mode & 2))
+                if (!(file->f_mode & FMODE_WRITE))
                         return -EPERM;
                 return ide_floppy_format_unit(drive, (int __user *)argp);
         case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index d44898f46c33..d367473098f9 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -202,7 +202,7 @@ static int ide_gd_open(struct inode *inode, struct file *filp)
                         goto out_put_idkp;
                 }
 
-                if ((drive->dev_flags & IDE_DFLAG_WP) && (filp->f_mode & 2)) {
+                if ((drive->dev_flags & IDE_DFLAG_WP) && (filp->f_mode & FMODE_WRITE)) {
                         ret = -EROFS;
                         goto out_put_idkp;
                 }
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index dca401dc70a0..777c948180f9 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -988,9 +988,9 @@ static int dev_wait(struct dm_ioctl *param, size_t param_size)
         return r;
 }
 
-static inline int get_mode(struct dm_ioctl *param)
+static inline fmode_t get_mode(struct dm_ioctl *param)
 {
-        int mode = FMODE_READ | FMODE_WRITE;
+        fmode_t mode = FMODE_READ | FMODE_WRITE;
 
         if (param->flags & DM_READONLY_FLAG)
                 mode = FMODE_READ;
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index a740a6950f59..7c8671b06fe3 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -43,7 +43,7 @@ struct dm_table {
          * device.  This should be a combination of FMODE_READ
          * and FMODE_WRITE.
          */
-        int mode;
+        fmode_t mode;
 
         /* a list of devices used by this table */
         struct list_head devices;
@@ -217,7 +217,7 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
         return 0;
 }
 
-int dm_table_create(struct dm_table **result, int mode,
+int dm_table_create(struct dm_table **result, fmode_t mode,
                     unsigned num_targets, struct mapped_device *md)
 {
         struct dm_table *t = kzalloc(sizeof(*t), GFP_KERNEL);
@@ -395,7 +395,7 @@ static int check_device_area(struct dm_dev_internal *dd, sector_t start,
  * careful to leave things as they were if we fail to reopen the
  * device.
  */
-static int upgrade_mode(struct dm_dev_internal *dd, int new_mode,
+static int upgrade_mode(struct dm_dev_internal *dd, fmode_t new_mode,
                         struct mapped_device *md)
 {
         int r;
@@ -421,7 +421,7 @@ static int upgrade_mode(struct dm_dev_internal *dd, int new_mode,
  */
 static int __table_get_device(struct dm_table *t, struct dm_target *ti,
                               const char *path, sector_t start, sector_t len,
-                              int mode, struct dm_dev **result)
+                              fmode_t mode, struct dm_dev **result)
 {
         int r;
         dev_t uninitialized_var(dev);
@@ -537,7 +537,7 @@ void dm_set_device_limits(struct dm_target *ti, struct block_device *bdev)
 EXPORT_SYMBOL_GPL(dm_set_device_limits);
 
 int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
-                  sector_t len, int mode, struct dm_dev **result)
+                  sector_t len, fmode_t mode, struct dm_dev **result)
 {
         int r = __table_get_device(ti->table, ti, path,
                                    start, len, mode, result);
@@ -887,7 +887,7 @@ struct list_head *dm_table_get_devices(struct dm_table *t)
         return &t->devices;
 }
 
-int dm_table_get_mode(struct dm_table *t)
+fmode_t dm_table_get_mode(struct dm_table *t)
 {
         return t->mode;
 }
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 963840e9b5bf..bcffeda2df3d 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -96,7 +96,7 @@ static int mtd_open(struct inode *inode, struct file *file)
                 return -ENODEV;
 
         /* You can't open the RO devices RW */
-        if ((file->f_mode & 2) && (minor & 1))
+        if ((file->f_mode & FMODE_WRITE) && (minor & 1))
                 return -EACCES;
 
         lock_kernel();
@@ -114,7 +114,7 @@ static int mtd_open(struct inode *inode, struct file *file)
         }
 
         /* You can't open it RW if it's not a writeable device */
-        if ((file->f_mode & 2) && !(mtd->flags & MTD_WRITEABLE)) {
+        if ((file->f_mode & FMODE_WRITE) && !(mtd->flags & MTD_WRITEABLE)) {
                 put_mtd_device(mtd);
                 ret = -EACCES;
                 goto out;
@@ -144,7 +144,7 @@ static int mtd_close(struct inode *inode, struct file *file)
         DEBUG(MTD_DEBUG_LEVEL0, "MTD_close\n");
 
         /* Only sync if opened RW */
-        if ((file->f_mode & 2) && mtd->sync)
+        if ((file->f_mode & FMODE_WRITE) && mtd->sync)
                 mtd->sync(mtd);
 
         put_mtd_device(mtd);
@@ -443,7 +443,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         {
                 struct erase_info *erase;
 
-                if(!(file->f_mode & 2))
+                if(!(file->f_mode & FMODE_WRITE))
                         return -EPERM;
 
                 erase=kzalloc(sizeof(struct erase_info),GFP_KERNEL);
@@ -497,7 +497,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 struct mtd_oob_buf __user *user_buf = argp;
                 uint32_t retlen;
 
-                if(!(file->f_mode & 2))
+                if(!(file->f_mode & FMODE_WRITE))
                         return -EPERM;
 
                 if (copy_from_user(&buf, argp, sizeof(struct mtd_oob_buf)))
diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c
index 5ac207932fd7..685d94e69d44 100644
--- a/drivers/parisc/eisa_eeprom.c
+++ b/drivers/parisc/eisa_eeprom.c
@@ -86,7 +86,7 @@ static int eisa_eeprom_open(struct inode *inode, struct file *file)
 {
         cycle_kernel_lock();
 
-        if (file->f_mode & 2)
+        if (file->f_mode & FMODE_WRITE)
                 return -EINVAL;
    
         return 0;