From 5b42dcc445402b620c40829ee0d442a514278470 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sat, 14 Nov 2009 16:17:20 +0000 Subject: [PATCH] --- yaml --- r: 175279 b: refs/heads/master c: e82fa0c7ca29b805388aa51d3cad2cb7a4df3084 h: refs/heads/master i: 175277: bbfe0d9b0887408def187458491abb27ff595bf2 175275: 171a856435a27d94c624d158d97382332fc20552 175271: 2e2e997036e7b06eb62b5ad72b23b33e613d1890 175263: b670554e99f2e2ac32928eff4a4fb3ee391d5e1d v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_attr.c | 12 ++++++++---- trunk/fs/xfs/xfs_attr.h | 1 - 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4b649c1f86a0..3d496fc844c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ad112bfb5af537e9e3103c807748bb4a99bbd9e +refs/heads/master: e82fa0c7ca29b805388aa51d3cad2cb7a4df3084 diff --git a/trunk/fs/xfs/xfs_attr.c b/trunk/fs/xfs/xfs_attr.c index 57825fe63cc5..8fe6f6b78a4a 100644 --- a/trunk/fs/xfs/xfs_attr.c +++ b/trunk/fs/xfs/xfs_attr.c @@ -123,9 +123,13 @@ xfs_inode_hasattr( * Overall external interface routines. *========================================================================*/ -int -xfs_attr_fetch(xfs_inode_t *ip, struct xfs_name *name, - char *value, int *valuelenp, int flags) +STATIC int +xfs_attr_get_int( + struct xfs_inode *ip, + struct xfs_name *name, + char *value, + int *valuelenp, + int flags) { xfs_da_args_t args; int error; @@ -188,7 +192,7 @@ xfs_attr_get( return error; xfs_ilock(ip, XFS_ILOCK_SHARED); - error = xfs_attr_fetch(ip, &xname, value, valuelenp, flags); + error = xfs_attr_get_int(ip, &xname, value, valuelenp, flags); xfs_iunlock(ip, XFS_ILOCK_SHARED); return(error); } diff --git a/trunk/fs/xfs/xfs_attr.h b/trunk/fs/xfs/xfs_attr.h index fb3b2a68b9b9..12f0be3a73d4 100644 --- a/trunk/fs/xfs/xfs_attr.h +++ b/trunk/fs/xfs/xfs_attr.h @@ -131,7 +131,6 @@ typedef struct xfs_attr_list_context { */ int xfs_attr_calc_size(struct xfs_inode *, int, int, int *); int xfs_attr_inactive(struct xfs_inode *dp); -int xfs_attr_fetch(struct xfs_inode *, struct xfs_name *, char *, int *, int); int xfs_attr_rmtval_get(struct xfs_da_args *args); int xfs_attr_list_int(struct xfs_attr_list_context *);