jfs: Remove jfs_get_inode_flags()

Now that all places setting inode->i_flags that should be reflected in
on-disk flags are gone, we can remove jfs_get_inode_flags() call.

Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c
index fc89f94367842583d7dd9f9d8d93707e5bd1a50c..5c5ac5b3aec33baf1da1af89f762d62275a59916 100644 (file)
--- a/fs/jfs/ioctl.c
+++ b/fs/jfs/ioctl.c
@@ -64,7 +64,6 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 
        switch (cmd) {
        case JFS_IOC_GETFLAGS:
-               jfs_get_inode_flags(jfs_inode);
                flags = jfs_inode->mode2 & JFS_FL_USER_VISIBLE;
                flags = jfs_map_ext2(flags, 0);
                return put_user(flags, (int __user *) arg);
@@ -98,7 +97,6 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                /* Lock against other parallel changes of flags */
                inode_lock(inode);
 
-               jfs_get_inode_flags(jfs_inode);
                oldflags = jfs_inode->mode2;
 
                /*

diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 6aca224a5d6847ac29104f41053f4b1de9f9de8f..f36ef68905a74d830e75e7566c1145c8f55fc0cf 100644 (file)
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -3148,7 +3148,6 @@ static void copy_to_dinode(struct dinode * dip, struct inode *ip)
        else
                dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns,
                                                    jfs_ip->saved_gid));
-       jfs_get_inode_flags(jfs_ip);
        /*
         * mode2 is only needed for storing the higher order bits.
         * Trust i_mode for the lower order ones

diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
index 375dd257a34fe343b1b25a0176b4dd863aeae0c4..5e9b7bb3aabf9d5827d367d35ee1bd4740af90e3 100644 (file)
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -45,24 +45,6 @@ void jfs_set_inode_flags(struct inode *inode)
                        S_DIRSYNC | S_SYNC);
 }
 
-void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip)
-{
-       unsigned int flags = jfs_ip->vfs_inode.i_flags;
-
-       jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_APPEND_FL | JFS_NOATIME_FL |
-                          JFS_DIRSYNC_FL | JFS_SYNC_FL);
-       if (flags & S_IMMUTABLE)
-               jfs_ip->mode2 |= JFS_IMMUTABLE_FL;
-       if (flags & S_APPEND)
-               jfs_ip->mode2 |= JFS_APPEND_FL;
-       if (flags & S_NOATIME)
-               jfs_ip->mode2 |= JFS_NOATIME_FL;
-       if (flags & S_DIRSYNC)
-               jfs_ip->mode2 |= JFS_DIRSYNC_FL;
-       if (flags & S_SYNC)
-               jfs_ip->mode2 |= JFS_SYNC_FL;
-}
-
 /*
  * NAME:       ialloc()
  *

diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h
index 9271cfe4a1490ca88785a7973ecd22fd88000e73..7b0b3a40788ffd0a834df3651a24b66551b71f99 100644 (file)
--- a/fs/jfs/jfs_inode.h
+++ b/fs/jfs/jfs_inode.h
@@ -33,7 +33,6 @@ extern void jfs_truncate(struct inode *);
 extern void jfs_truncate_nolock(struct inode *, loff_t);
 extern void jfs_free_zero_link(struct inode *);
 extern struct dentry *jfs_get_parent(struct dentry *dentry);
-extern void jfs_get_inode_flags(struct jfs_inode_info *);
 extern struct dentry *jfs_fh_to_dentry(struct super_block *sb, struct fid *fid,
        int fh_len, int fh_type);
 extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,