diff options
author | Jan Kara <jack@suse.cz> | 2017-04-11 10:37:49 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2017-04-19 08:21:23 -0400 |
commit | 7ba4a2e8b85a211ab6a74c19d9188e70d0e866de (patch) | |
tree | 47388c87b44389dcf8ba4deee5c1cf080063cd9c /fs/jfs | |
parent | 420768d31960fd4398d4553e79cab8af3db2e9ee (diff) |
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>
Diffstat (limited to 'fs/jfs')
-rw-r--r-- | fs/jfs/ioctl.c | 2 | ||||
-rw-r--r-- | fs/jfs/jfs_imap.c | 1 | ||||
-rw-r--r-- | fs/jfs/jfs_inode.c | 18 | ||||
-rw-r--r-- | fs/jfs/jfs_inode.h | 1 |
4 files changed, 0 insertions, 22 deletions
diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c index fc89f9436784..5c5ac5b3aec3 100644 --- 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) | |||
64 | 64 | ||
65 | switch (cmd) { | 65 | switch (cmd) { |
66 | case JFS_IOC_GETFLAGS: | 66 | case JFS_IOC_GETFLAGS: |
67 | jfs_get_inode_flags(jfs_inode); | ||
68 | flags = jfs_inode->mode2 & JFS_FL_USER_VISIBLE; | 67 | flags = jfs_inode->mode2 & JFS_FL_USER_VISIBLE; |
69 | flags = jfs_map_ext2(flags, 0); | 68 | flags = jfs_map_ext2(flags, 0); |
70 | return put_user(flags, (int __user *) arg); | 69 | return put_user(flags, (int __user *) arg); |
@@ -98,7 +97,6 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
98 | /* Lock against other parallel changes of flags */ | 97 | /* Lock against other parallel changes of flags */ |
99 | inode_lock(inode); | 98 | inode_lock(inode); |
100 | 99 | ||
101 | jfs_get_inode_flags(jfs_inode); | ||
102 | oldflags = jfs_inode->mode2; | 100 | oldflags = jfs_inode->mode2; |
103 | 101 | ||
104 | /* | 102 | /* |
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c index 6aca224a5d68..f36ef68905a7 100644 --- 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) | |||
3148 | else | 3148 | else |
3149 | dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns, | 3149 | dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns, |
3150 | jfs_ip->saved_gid)); | 3150 | jfs_ip->saved_gid)); |
3151 | jfs_get_inode_flags(jfs_ip); | ||
3152 | /* | 3151 | /* |
3153 | * mode2 is only needed for storing the higher order bits. | 3152 | * mode2 is only needed for storing the higher order bits. |
3154 | * Trust i_mode for the lower order ones | 3153 | * Trust i_mode for the lower order ones |
diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c index 375dd257a34f..5e9b7bb3aabf 100644 --- a/fs/jfs/jfs_inode.c +++ b/fs/jfs/jfs_inode.c | |||
@@ -45,24 +45,6 @@ void jfs_set_inode_flags(struct inode *inode) | |||
45 | S_DIRSYNC | S_SYNC); | 45 | S_DIRSYNC | S_SYNC); |
46 | } | 46 | } |
47 | 47 | ||
48 | void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip) | ||
49 | { | ||
50 | unsigned int flags = jfs_ip->vfs_inode.i_flags; | ||
51 | |||
52 | jfs_ip->mode2 &= ~(JFS_IMMUTABLE_FL | JFS_APPEND_FL | JFS_NOATIME_FL | | ||
53 | JFS_DIRSYNC_FL | JFS_SYNC_FL); | ||
54 | if (flags & S_IMMUTABLE) | ||
55 | jfs_ip->mode2 |= JFS_IMMUTABLE_FL; | ||
56 | if (flags & S_APPEND) | ||
57 | jfs_ip->mode2 |= JFS_APPEND_FL; | ||
58 | if (flags & S_NOATIME) | ||
59 | jfs_ip->mode2 |= JFS_NOATIME_FL; | ||
60 | if (flags & S_DIRSYNC) | ||
61 | jfs_ip->mode2 |= JFS_DIRSYNC_FL; | ||
62 | if (flags & S_SYNC) | ||
63 | jfs_ip->mode2 |= JFS_SYNC_FL; | ||
64 | } | ||
65 | |||
66 | /* | 48 | /* |
67 | * NAME: ialloc() | 49 | * NAME: ialloc() |
68 | * | 50 | * |
diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h index 9271cfe4a149..7b0b3a40788f 100644 --- a/fs/jfs/jfs_inode.h +++ b/fs/jfs/jfs_inode.h | |||
@@ -33,7 +33,6 @@ extern void jfs_truncate(struct inode *); | |||
33 | extern void jfs_truncate_nolock(struct inode *, loff_t); | 33 | extern void jfs_truncate_nolock(struct inode *, loff_t); |
34 | extern void jfs_free_zero_link(struct inode *); | 34 | extern void jfs_free_zero_link(struct inode *); |
35 | extern struct dentry *jfs_get_parent(struct dentry *dentry); | 35 | extern struct dentry *jfs_get_parent(struct dentry *dentry); |
36 | extern void jfs_get_inode_flags(struct jfs_inode_info *); | ||
37 | extern struct dentry *jfs_fh_to_dentry(struct super_block *sb, struct fid *fid, | 36 | extern struct dentry *jfs_fh_to_dentry(struct super_block *sb, struct fid *fid, |
38 | int fh_len, int fh_type); | 37 | int fh_len, int fh_type); |
39 | extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid, | 38 | extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid, |