diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_iops.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index 12810baeb5d4..d9180020de63 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
@@ -419,16 +419,15 @@ xfs_vn_link( | |||
419 | int error; | 419 | int error; |
420 | 420 | ||
421 | ip = old_dentry->d_inode; /* inode being linked to */ | 421 | ip = old_dentry->d_inode; /* inode being linked to */ |
422 | if (S_ISDIR(ip->i_mode)) | ||
423 | return -EPERM; | ||
424 | |||
425 | tdvp = vn_from_inode(dir); | 422 | tdvp = vn_from_inode(dir); |
426 | vp = vn_from_inode(ip); | 423 | vp = vn_from_inode(ip); |
427 | 424 | ||
425 | VN_HOLD(vp); | ||
428 | error = bhv_vop_link(tdvp, vp, dentry, NULL); | 426 | error = bhv_vop_link(tdvp, vp, dentry, NULL); |
429 | if (likely(!error)) { | 427 | if (unlikely(error)) { |
428 | VN_RELE(vp); | ||
429 | } else { | ||
430 | VMODIFY(tdvp); | 430 | VMODIFY(tdvp); |
431 | VN_HOLD(vp); | ||
432 | xfs_validate_fields(ip, &vattr); | 431 | xfs_validate_fields(ip, &vattr); |
433 | d_instantiate(dentry, ip); | 432 | d_instantiate(dentry, ip); |
434 | } | 433 | } |