Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4e907c3d45d10dc5162d283d109be425c23aeb69

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent 78ec7b6917
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

[PATCH] sysv: switch to inode_inc_count, inode_dec_count 

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 18 additions and 30 deletions Side-by-side Diff

... ... @@ -16,18 +16,6 @@
16 16 #include <linux/smp_lock.h>
17 17 #include "sysv.h"
18 18  
19   -static inline void inc_count(struct inode *inode)
20   -{
21   - inode->i_nlink++;
22   - mark_inode_dirty(inode);
23   -}
24   -
25   -static inline void dec_count(struct inode *inode)
26   -{
27   - inode->i_nlink--;
28   - mark_inode_dirty(inode);
29   -}
30   -
31 19 static int add_nondir(struct dentry *dentry, struct inode *inode)
32 20 {
33 21 int err = sysv_add_link(dentry, inode);
... ... @@ -35,7 +23,7 @@
35 23 d_instantiate(dentry, inode);
36 24 return 0;
37 25 }
38   - dec_count(inode);
  26 + inode_dec_link_count(inode);
39 27 iput(inode);
40 28 return err;
41 29 }
... ... @@ -124,7 +112,7 @@
124 112 return err;
125 113  
126 114 out_fail:
127   - dec_count(inode);
  115 + inode_dec_link_count(inode);
128 116 iput(inode);
129 117 goto out;
130 118 }
... ... @@ -138,7 +126,7 @@
138 126 return -EMLINK;
139 127  
140 128 inode->i_ctime = CURRENT_TIME_SEC;
141   - inc_count(inode);
  129 + inode_inc_link_count(inode);
142 130 atomic_inc(&inode->i_count);
143 131  
144 132 return add_nondir(dentry, inode);
... ... @@ -151,7 +139,7 @@
151 139  
152 140 if (dir->i_nlink >= SYSV_SB(dir->i_sb)->s_link_max)
153 141 goto out;
154   - inc_count(dir);
  142 + inode_inc_link_count(dir);
155 143  
156 144 inode = sysv_new_inode(dir, S_IFDIR|mode);
157 145 err = PTR_ERR(inode);
... ... @@ -160,7 +148,7 @@
160 148  
161 149 sysv_set_inode(inode, 0);
162 150  
163   - inc_count(inode);
  151 + inode_inc_link_count(inode);
164 152  
165 153 err = sysv_make_empty(inode, dir);
166 154 if (err)
167 155  
... ... @@ -175,11 +163,11 @@
175 163 return err;
176 164  
177 165 out_fail:
178   - dec_count(inode);
179   - dec_count(inode);
  166 + inode_dec_link_count(inode);
  167 + inode_dec_link_count(inode);
180 168 iput(inode);
181 169 out_dir:
182   - dec_count(dir);
  170 + inode_dec_link_count(dir);
183 171 goto out;
184 172 }
185 173  
... ... @@ -199,7 +187,7 @@
199 187 goto out;
200 188  
201 189 inode->i_ctime = dir->i_ctime;
202   - dec_count(inode);
  190 + inode_dec_link_count(inode);
203 191 out:
204 192 return err;
205 193 }
... ... @@ -213,8 +201,8 @@
213 201 err = sysv_unlink(dir, dentry);
214 202 if (!err) {
215 203 inode->i_size = 0;
216   - dec_count(inode);
217   - dec_count(dir);
  204 + inode_dec_link_count(inode);
  205 + inode_dec_link_count(dir);
218 206 }
219 207 }
220 208 return err;
221 209  
222 210  
223 211  
224 212  
225 213  
226 214  
... ... @@ -258,34 +246,34 @@
258 246 new_de = sysv_find_entry(new_dentry, &new_page);
259 247 if (!new_de)
260 248 goto out_dir;
261   - inc_count(old_inode);
  249 + inode_inc_link_count(old_inode);
262 250 sysv_set_link(new_de, new_page, old_inode);
263 251 new_inode->i_ctime = CURRENT_TIME_SEC;
264 252 if (dir_de)
265 253 new_inode->i_nlink--;
266   - dec_count(new_inode);
  254 + inode_dec_link_count(new_inode);
267 255 } else {
268 256 if (dir_de) {
269 257 err = -EMLINK;
270 258 if (new_dir->i_nlink >= SYSV_SB(new_dir->i_sb)->s_link_max)
271 259 goto out_dir;
272 260 }
273   - inc_count(old_inode);
  261 + inode_inc_link_count(old_inode);
274 262 err = sysv_add_link(new_dentry, old_inode);
275 263 if (err) {
276   - dec_count(old_inode);
  264 + inode_dec_link_count(old_inode);
277 265 goto out_dir;
278 266 }
279 267 if (dir_de)
280   - inc_count(new_dir);
  268 + inode_inc_link_count(new_dir);
281 269 }
282 270  
283 271 sysv_delete_entry(old_de, old_page);
284   - dec_count(old_inode);
  272 + inode_dec_link_count(old_inode);
285 273  
286 274 if (dir_de) {
287 275 sysv_set_link(dir_de, dir_page, new_dir);
288   - dec_count(old_dir);
  276 + inode_dec_link_count(old_dir);
289 277 }
290 278 return 0;
291 279