reiserfs: Remove i_attrs_to_sd_attrs()

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

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

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index aeca1a0b7b5a2fafc52ece6baf855851e09c2a11..873fc04e9403aa7d6ca9c2d13a7d045dd963fe75 100644 (file)
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -1375,7 +1375,6 @@ static void init_inode(struct inode *inode, struct treepath *path)
 static void inode2sd(void *sd, struct inode *inode, loff_t size)
 {
        struct stat_data *sd_v2 = (struct stat_data *)sd;
-       __u16 flags;
 
        set_sd_v2_mode(sd_v2, inode->i_mode);
        set_sd_v2_nlink(sd_v2, inode->i_nlink);
@@ -1390,9 +1389,7 @@ static void inode2sd(void *sd, struct inode *inode, loff_t size)
                set_sd_v2_rdev(sd_v2, new_encode_dev(inode->i_rdev));
        else
                set_sd_v2_generation(sd_v2, inode->i_generation);
-       flags = REISERFS_I(inode)->i_attrs;
-       i_attrs_to_sd_attrs(inode, &flags);
-       set_sd_v2_attrs(sd_v2, flags);
+       set_sd_v2_attrs(sd_v2, REISERFS_I(inode)->i_attrs);
 }
 
 /* used to copy inode's fields to old stat data */
@@ -3091,28 +3088,6 @@ void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode)
        }
 }
 
-void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs)
-{
-       if (reiserfs_attrs(inode->i_sb)) {
-               if (inode->i_flags & S_IMMUTABLE)
-                       *sd_attrs |= REISERFS_IMMUTABLE_FL;
-               else
-                       *sd_attrs &= ~REISERFS_IMMUTABLE_FL;
-               if (inode->i_flags & S_SYNC)
-                       *sd_attrs |= REISERFS_SYNC_FL;
-               else
-                       *sd_attrs &= ~REISERFS_SYNC_FL;
-               if (inode->i_flags & S_NOATIME)
-                       *sd_attrs |= REISERFS_NOATIME_FL;
-               else
-                       *sd_attrs &= ~REISERFS_NOATIME_FL;
-               if (REISERFS_I(inode)->i_flags & i_nopack_mask)
-                       *sd_attrs |= REISERFS_NOTAIL_FL;
-               else
-                       *sd_attrs &= ~REISERFS_NOTAIL_FL;
-       }
-}
-
 /*
  * decide if this buffer needs to stay around for data logging or ordered
  * write purposes

diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
index 1f4692a505a0c08af54f388d09a7fb9a2f0d75fd..acbbaf7a0bb26be8e25039ca4fee2a64a0db02be 100644 (file)
--- a/fs/reiserfs/ioctl.c
+++ b/fs/reiserfs/ioctl.c
@@ -47,7 +47,6 @@ long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                }
 
                flags = REISERFS_I(inode)->i_attrs;
-               i_attrs_to_sd_attrs(inode, (__u16 *) & flags);
                err = put_user(flags, (int __user *)arg);
                break;
        case REISERFS_IOC_SETFLAGS:{

diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index 6ca00471afbf40353b76c414a1611b0bbedd10e3..1d34377fef97624e2ca695b4a552f01e94e84712 100644 (file)
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -3099,7 +3099,6 @@ static inline void reiserfs_update_sd(struct reiserfs_transaction_handle *th,
 }
 
 void sd_attrs_to_i_attrs(__u16 sd_attrs, struct inode *inode);
-void i_attrs_to_sd_attrs(struct inode *inode, __u16 * sd_attrs);
 int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
 
 int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);