diff options
Diffstat (limited to 'fs/udf/ialloc.c')
| -rw-r--r-- | fs/udf/ialloc.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c index 84360315aca2..eb9cfa23dc3d 100644 --- a/fs/udf/ialloc.c +++ b/fs/udf/ialloc.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include "udfdecl.h" | 21 | #include "udfdecl.h" |
| 22 | #include <linux/fs.h> | 22 | #include <linux/fs.h> |
| 23 | #include <linux/quotaops.h> | 23 | #include <linux/quotaops.h> |
| 24 | #include <linux/udf_fs.h> | ||
| 25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 27 | 26 | ||
| @@ -47,11 +46,9 @@ void udf_free_inode(struct inode *inode) | |||
| 47 | struct logicalVolIntegrityDescImpUse *lvidiu = | 46 | struct logicalVolIntegrityDescImpUse *lvidiu = |
| 48 | udf_sb_lvidiu(sbi); | 47 | udf_sb_lvidiu(sbi); |
| 49 | if (S_ISDIR(inode->i_mode)) | 48 | if (S_ISDIR(inode->i_mode)) |
| 50 | lvidiu->numDirs = | 49 | le32_add_cpu(&lvidiu->numDirs, -1); |
| 51 | cpu_to_le32(le32_to_cpu(lvidiu->numDirs) - 1); | ||
| 52 | else | 50 | else |
| 53 | lvidiu->numFiles = | 51 | le32_add_cpu(&lvidiu->numFiles, -1); |
| 54 | cpu_to_le32(le32_to_cpu(lvidiu->numFiles) - 1); | ||
| 55 | 52 | ||
| 56 | mark_buffer_dirty(sbi->s_lvid_bh); | 53 | mark_buffer_dirty(sbi->s_lvid_bh); |
| 57 | } | 54 | } |
| @@ -105,11 +102,9 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) | |||
| 105 | lvhd = (struct logicalVolHeaderDesc *) | 102 | lvhd = (struct logicalVolHeaderDesc *) |
| 106 | (lvid->logicalVolContentsUse); | 103 | (lvid->logicalVolContentsUse); |
| 107 | if (S_ISDIR(mode)) | 104 | if (S_ISDIR(mode)) |
| 108 | lvidiu->numDirs = | 105 | le32_add_cpu(&lvidiu->numDirs, 1); |
| 109 | cpu_to_le32(le32_to_cpu(lvidiu->numDirs) + 1); | ||
| 110 | else | 106 | else |
| 111 | lvidiu->numFiles = | 107 | le32_add_cpu(&lvidiu->numFiles, 1); |
| 112 | cpu_to_le32(le32_to_cpu(lvidiu->numFiles) + 1); | ||
| 113 | iinfo->i_unique = uniqueID = le64_to_cpu(lvhd->uniqueID); | 108 | iinfo->i_unique = uniqueID = le64_to_cpu(lvhd->uniqueID); |
| 114 | if (!(++uniqueID & 0x00000000FFFFFFFFUL)) | 109 | if (!(++uniqueID & 0x00000000FFFFFFFFUL)) |
| 115 | uniqueID += 16; | 110 | uniqueID += 16; |
