diff options
Diffstat (limited to 'fs/minix')
-rw-r--r-- | fs/minix/dir.c | 4 | ||||
-rw-r--r-- | fs/minix/file.c | 2 | ||||
-rw-r--r-- | fs/minix/inode.c | 4 | ||||
-rw-r--r-- | fs/minix/namei.c | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/fs/minix/dir.c b/fs/minix/dir.c index dfaf6fa9b7b5..118e4e7bc935 100644 --- a/fs/minix/dir.c +++ b/fs/minix/dir.c | |||
@@ -156,7 +156,7 @@ minix_dirent *minix_find_entry(struct dentry *dentry, struct page **res_page) | |||
156 | { | 156 | { |
157 | const char * name = dentry->d_name.name; | 157 | const char * name = dentry->d_name.name; |
158 | int namelen = dentry->d_name.len; | 158 | int namelen = dentry->d_name.len; |
159 | struct inode * dir = dentry->d_parent->d_inode; | 159 | struct inode * dir = d_inode(dentry->d_parent); |
160 | struct super_block * sb = dir->i_sb; | 160 | struct super_block * sb = dir->i_sb; |
161 | struct minix_sb_info * sbi = minix_sb(sb); | 161 | struct minix_sb_info * sbi = minix_sb(sb); |
162 | unsigned long n; | 162 | unsigned long n; |
@@ -203,7 +203,7 @@ found: | |||
203 | 203 | ||
204 | int minix_add_link(struct dentry *dentry, struct inode *inode) | 204 | int minix_add_link(struct dentry *dentry, struct inode *inode) |
205 | { | 205 | { |
206 | struct inode *dir = dentry->d_parent->d_inode; | 206 | struct inode *dir = d_inode(dentry->d_parent); |
207 | const char * name = dentry->d_name.name; | 207 | const char * name = dentry->d_name.name; |
208 | int namelen = dentry->d_name.len; | 208 | int namelen = dentry->d_name.len; |
209 | struct super_block * sb = dir->i_sb; | 209 | struct super_block * sb = dir->i_sb; |
diff --git a/fs/minix/file.c b/fs/minix/file.c index 6d63e27ec961..94f0eb9a6e2c 100644 --- a/fs/minix/file.c +++ b/fs/minix/file.c | |||
@@ -23,7 +23,7 @@ const struct file_operations minix_file_operations = { | |||
23 | 23 | ||
24 | static int minix_setattr(struct dentry *dentry, struct iattr *attr) | 24 | static int minix_setattr(struct dentry *dentry, struct iattr *attr) |
25 | { | 25 | { |
26 | struct inode *inode = dentry->d_inode; | 26 | struct inode *inode = d_inode(dentry); |
27 | int error; | 27 | int error; |
28 | 28 | ||
29 | error = inode_change_ok(inode, attr); | 29 | error = inode_change_ok(inode, attr); |
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 3f57af196a7d..1182d1e26a9c 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c | |||
@@ -626,8 +626,8 @@ static int minix_write_inode(struct inode *inode, struct writeback_control *wbc) | |||
626 | int minix_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) | 626 | int minix_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) |
627 | { | 627 | { |
628 | struct super_block *sb = dentry->d_sb; | 628 | struct super_block *sb = dentry->d_sb; |
629 | generic_fillattr(dentry->d_inode, stat); | 629 | generic_fillattr(d_inode(dentry), stat); |
630 | if (INODE_VERSION(dentry->d_inode) == MINIX_V1) | 630 | if (INODE_VERSION(d_inode(dentry)) == MINIX_V1) |
631 | stat->blocks = (BLOCK_SIZE / 512) * V1_minix_blocks(stat->size, sb); | 631 | stat->blocks = (BLOCK_SIZE / 512) * V1_minix_blocks(stat->size, sb); |
632 | else | 632 | else |
633 | stat->blocks = (sb->s_blocksize / 512) * V2_minix_blocks(stat->size, sb); | 633 | stat->blocks = (sb->s_blocksize / 512) * V2_minix_blocks(stat->size, sb); |
diff --git a/fs/minix/namei.c b/fs/minix/namei.c index cd950e2331b6..a795a11e50c7 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c | |||
@@ -104,7 +104,7 @@ out_fail: | |||
104 | static int minix_link(struct dentry * old_dentry, struct inode * dir, | 104 | static int minix_link(struct dentry * old_dentry, struct inode * dir, |
105 | struct dentry *dentry) | 105 | struct dentry *dentry) |
106 | { | 106 | { |
107 | struct inode *inode = old_dentry->d_inode; | 107 | struct inode *inode = d_inode(old_dentry); |
108 | 108 | ||
109 | inode->i_ctime = CURRENT_TIME_SEC; | 109 | inode->i_ctime = CURRENT_TIME_SEC; |
110 | inode_inc_link_count(inode); | 110 | inode_inc_link_count(inode); |
@@ -151,7 +151,7 @@ out_dir: | |||
151 | static int minix_unlink(struct inode * dir, struct dentry *dentry) | 151 | static int minix_unlink(struct inode * dir, struct dentry *dentry) |
152 | { | 152 | { |
153 | int err = -ENOENT; | 153 | int err = -ENOENT; |
154 | struct inode * inode = dentry->d_inode; | 154 | struct inode * inode = d_inode(dentry); |
155 | struct page * page; | 155 | struct page * page; |
156 | struct minix_dir_entry * de; | 156 | struct minix_dir_entry * de; |
157 | 157 | ||
@@ -171,7 +171,7 @@ end_unlink: | |||
171 | 171 | ||
172 | static int minix_rmdir(struct inode * dir, struct dentry *dentry) | 172 | static int minix_rmdir(struct inode * dir, struct dentry *dentry) |
173 | { | 173 | { |
174 | struct inode * inode = dentry->d_inode; | 174 | struct inode * inode = d_inode(dentry); |
175 | int err = -ENOTEMPTY; | 175 | int err = -ENOTEMPTY; |
176 | 176 | ||
177 | if (minix_empty_dir(inode)) { | 177 | if (minix_empty_dir(inode)) { |
@@ -187,8 +187,8 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry) | |||
187 | static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, | 187 | static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, |
188 | struct inode * new_dir, struct dentry *new_dentry) | 188 | struct inode * new_dir, struct dentry *new_dentry) |
189 | { | 189 | { |
190 | struct inode * old_inode = old_dentry->d_inode; | 190 | struct inode * old_inode = d_inode(old_dentry); |
191 | struct inode * new_inode = new_dentry->d_inode; | 191 | struct inode * new_inode = d_inode(new_dentry); |
192 | struct page * dir_page = NULL; | 192 | struct page * dir_page = NULL; |
193 | struct minix_dir_entry * dir_de = NULL; | 193 | struct minix_dir_entry * dir_de = NULL; |
194 | struct page * old_page; | 194 | struct page * old_page; |