diff options
author | Jan Kara <jack@suse.cz> | 2017-04-11 10:33:50 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2017-04-19 08:21:23 -0400 |
commit | 420768d31960fd4398d4553e79cab8af3db2e9ee (patch) | |
tree | c43cb6b66b391124fa0d355d87d1ccd621a778a4 /fs/ext2/inode.c | |
parent | 38eae95ddc1964b42fc6d313a1bd17c43e3d08f1 (diff) |
ext2: Remove ext2_get_inode_flags()
Now that all places setting inode->i_flags that should be reflected in
on-disk flags are gone, we can remove ext2_get_inode_flags() call.
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2/inode.c')
-rw-r--r-- | fs/ext2/inode.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 4d3e2528ac17..3a38c1b84e3c 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
@@ -1384,25 +1384,6 @@ void ext2_set_inode_flags(struct inode *inode) | |||
1384 | inode->i_flags |= S_DAX; | 1384 | inode->i_flags |= S_DAX; |
1385 | } | 1385 | } |
1386 | 1386 | ||
1387 | /* Propagate flags from i_flags to EXT2_I(inode)->i_flags */ | ||
1388 | void ext2_get_inode_flags(struct ext2_inode_info *ei) | ||
1389 | { | ||
1390 | unsigned int flags = ei->vfs_inode.i_flags; | ||
1391 | |||
1392 | ei->i_flags &= ~(EXT2_SYNC_FL|EXT2_APPEND_FL| | ||
1393 | EXT2_IMMUTABLE_FL|EXT2_NOATIME_FL|EXT2_DIRSYNC_FL); | ||
1394 | if (flags & S_SYNC) | ||
1395 | ei->i_flags |= EXT2_SYNC_FL; | ||
1396 | if (flags & S_APPEND) | ||
1397 | ei->i_flags |= EXT2_APPEND_FL; | ||
1398 | if (flags & S_IMMUTABLE) | ||
1399 | ei->i_flags |= EXT2_IMMUTABLE_FL; | ||
1400 | if (flags & S_NOATIME) | ||
1401 | ei->i_flags |= EXT2_NOATIME_FL; | ||
1402 | if (flags & S_DIRSYNC) | ||
1403 | ei->i_flags |= EXT2_DIRSYNC_FL; | ||
1404 | } | ||
1405 | |||
1406 | struct inode *ext2_iget (struct super_block *sb, unsigned long ino) | 1387 | struct inode *ext2_iget (struct super_block *sb, unsigned long ino) |
1407 | { | 1388 | { |
1408 | struct ext2_inode_info *ei; | 1389 | struct ext2_inode_info *ei; |
@@ -1563,7 +1544,6 @@ static int __ext2_write_inode(struct inode *inode, int do_sync) | |||
1563 | if (ei->i_state & EXT2_STATE_NEW) | 1544 | if (ei->i_state & EXT2_STATE_NEW) |
1564 | memset(raw_inode, 0, EXT2_SB(sb)->s_inode_size); | 1545 | memset(raw_inode, 0, EXT2_SB(sb)->s_inode_size); |
1565 | 1546 | ||
1566 | ext2_get_inode_flags(ei); | ||
1567 | raw_inode->i_mode = cpu_to_le16(inode->i_mode); | 1547 | raw_inode->i_mode = cpu_to_le16(inode->i_mode); |
1568 | if (!(test_opt(sb, NO_UID32))) { | 1548 | if (!(test_opt(sb, NO_UID32))) { |
1569 | raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid)); | 1549 | raw_inode->i_uid_low = cpu_to_le16(low_16_bits(uid)); |