From patchwork Wed Mar 23 01:58:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valerie Aurora X-Patchwork-Id: 654051 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2N21ATp010322 for ; Wed, 23 Mar 2011 02:01:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756020Ab1CWCAo (ORCPT ); Tue, 22 Mar 2011 22:00:44 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:59288 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756263Ab1CWCAj (ORCPT ); Tue, 22 Mar 2011 22:00:39 -0400 Received: by iyb26 with SMTP id 26so8069974iyb.19 for ; Tue, 22 Mar 2011 19:00:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=ZswJfM+4JzG6dkg1aFw6FDKRm/gdhp7B0/U/nBScL8A=; b=Bqiwu2EJZ/LyicY8d/OJ/V+px64uf9ibSTU/MCQ88/os3tq8DhFJ3r19lVz/2jqk2y H98sZT+UdM0bLtKkvLmueePqYkXtsY5/uS+Bd6qs9vAWCG61/0AQ3/P0SOC5mhdnlA3o mPAk1pXGitp8lakvdz6oTu85O9HQ2oM733WpQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=hH49wuVOdR0NZHBhqPgLWAA5eIQSPsr/8xERRgC+qRRGMYETv9g0/WfJwgckwRsAKY spqXFEzJb5HrZfeNRsa8gHugnBUS05pOGvTcNEPk74H9V8Y1kv73kFIYjCnI8EOchNb3 AYOB+SKy7DQZGE3ZlD6PS8b3+r+OkECJsBQLQ= Received: by 10.43.64.132 with SMTP id xi4mr6779788icb.165.1300845639051; Tue, 22 Mar 2011 19:00:39 -0700 (PDT) Received: from localhost.localdomain (wsip-70-184-107-15.ph.ph.cox.net [70.184.107.15]) by mx.google.com with ESMTPS id 13sm4750748ibo.8.2011.03.22.19.00.36 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 22 Mar 2011 19:00:38 -0700 (PDT) From: Valerie Aurora To: linux-fsdevel@vger.kernel.org, linux@vger.kernel.org Cc: viro@zeniv.linux.org.uk, Jan Blunck , David Woodhouse , Valerie Aurora , linux-nfs@vger.kernel.org, Neil Brown , Valerie Aurora Subject: [PATCH 05/74] whiteout/NFSD: Don't return information about whiteouts to userspace Date: Tue, 22 Mar 2011 18:58:41 -0700 Message-Id: <1300845590-14184-6-git-send-email-valerie.aurora@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1300845590-14184-1-git-send-email-valerie.aurora@gmail.com> References: <1300845590-14184-1-git-send-email-valerie.aurora@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 23 Mar 2011 02:01:11 +0000 (UTC) diff --git a/fs/compat.c b/fs/compat.c index 718c706..825bb7b 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -914,6 +914,9 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen, struct compat_old_linux_dirent __user *dirent; compat_ulong_t d_ino; + if (d_type == DT_WHT) + return 0; + if (buf->result) return -EINVAL; d_ino = ino; @@ -986,6 +989,9 @@ static int compat_filldir(void *__buf, const char *name, int namlen, int reclen = ALIGN(offsetof(struct compat_linux_dirent, d_name) + namlen + 2, sizeof(compat_long_t)); + if (d_type == DT_WHT) + return 0; + buf->error = -EINVAL; /* only used if we fail.. */ if (reclen > buf->count) return -EINVAL; @@ -1075,6 +1081,9 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t sizeof(u64)); u64 off; + if (d_type == DT_WHT) + return 0; + buf->error = -EINVAL; /* only used if we fail.. */ if (reclen > buf->count) return -EINVAL; diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index 2a533a0..9b96f5a 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c @@ -885,6 +885,11 @@ encode_entry(struct readdir_cd *ccd, const char *name, int namlen, int elen; /* estimated entry length in words */ int num_entry_words = 0; /* actual number of words */ + if (d_type == DT_WHT) { + cd->common.err = nfs_ok; + return 0; + } + if (cd->offset) { u64 offset64 = offset; diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 1a468bb..136944d 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2283,6 +2283,11 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, return 0; } + if (d_type == DT_WHT) { + cd->common.err = nfs_ok; + return 0; + } + if (cd->offset) xdr_encode_hyper(cd->offset, (u64) offset); diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c index 4ce005d..0e57d4b 100644 --- a/fs/nfsd/nfsxdr.c +++ b/fs/nfsd/nfsxdr.c @@ -503,6 +503,10 @@ nfssvc_encode_entry(void *ccdv, const char *name, namlen, name, offset, ino); */ + if (d_type == DT_WHT) { + cd->common.err = nfs_ok; + return 0; + } if (offset > ~((u32) 0)) { cd->common.err = nfserr_fbig; return -EINVAL; diff --git a/fs/readdir.c b/fs/readdir.c index 356f715..de703d6 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -77,6 +77,9 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset struct old_linux_dirent __user * dirent; unsigned long d_ino; + if (d_type == DT_WHT) + return 0; + if (buf->result) return -EINVAL; d_ino = ino; @@ -155,6 +158,9 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, int reclen = ALIGN(offsetof(struct linux_dirent, d_name) + namlen + 2, sizeof(long)); + if (d_type == DT_WHT) + return 0; + buf->error = -EINVAL; /* only used if we fail.. */ if (reclen > buf->count) return -EINVAL; @@ -241,6 +247,9 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset, int reclen = ALIGN(offsetof(struct linux_dirent64, d_name) + namlen + 1, sizeof(u64)); + if (d_type == DT_WHT) + return 0; + buf->error = -EINVAL; /* only used if we fail.. */ if (reclen > buf->count) return -EINVAL;