From 467c5dc572aad31a201a83ba5e8d77c633147635 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Tue, 11 Nov 2008 07:44:14 +0000 Subject: [PATCH] Branch b1_8_gate b=17153 i=adilger, robert.read Remove 2.4 check. Author: tappro CVSooi= --- lustre/mds/mds_xattr.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lustre/mds/mds_xattr.c b/lustre/mds/mds_xattr.c index 9bd4b60..57afdd0 100644 --- a/lustre/mds/mds_xattr.c +++ b/lustre/mds/mds_xattr.c @@ -145,10 +145,8 @@ static int mds_getxattr_internal(struct obd_device *obd, DEBUG_REQ(D_INODE, req, "getxattr %s", xattr_name); if (inode->i_op && inode->i_op->getxattr) { - lock_24kernel(); rc = inode->i_op->getxattr(dentry, xattr_name, buf, buflen); - unlock_24kernel(); } if (rc < 0 && rc != -ENODATA && rc != -EOPNOTSUPP && @@ -157,11 +155,8 @@ static int mds_getxattr_internal(struct obd_device *obd, } else if (reqbody->valid & OBD_MD_FLXATTRLS) { DEBUG_REQ(D_INODE, req, "listxattr"); - if (inode->i_op && inode->i_op->listxattr) { - lock_24kernel(); + if (inode->i_op && inode->i_op->listxattr) rc = inode->i_op->listxattr(dentry, buf, buflen); - unlock_24kernel(); - } if (rc < 0) CDEBUG(D_OTHER, "listxattr failed: %d\n", rc); } else @@ -308,18 +303,14 @@ int mds_setxattr_internal(struct ptlrpc_request *req, struct mds_body *body) REQ_REC_OFF+2, xattrlen); LOCK_INODE_MUTEX(inode); - lock_24kernel(); rc = inode->i_op->setxattr(de, xattr_name, xattr, xattrlen, body->flags); - unlock_24kernel(); UNLOCK_INODE_MUTEX(inode); } } else if (body->valid & OBD_MD_FLXATTRRM) { if (inode->i_op && inode->i_op->removexattr) { LOCK_INODE_MUTEX(inode); - lock_24kernel(); rc = inode->i_op->removexattr(de, xattr_name); - unlock_24kernel(); UNLOCK_INODE_MUTEX(inode); } } else { -- 1.8.3.1