xfs
[Top] [All Lists]

[PATCH 1/2] Make xfs_vn_rename compliant with renameat2() syscall

To: xfs@xxxxxxxxxxx
Subject: [PATCH 1/2] Make xfs_vn_rename compliant with renameat2() syscall
From: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
Date: Wed, 12 Nov 2014 16:13:02 -0200
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1415815983-5615-1-git-send-email-cmaiolino@xxxxxxxxxx>
References: <1415815983-5615-1-git-send-email-cmaiolino@xxxxxxxxxx>
To be able to support RENAME_EXCHANGE flag from renameat2() system call, XFS
must have its inode_operations updated, exporting .rename2 method, instead of
.rename.

This patch just replaces the (now old) .rename method by .rename2, using the
same infra-structure, but checking rename flags.

calls to .rename2 using RENAME_EXCHANGE flag, although now handled inside XFS,
still returns -EINVAL.

RENAME_NOREPLACE is handled via VFS and we don't need to care about it inside
xfs_vn_rename.

Changelog:

        V2: Use xfs_vn_rename as-is, instead of rename it to xfs_vn_rename2

Signed-off-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
---
 fs/xfs/xfs_iops.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index ec6dcdc..0b8704c 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -383,18 +383,23 @@ xfs_vn_rename(
        struct inode    *odir,
        struct dentry   *odentry,
        struct inode    *ndir,
-       struct dentry   *ndentry)
+       struct dentry   *ndentry,
+       unsigned int    flags)
 {
        struct inode    *new_inode = ndentry->d_inode;
        struct xfs_name oname;
        struct xfs_name nname;
 
+       /* XFS does not support RENAME_EXCHANGE yet */
+       if (flags & ~RENAME_NOREPLACE)
+               return -EINVAL;
+
        xfs_dentry_to_name(&oname, odentry, 0);
        xfs_dentry_to_name(&nname, ndentry, odentry->d_inode->i_mode);
 
        return xfs_rename(XFS_I(odir), &oname, XFS_I(odentry->d_inode),
-                         XFS_I(ndir), &nname, new_inode ?
-                                               XFS_I(new_inode) : NULL);
+                         XFS_I(ndir), &nname,
+                         new_inode ? XFS_I(new_inode) : NULL);
 }
 
 /*
@@ -1147,7 +1152,7 @@ static const struct inode_operations 
xfs_dir_inode_operations = {
         */
        .rmdir                  = xfs_vn_unlink,
        .mknod                  = xfs_vn_mknod,
-       .rename                 = xfs_vn_rename,
+       .rename2                = xfs_vn_rename,
        .get_acl                = xfs_get_acl,
        .set_acl                = xfs_set_acl,
        .getattr                = xfs_vn_getattr,
@@ -1175,7 +1180,7 @@ static const struct inode_operations 
xfs_dir_ci_inode_operations = {
         */
        .rmdir                  = xfs_vn_unlink,
        .mknod                  = xfs_vn_mknod,
-       .rename                 = xfs_vn_rename,
+       .rename2                = xfs_vn_rename,
        .get_acl                = xfs_get_acl,
        .set_acl                = xfs_set_acl,
        .getattr                = xfs_vn_getattr,
-- 
2.1.0

<Prev in Thread] Current Thread [Next in Thread>