~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to fs/squashfs/inode.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
159
159
                        frag_offset = 0;
160
160
                }
161
161
 
162
 
                inode->i_nlink = 1;
 
162
                set_nlink(inode, 1);
163
163
                inode->i_size = le32_to_cpu(sqsh_ino->file_size);
164
164
                inode->i_fop = &generic_ro_fops;
165
165
                inode->i_mode |= S_IFREG;
203
203
                }
204
204
 
205
205
                xattr_id = le32_to_cpu(sqsh_ino->xattr);
206
 
                inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
 
206
                set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
207
207
                inode->i_size = le64_to_cpu(sqsh_ino->file_size);
208
208
                inode->i_op = &squashfs_inode_ops;
209
209
                inode->i_fop = &generic_ro_fops;
232
232
                if (err < 0)
233
233
                        goto failed_read;
234
234
 
235
 
                inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
 
235
                set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
236
236
                inode->i_size = le16_to_cpu(sqsh_ino->file_size);
237
237
                inode->i_op = &squashfs_dir_inode_ops;
238
238
                inode->i_fop = &squashfs_dir_ops;
257
257
                        goto failed_read;
258
258
 
259
259
                xattr_id = le32_to_cpu(sqsh_ino->xattr);
260
 
                inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
 
260
                set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
261
261
                inode->i_size = le32_to_cpu(sqsh_ino->file_size);
262
262
                inode->i_op = &squashfs_dir_inode_ops;
263
263
                inode->i_fop = &squashfs_dir_ops;
284
284
                if (err < 0)
285
285
                        goto failed_read;
286
286
 
287
 
                inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
 
287
                set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
288
288
                inode->i_size = le32_to_cpu(sqsh_ino->symlink_size);
289
289
                inode->i_op = &squashfs_symlink_inode_ops;
290
290
                inode->i_data.a_ops = &squashfs_symlink_aops;
325
325
                        inode->i_mode |= S_IFCHR;
326
326
                else
327
327
                        inode->i_mode |= S_IFBLK;
328
 
                inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
 
328
                set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
329
329
                rdev = le32_to_cpu(sqsh_ino->rdev);
330
330
                init_special_inode(inode, inode->i_mode, new_decode_dev(rdev));
331
331
 
349
349
                        inode->i_mode |= S_IFBLK;
350
350
                xattr_id = le32_to_cpu(sqsh_ino->xattr);
351
351
                inode->i_op = &squashfs_inode_ops;
352
 
                inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
 
352
                set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
353
353
                rdev = le32_to_cpu(sqsh_ino->rdev);
354
354
                init_special_inode(inode, inode->i_mode, new_decode_dev(rdev));
355
355
 
370
370
                        inode->i_mode |= S_IFIFO;
371
371
                else
372
372
                        inode->i_mode |= S_IFSOCK;
373
 
                inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
 
373
                set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
374
374
                init_special_inode(inode, inode->i_mode, 0);
375
375
                break;
376
376
        }
389
389
                        inode->i_mode |= S_IFSOCK;
390
390
                xattr_id = le32_to_cpu(sqsh_ino->xattr);
391
391
                inode->i_op = &squashfs_inode_ops;
392
 
                inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
 
392
                set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
393
393
                init_special_inode(inode, inode->i_mode, 0);
394
394
                break;
395
395
        }