Linux NFS development
 help / color / mirror / Atom feed
From: Krishna Kumar <krkumar2@in.ibm.com>
To: linux-nfs@vger.kernel.org
Cc: Krishna Kumar <krkumar2@in.ibm.com>
Subject: [PATCH 4/4] nfsd: Minor cleanup of _get_posix_acl
Date: Mon, 20 Oct 2008 11:47:21 +0530	[thread overview]
Message-ID: <20081020061721.18370.93671.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20081020061709.18370.85373.sendpatchset-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>

From: Krishna Kumar <krkumar2@in.ibm.com>

Rewrite error case to not check twice for !buflen. Compile tested.

Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
---
 fs/nfsd/vfs.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff -ruNp linux-2.6.27.org/fs/nfsd/vfs.c linux-2.6.27.new/fs/nfsd/vfs.c
--- linux-2.6.27.org/fs/nfsd/vfs.c	2008-10-20 10:47:19.000000000 +0530
+++ linux-2.6.27.new/fs/nfsd/vfs.c	2008-10-20 10:48:32.000000000 +0530
@@ -503,10 +503,11 @@ _get_posix_acl(struct dentry *dentry, ch
 	int buflen;
 
 	buflen = nfsd_getxattr(dentry, key, &buf);
-	if (!buflen)
-		buflen = -ENODATA;
-	if (buflen <= 0)
+	if (buflen <= 0) {
+		if (!buflen)
+			buflen = -ENODATA;
 		return ERR_PTR(buflen);
+	}
 
 	pacl = posix_acl_from_xattr(buf, buflen);
 	kfree(buf);

  parent reply	other threads:[~2008-10-20  6:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-20  6:17 [PATCH 3/4] nfsd: Fix leaked memory in nfs4_make_rec_clidname Krishna Kumar
     [not found] ` <20081020061709.18370.85373.sendpatchset-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2008-10-20  6:17   ` Krishna Kumar [this message]
     [not found]     ` <20081020061721.18370.93671.sendpatchset-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2008-10-20 21:02       ` [PATCH 4/4] nfsd: Minor cleanup of _get_posix_acl J. Bruce Fields
2008-10-20 20:58   ` [PATCH 3/4] nfsd: Fix leaked memory in nfs4_make_rec_clidname J. Bruce Fields

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081020061721.18370.93671.sendpatchset@localhost.localdomain \
    --to=krkumar2@in.ibm.com \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox