Copy i_flags to jfs inode flags on write
This mirrors Jan Kara's patches for ext3. This patch makes sure that changes made to inode->i_flags are reflected on disk for jfs. It also moves a call of jfs_set_inode_flags() to be more consistent with where jfs_get_inode_flags() is called. Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
This commit is contained in:
parent
ba863a0016
commit
3e2221c73c
|
@ -55,7 +55,6 @@ void jfs_read_inode(struct inode *inode)
|
|||
inode->i_op = &jfs_file_inode_operations;
|
||||
init_special_inode(inode, inode->i_mode, inode->i_rdev);
|
||||
}
|
||||
jfs_set_inode_flags(inode);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -59,6 +59,7 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd,
|
|||
|
||||
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);
|
||||
|
@ -78,6 +79,7 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd,
|
|||
if (!S_ISDIR(inode->i_mode))
|
||||
flags &= ~JFS_DIRSYNC_FL;
|
||||
|
||||
jfs_get_inode_flags(jfs_inode);
|
||||
oldflags = jfs_inode->mode2;
|
||||
|
||||
/*
|
||||
|
|
|
@ -3078,6 +3078,7 @@ static int copy_from_dinode(struct dinode * dip, struct inode *ip)
|
|||
|
||||
jfs_ip->fileset = le32_to_cpu(dip->di_fileset);
|
||||
jfs_ip->mode2 = le32_to_cpu(dip->di_mode);
|
||||
jfs_set_inode_flags(ip);
|
||||
|
||||
ip->i_mode = le32_to_cpu(dip->di_mode) & 0xffff;
|
||||
if (sbi->umask != -1) {
|
||||
|
@ -3174,6 +3175,7 @@ static void copy_to_dinode(struct dinode * dip, struct inode *ip)
|
|||
dip->di_gid = cpu_to_le32(ip->i_gid);
|
||||
else
|
||||
dip->di_gid = cpu_to_le32(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
|
||||
|
|
|
@ -45,6 +45,24 @@ void jfs_set_inode_flags(struct inode *inode)
|
|||
inode->i_flags |= 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()
|
||||
*
|
||||
|
|
|
@ -31,6 +31,7 @@ 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 void jfs_set_inode_flags(struct inode *);
|
||||
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
|
||||
|
||||
|
|
Loading…
Reference in New Issue