Unionfs: use bool type in dentry and file revalidation code

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index 724128d5b46309a27af0bb96d4415698f9a2b75a..87cbb09e2493f205de5ae0a752e2d76009b25792 100644 (file)
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -190,7 +190,7 @@ out:
 }
 
 /* open the highest priority file for a given upper file */
-static int open_highest_file(struct file *file, int willwrite)
+static int open_highest_file(struct file *file, bool willwrite)
 {
        int bindex, bstart, bend, err = 0;
        struct file *lower_file;
@@ -298,9 +298,9 @@ out:
 /*
  * Revalidate the struct file
  * @file: file to revalidate
- * @willwrite: 1 if caller may cause changes to the file; 0 otherwise.
+ * @willwrite: true if caller may cause changes to the file; false otherwise.
  */
-int unionfs_file_revalidate(struct file *file, int willwrite)
+int unionfs_file_revalidate(struct file *file, bool willwrite)
 {
        struct super_block *sb;
        struct dentry *dentry;
@@ -612,7 +612,7 @@ int unionfs_file_release(struct inode *inode, struct file *file)
         * This is important for open-but-unlinked files, as well as mmap
         * support.
         */
-       if ((err = unionfs_file_revalidate(file, 1)))
+       if ((err = unionfs_file_revalidate(file, true)))
                goto out;
        unionfs_check_file(file);
        fileinfo = UNIONFS_F(file);
@@ -753,7 +753,7 @@ long unionfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
 
-       if ((err = unionfs_file_revalidate(file, 1)))
+       if ((err = unionfs_file_revalidate(file, true)))
                goto out;
 
        /* check if asked for local commands */
@@ -791,7 +791,7 @@ int unionfs_flush(struct file *file, fl_owner_t id)
 
        unionfs_read_lock(dentry->d_sb);
 
-       if ((err = unionfs_file_revalidate(file, 1)))
+       if ((err = unionfs_file_revalidate(file, true)))
                goto out;
        unionfs_check_file(file);
 

diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
index e46a53e6f7ff5980f9d3f1778b3c4307b1476769..f32922e2e579e6f70f35edbd037943d8d4c7f450 100644 (file)
--- a/fs/unionfs/dentry.c
+++ b/fs/unionfs/dentry.c
@@ -262,7 +262,7 @@ static inline void purge_inode_data(struct inode *inode)
  * Revalidate a parent chain of dentries, then the actual node.
  * Assumes that dentry is locked, but will lock all parents if/when needed.
  *
- * If 'willwrite' is 1, and the lower inode times are not in sync, then
+ * If 'willwrite' is true, and the lower inode times are not in sync, then
  * *don't* purge_inode_data, as it could deadlock if ->write calls us and we
  * try to truncate a locked page.  Besides, if unionfs is about to write
  * data to a file, then there's the data unionfs is about to write is more

diff --git a/fs/unionfs/dirfops.c b/fs/unionfs/dirfops.c
index 980f12587ff6f8da86e8c6cff285c5890aed7a29..c923e583edcd55007b460f425a94afca8fdf9455 100644 (file)
--- a/fs/unionfs/dirfops.c
+++ b/fs/unionfs/dirfops.c
@@ -99,7 +99,7 @@ static int unionfs_readdir(struct file *file, void *dirent, filldir_t filldir)
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
 
-       if ((err = unionfs_file_revalidate(file, 0)))
+       if ((err = unionfs_file_revalidate(file, false)))
                goto out;
 
        inode = file->f_path.dentry->d_inode;
@@ -201,7 +201,7 @@ static loff_t unionfs_dir_llseek(struct file *file, loff_t offset, int origin)
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
 
-       if ((err = unionfs_file_revalidate(file, 0)))
+       if ((err = unionfs_file_revalidate(file, false)))
                goto out;
 
        rdstate = UNIONFS_F(file)->rdstate;

diff --git a/fs/unionfs/file.c b/fs/unionfs/file.c
index e9e63b78015e1fbe86f4ebff4df1241c1e5232e1..d8eaaa5be184b7e07fb252cfdfe1bd711df8905e 100644 (file)
--- a/fs/unionfs/file.c
+++ b/fs/unionfs/file.c
@@ -24,7 +24,7 @@ static ssize_t unionfs_read(struct file *file, char __user *buf,
        int err;
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
-       if ((err = unionfs_file_revalidate(file, 0)))
+       if ((err = unionfs_file_revalidate(file, false)))
                goto out;
        unionfs_check_file(file);
 
@@ -47,7 +47,7 @@ static ssize_t unionfs_aio_read(struct kiocb *iocb, const struct iovec *iov,
        struct file *file = iocb->ki_filp;
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
-       if ((err = unionfs_file_revalidate(file, 0)))
+       if ((err = unionfs_file_revalidate(file, false)))
                goto out;
        unionfs_check_file(file);
 
@@ -72,7 +72,7 @@ static ssize_t unionfs_write(struct file *file, const char __user *buf,
        int err = 0;
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
-       if ((err = unionfs_file_revalidate(file, 1)))
+       if ((err = unionfs_file_revalidate(file, true)))
                goto out;
        unionfs_check_file(file);
 
@@ -97,7 +97,7 @@ static int unionfs_file_readdir(struct file *file, void *dirent,
 static int unionfs_mmap(struct file *file, struct vm_area_struct *vma)
 {
        int err = 0;
-       int willwrite;
+       bool willwrite;
        struct file *lower_file;
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
@@ -149,7 +149,7 @@ int unionfs_fsync(struct file *file, struct dentry *dentry, int datasync)
        int err = -EINVAL;
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
-       if ((err = unionfs_file_revalidate(file, 1)))
+       if ((err = unionfs_file_revalidate(file, true)))
                goto out;
        unionfs_check_file(file);
 
@@ -196,7 +196,7 @@ int unionfs_fasync(int fd, struct file *file, int flag)
        int err = 0;
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
-       if ((err = unionfs_file_revalidate(file, 1)))
+       if ((err = unionfs_file_revalidate(file, true)))
                goto out;
        unionfs_check_file(file);
 

diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c
index 6ef19af5849c34b72b33328ff557c0f3dae63fcb..88ef6a6d47d3626c7e338e5e6206c17b0ed3f414 100644 (file)
--- a/fs/unionfs/mmap.c
+++ b/fs/unionfs/mmap.c
@@ -211,7 +211,7 @@ static int unionfs_readpage(struct file *file, struct page *page)
        int err;
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
-       if ((err = unionfs_file_revalidate(file, 0)))
+       if ((err = unionfs_file_revalidate(file, false)))
                goto out;
        unionfs_check_file(file);
 
@@ -254,7 +254,7 @@ static int unionfs_prepare_write(struct file *file, struct page *page,
         * is here, in ->prepare_write.
         */
        unionfs_copy_attr_times(file->f_path.dentry->d_inode);
-       err = unionfs_file_revalidate(file, 1);
+       err = unionfs_file_revalidate(file, true);
        unionfs_check_file(file);
        unionfs_read_unlock(file->f_path.dentry->d_sb);
 
@@ -275,7 +275,7 @@ static int unionfs_commit_write(struct file *file, struct page *page,
        BUG_ON(file == NULL);
 
        unionfs_read_lock(file->f_path.dentry->d_sb);
-       if ((err = unionfs_file_revalidate(file, 1)))
+       if ((err = unionfs_file_revalidate(file, true)))
                goto out;
        unionfs_check_file(file);
 

diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 3d85efa3d942346351e67dcd0091b7c2802f2eae..7285ea721d011a9ecec3dfe4d06e797898515189 100644 (file)
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -315,7 +315,7 @@ extern int unionfs_setlk(struct file *file, int cmd, struct file_lock *fl);
 extern int unionfs_getlk(struct file *file, struct file_lock *fl);
 
 /* Common file operations. */
-extern int unionfs_file_revalidate(struct file *file, int willwrite);
+extern int unionfs_file_revalidate(struct file *file, bool willwrite);
 extern int unionfs_open(struct inode *inode, struct file *file);
 extern int unionfs_file_release(struct inode *inode, struct file *file);
 extern int unionfs_flush(struct file *file, fl_owner_t id);