From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rusty Russell Date: Tue, 16 Jul 2013 16:05:56 +0930 Subject: [Cluster-devel] [PATCH 1/1] GFS2: Replace PTR_RET with PTR_ERR_OR_ZERO In-Reply-To: <1373908685.2730.46.camel@menhir> References: <1373887709-9837-1-git-send-email-sachin.kamat@linaro.org> <1373908685.2730.46.camel@menhir> Message-ID: <87mwpnyptf.fsf@rustcorp.com.au> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Steven Whitehouse writes: > Hi, > > On Mon, 2013-07-15 at 16:58 +0530, Sachin Kamat wrote: >> PTR_RET is now deprecated. Use PTR_ERR_OR_ZERO instead. >> >> Signed-off-by: Sachin Kamat >> --- >> Compile tested and based on the following tree: >> git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git (PTR_RET) >> >> Dependent on [1] >> [1] http://lkml.indiana.edu/hypermail/linux/kernel/1306.2/00010.html >> --- >> fs/gfs2/inode.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c >> index bbb2715..a186ebd 100644 >> --- a/fs/gfs2/inode.c >> +++ b/fs/gfs2/inode.c >> @@ -19,6 +19,7 @@ >> #include >> #include >> #include >> +#include >> #include >> >> #include "gfs2.h" >> @@ -594,7 +595,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, >> } >> gfs2_glock_dq_uninit(ghs); >> if (IS_ERR(d)) >> - return PTR_RET(d); >> + return PTR_ERR_OR_ZERO(d); > > I'm not sure I follow what this is supposed to be doing... what is the > reason for this change? This macro/function doesn't seem to be defined > in the current kernel, so I assume that it is "coming soon" but the > thread pointed to above wasn't very enlightening, It's a clarification rename. But this fix is wrong, it should just be changed to PTR_ERR(d). It never needed PTR_RET() in the first place. Thanks, Rusty.