diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-03 10:35:28 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-03 10:35:28 +0800 |
commit | 0a3bdb00710bf253ba8ba8f645645f22297c7a04 (patch) | |
tree | 772e2c88779f271693824b5816b8e0b57936e170 /drivers/staging/lustre/lustre/llite/xattr.c | |
parent | staging: lustre: remove EXIT macro (diff) | |
download | linux-dev-0a3bdb00710bf253ba8ba8f645645f22297c7a04.tar.xz linux-dev-0a3bdb00710bf253ba8ba8f645645f22297c7a04.zip |
staging: lustre: remove RETURN macro
We have a kernel-wide function tracing system, so use that instead of
rolling a custom one just for one filesystem.
Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/llite/xattr.c')
-rw-r--r-- | drivers/staging/lustre/lustre/llite/xattr.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c index cf1bb4fc36e6..bcf86bac30a9 100644 --- a/drivers/staging/lustre/lustre/llite/xattr.c +++ b/drivers/staging/lustre/lustre/llite/xattr.c @@ -122,22 +122,22 @@ int ll_setxattr_common(struct inode *inode, const char *name, xattr_type = get_xattr_type(name); rc = xattr_type_filter(sbi, xattr_type); if (rc) - RETURN(rc); + return rc; /* b10667: ignore lustre special xattr for now */ if ((xattr_type == XATTR_TRUSTED_T && strcmp(name, "trusted.lov") == 0) || (xattr_type == XATTR_LUSTRE_T && strcmp(name, "lustre.lov") == 0)) - RETURN(0); + return 0; /* b15587: ignore security.capability xattr for now */ if ((xattr_type == XATTR_SECURITY_T && strcmp(name, "security.capability") == 0)) - RETURN(0); + return 0; /* LU-549: Disable security.selinux when selinux is disabled */ if (xattr_type == XATTR_SECURITY_T && !selinux_is_enabled() && strcmp(name, "security.selinux") == 0) - RETURN(-EOPNOTSUPP); + return -EOPNOTSUPP; #ifdef CONFIG_FS_POSIX_ACL if (sbi->ll_flags & LL_SBI_RMT_CLIENT && @@ -147,7 +147,7 @@ int ll_setxattr_common(struct inode *inode, const char *name, if (rce == NULL || (rce->rce_ops != RMT_LSETFACL && rce->rce_ops != RMT_RSETFACL)) - RETURN(-EOPNOTSUPP); + return -EOPNOTSUPP; if (rce->rce_ops == RMT_LSETFACL) { struct eacl_entry *ee; @@ -161,7 +161,7 @@ int ll_setxattr_common(struct inode *inode, const char *name, size, ee->ee_acl); if (IS_ERR(acl)) { ee_free(ee); - RETURN(PTR_ERR(acl)); + return PTR_ERR(acl); } size = CFS_ACL_XATTR_SIZE(\ le32_to_cpu(acl->a_count), \ @@ -174,11 +174,11 @@ int ll_setxattr_common(struct inode *inode, const char *name, (posix_acl_xattr_header *)value, size, &new_value); if (unlikely(size < 0)) - RETURN(size); + return size; pv = (const char *)new_value; } else - RETURN(-EOPNOTSUPP); + return -EOPNOTSUPP; valid |= rce_ops2valid(rce->rce_ops); } @@ -200,11 +200,11 @@ int ll_setxattr_common(struct inode *inode, const char *name, "it is not supported on the server\n"); sbi->ll_flags &= ~LL_SBI_USER_XATTR; } - RETURN(rc); + return rc; } ptlrpc_req_finished(req); - RETURN(0); + return 0; } int ll_setxattr(struct dentry *dentry, const char *name, @@ -302,17 +302,17 @@ int ll_getxattr_common(struct inode *inode, const char *name, xattr_type = get_xattr_type(name); rc = xattr_type_filter(sbi, xattr_type); if (rc) - RETURN(rc); + return rc; /* b15587: ignore security.capability xattr for now */ if ((xattr_type == XATTR_SECURITY_T && strcmp(name, "security.capability") == 0)) - RETURN(-ENODATA); + return -ENODATA; /* LU-549: Disable security.selinux when selinux is disabled */ if (xattr_type == XATTR_SECURITY_T && !selinux_is_enabled() && strcmp(name, "security.selinux") == 0) - RETURN(-EOPNOTSUPP); + return -EOPNOTSUPP; #ifdef CONFIG_FS_POSIX_ACL if (sbi->ll_flags & LL_SBI_RMT_CLIENT && @@ -324,7 +324,7 @@ int ll_getxattr_common(struct inode *inode, const char *name, rce->rce_ops != RMT_LGETFACL && rce->rce_ops != RMT_RSETFACL && rce->rce_ops != RMT_RGETFACL)) - RETURN(-EOPNOTSUPP); + return -EOPNOTSUPP; } /* posix acl is under protection of LOOKUP lock. when calling to this, @@ -341,14 +341,14 @@ int ll_getxattr_common(struct inode *inode, const char *name, spin_unlock(&lli->lli_lock); if (!acl) - RETURN(-ENODATA); + return -ENODATA; rc = posix_acl_to_xattr(&init_user_ns, acl, buffer, size); posix_acl_release(acl); - RETURN(rc); + return rc; } if (xattr_type == XATTR_ACL_DEFAULT_T && !S_ISDIR(inode->i_mode)) - RETURN(-ENODATA); + return -ENODATA; #endif do_getxattr: @@ -363,7 +363,7 @@ do_getxattr: "it is not supported on the server\n"); sbi->ll_flags &= ~LL_SBI_USER_XATTR; } - RETURN(rc); + return rc; } body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY); |