From 326566b9999671838165e7221d61ba12c2dde14b Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 10 Apr 2006 22:55:26 -0700 Subject: [PATCH] --- yaml --- r: 25579 b: refs/heads/master c: b5872b0dcc0501035d5ae53c60f8cbbb3798da8a h: refs/heads/master i: 25577: 511e35c0e9e47d24b01ee1e51a136cd181034a8d 25575: 4eaa56915e874be04dd558cdd7407b1cf0d25471 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/vfs.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2a9930c7aeef..36ccd7d0db2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b905b7b0a054d2ab3e0c9304def998546c93f6b5 +refs/heads/master: b5872b0dcc0501035d5ae53c60f8cbbb3798da8a diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c index 31018333dc38..6aa92d0e6876 100644 --- a/trunk/fs/nfsd/vfs.c +++ b/trunk/fs/nfsd/vfs.c @@ -371,7 +371,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, static ssize_t nfsd_getxattr(struct dentry *dentry, char *key, void **buf) { ssize_t buflen; - int error; buflen = vfs_getxattr(dentry, key, NULL, 0); if (buflen <= 0) @@ -381,10 +380,7 @@ static ssize_t nfsd_getxattr(struct dentry *dentry, char *key, void **buf) if (!*buf) return -ENOMEM; - error = vfs_getxattr(dentry, key, *buf, buflen); - if (error < 0) - return error; - return buflen; + return vfs_getxattr(dentry, key, *buf, buflen); } #endif