From 86cbde640b760f08bef661b02c9560f889255fbb Mon Sep 17 00:00:00 2001 From: fanyong Date: Thu, 28 Sep 2006 07:10:39 +0000 Subject: [PATCH] Fix bad return value in getfacl/setfacl. --- lustre/llite/llite_lib.c | 10 +++++----- lustre/mdt/mdt_xattr.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 2ece804..2707aa7 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -2247,7 +2247,7 @@ void ll_finish_md_op_data(struct md_op_data *op_data) int ll_ioctl_getfacl(struct inode *inode, struct rmtacl_ioctl_data *ioc) { struct ptlrpc_request *req = NULL; - struct mds_body *body; + struct mdt_body *body; char *cmd, *buf; struct obd_capa *oc; int rc, buflen; @@ -2263,8 +2263,8 @@ int ll_ioctl_getfacl(struct inode *inode, struct rmtacl_ioctl_data *ioc) oc = ll_i2mdscapa(inode); rc = md_getxattr(ll_i2sbi(inode)->ll_md_exp, ll_inode2fid(inode), oc, - OBD_MD_FLXATTR, XATTR_NAME_LUSTRE_ACL, cmd, - ioc->cmd_len, ioc->res_len, 0, &req); + OBD_MD_FLXATTR, XATTR_NAME_LUSTRE_ACL, cmd, + ioc->cmd_len, ioc->res_len, 0, &req); capa_put(oc); if (rc < 0) { CERROR("mdc_getxattr %s [%s] failed: %d\n", @@ -2307,8 +2307,8 @@ int ll_ioctl_setfacl(struct inode *inode, struct rmtacl_ioctl_data *ioc) oc = ll_i2mdscapa(inode); rc = md_setxattr(ll_i2sbi(inode)->ll_md_exp, ll_inode2fid(inode), oc, - OBD_MD_FLXATTR, XATTR_NAME_LUSTRE_ACL, cmd, - ioc->cmd_len, ioc->res_len, 0, &req); + OBD_MD_FLXATTR, XATTR_NAME_LUSTRE_ACL, cmd, + ioc->cmd_len, ioc->res_len, 0, &req); capa_put(oc); if (rc) { CERROR("mdc_setxattr %s [%s] failed: %d\n", diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c index a9c689c..88eea47 100644 --- a/lustre/mdt/mdt_xattr.c +++ b/lustre/mdt/mdt_xattr.c @@ -96,7 +96,7 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info) rc1 = req_capsule_pack(pill); - return rc = !rc1? rc1 : rc; + return rc = rc1 ? rc1 : rc; } static int do_remote_getfacl(struct mdt_thread_info *info, @@ -222,7 +222,7 @@ static int mdt_setxattr_pack_reply(struct mdt_thread_info * info) rc1 = req_capsule_pack(pill); - return rc = !rc1? rc1 : rc; + return rc = rc1 ? rc1 : rc; } static int do_remote_setfacl(struct mdt_thread_info *info, struct lu_fid *fid) -- 1.8.3.1