diff options
Diffstat (limited to 'fs/minix/namei.c')
-rw-r--r-- | fs/minix/namei.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/fs/minix/namei.c b/fs/minix/namei.c index 2f76e38c2065..2d0ee1786305 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c | |||
@@ -94,9 +94,6 @@ static int minix_link(struct dentry * old_dentry, struct inode * dir, | |||
94 | { | 94 | { |
95 | struct inode *inode = old_dentry->d_inode; | 95 | struct inode *inode = old_dentry->d_inode; |
96 | 96 | ||
97 | if (inode->i_nlink >= minix_sb(inode->i_sb)->s_link_max) | ||
98 | return -EMLINK; | ||
99 | |||
100 | inode->i_ctime = CURRENT_TIME_SEC; | 97 | inode->i_ctime = CURRENT_TIME_SEC; |
101 | inode_inc_link_count(inode); | 98 | inode_inc_link_count(inode); |
102 | ihold(inode); | 99 | ihold(inode); |
@@ -106,10 +103,7 @@ static int minix_link(struct dentry * old_dentry, struct inode * dir, | |||
106 | static int minix_mkdir(struct inode * dir, struct dentry *dentry, umode_t mode) | 103 | static int minix_mkdir(struct inode * dir, struct dentry *dentry, umode_t mode) |
107 | { | 104 | { |
108 | struct inode * inode; | 105 | struct inode * inode; |
109 | int err = -EMLINK; | 106 | int err; |
110 | |||
111 | if (dir->i_nlink >= minix_sb(dir->i_sb)->s_link_max) | ||
112 | goto out; | ||
113 | 107 | ||
114 | inode_inc_link_count(dir); | 108 | inode_inc_link_count(dir); |
115 | 109 | ||
@@ -181,7 +175,6 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry) | |||
181 | static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, | 175 | static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, |
182 | struct inode * new_dir, struct dentry *new_dentry) | 176 | struct inode * new_dir, struct dentry *new_dentry) |
183 | { | 177 | { |
184 | struct minix_sb_info * info = minix_sb(old_dir->i_sb); | ||
185 | struct inode * old_inode = old_dentry->d_inode; | 178 | struct inode * old_inode = old_dentry->d_inode; |
186 | struct inode * new_inode = new_dentry->d_inode; | 179 | struct inode * new_inode = new_dentry->d_inode; |
187 | struct page * dir_page = NULL; | 180 | struct page * dir_page = NULL; |
@@ -219,11 +212,6 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, | |||
219 | drop_nlink(new_inode); | 212 | drop_nlink(new_inode); |
220 | inode_dec_link_count(new_inode); | 213 | inode_dec_link_count(new_inode); |
221 | } else { | 214 | } else { |
222 | if (dir_de) { | ||
223 | err = -EMLINK; | ||
224 | if (new_dir->i_nlink >= info->s_link_max) | ||
225 | goto out_dir; | ||
226 | } | ||
227 | err = minix_add_link(new_dentry, old_inode); | 215 | err = minix_add_link(new_dentry, old_inode); |
228 | if (err) | 216 | if (err) |
229 | goto out_dir; | 217 | goto out_dir; |