← Back to branch summary

~ubuntu-branches/ubuntu/wily/spl-linux/wily-proposed

« back to all changes in this revision

Viewing changes to module/spl/spl-vnode.c

  • Committer: Package Import Robot
  • Author(s): Liang Guo
  • Date: 2014-07-31 15:16:53 UTC
  • Revision ID: package-import@ubuntu.com-20140731151653-tgao12alohj26jcs
Tags: upstream-0.6.3+git20140731
Import upstream version 0.6.3+git20140731

Show diffs side-by-side

added added

removed removed

Lines of Context:
module/spl/spl-vnode.c
334
334
                if (inode)
335
335
                        ihold(inode);
336
336
 
 
337
#ifdef HAVE_2ARGS_VFS_UNLINK
337
338
                rc = vfs_unlink(parent.dentry->d_inode, dentry);
 
339
#else
 
340
                rc = vfs_unlink(parent.dentry->d_inode, dentry, NULL);
 
341
#endif /* HAVE_2ARGS_VFS_UNLINK */
338
342
exit1:
339
343
                dput(dentry);
340
344
        } else {
410
414
                        SGOTO(exit4, rc);
411
415
        }
412
416
 
413
 
#ifdef HAVE_4ARGS_VFS_RENAME
414
 
        rc = vfs_rename(old_dir->d_inode, old_dentry,
415
 
                        new_dir->d_inode, new_dentry);
 
417
#if defined(HAVE_4ARGS_VFS_RENAME)
 
418
        rc = vfs_rename(old_dir->d_inode, old_dentry,
 
419
            new_dir->d_inode, new_dentry);
 
420
#elif defined(HAVE_5ARGS_VFS_RENAME)
 
421
        rc = vfs_rename(old_dir->d_inode, old_dentry,
 
422
            new_dir->d_inode, new_dentry, NULL);
416
423
#else
417
 
        rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.nd_mnt,
418
 
                        new_dir->d_inode, new_dentry, newnd.nd_mnt);
419
 
#endif /* HAVE_4ARGS_VFS_RENAME */
 
424
        rc = vfs_rename(old_dir->d_inode, old_dentry,
 
425
            new_dir->d_inode, new_dentry, NULL, 0);
 
426
#endif
420
427
exit4:
421
428
        unlock_rename(new_dir, old_dir);
422
429
exit3:
478
485
                if (inode)
479
486
                        atomic_inc(&inode->i_count);
480
487
#ifdef HAVE_2ARGS_VFS_UNLINK
481
 
                rc = vfs_unlink(nd.nd_dentry->d_inode, dentry);
 
488
                rc = vfs_unlink(nd.nd_dentry->d_inode, dentry);
482
489
#else
483
 
                rc = vfs_unlink(nd.nd_dentry->d_inode, dentry, nd.nd_mnt);
 
490
                rc = vfs_unlink(nd.nd_dentry->d_inode, dentry, NULL);
484
491
#endif /* HAVE_2ARGS_VFS_UNLINK */
485
492
exit2:
486
493
                dput(dentry);
570
577
        if (new_dentry == trap)
571
578
                SGOTO(exit5, rc);
572
579
 
573
 
#ifdef HAVE_4ARGS_VFS_RENAME
574
 
        rc = vfs_rename(old_dir->d_inode, old_dentry,
575
 
                        new_dir->d_inode, new_dentry);
 
580
#if defined(HAVE_4ARGS_VFS_RENAME)
 
581
        rc = vfs_rename(old_dir->d_inode, old_dentry,
 
582
            new_dir->d_inode, new_dentry);
 
583
#elif defined(HAVE_5ARGS_VFS_RENAME)
 
584
        rc = vfs_rename(old_dir->d_inode, old_dentry,
 
585
            new_dir->d_inode, new_dentry, NULL);
576
586
#else
577
 
        rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.nd_mnt,
578
 
                        new_dir->d_inode, new_dentry, newnd.nd_mnt);
579
 
#endif /* HAVE_4ARGS_VFS_RENAME */
 
587
        rc = vfs_rename(old_dir->d_inode, old_dentry,
 
588
            new_dir->d_inode, new_dentry, NULL, 0);
 
589
#endif
580
590
exit5:
581
591
        dput(new_dentry);
582
592
exit4: