Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 319b2be49e91398eae07db4dfc29972846dec649

Authored by Dmitry Monakhov
Committed by Al Viro
1 parent 217f206d68
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

jfs: replace inode uid,gid,mode init with helper 

Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 1 changed file with 2 additions and 10 deletions Side-by-side Diff

... ... @@ -98,14 +98,7 @@
98 98 goto fail_unlock;
99 99 }
100 100  
101   - inode->i_uid = current_fsuid();
102   - if (parent->i_mode & S_ISGID) {
103   - inode->i_gid = parent->i_gid;
104   - if (S_ISDIR(mode))
105   - mode |= S_ISGID;
106   - } else
107   - inode->i_gid = current_fsgid();
108   -
  101 + inode_init_owner(inode, parent, mode);
109 102 /*
110 103 * New inodes need to save sane values on disk when
111 104 * uid & gid mount options are used
... ... @@ -121,7 +114,6 @@
121 114 if (rc)
122 115 goto fail_drop;
123 116  
124   - inode->i_mode = mode;
125 117 /* inherit flags from parent */
126 118 jfs_inode->mode2 = JFS_IP(parent)->mode2 & JFS_FL_INHERIT;
127 119  
... ... @@ -134,7 +126,7 @@
134 126 if (S_ISLNK(mode))
135 127 jfs_inode->mode2 &= ~(JFS_IMMUTABLE_FL|JFS_APPEND_FL);
136 128 }
137   - jfs_inode->mode2 |= mode;
  129 + jfs_inode->mode2 |= inode->i_mode;
138 130  
139 131 inode->i_blocks = 0;
140 132 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;