Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d905fdaa authored by Amir Goldstein's avatar Amir Goldstein Committed by Christoph Hellwig
Browse files

xfs: use the common helper uuid_is_null() 



Use the common helper uuid_is_null() and remove the xfs specific
helper uuid_is_nil().

The common helper does not check for the NULL pointer value as
xfs helper did, but xfs code never calls the helper with a pointer
that can be NULL.

Conform comments and warning strings to use the term 'null uuid'
instead of 'nil uuid', because this is the terminology used by
lib/uuid.c and its users. It is also the terminology used in
userspace by libuuid and xfsprogs.

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
[hch: remove now unused uuid.[ch]]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent cb0ba6cc

fs/xfs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ xfs-y += xfs_aops.o \ 
				   xfs_sysfs.o \

				   xfs_trans.o \

				   xfs_xattr.o \

				   kmem.o \

				   uuid.o

				   kmem.o



# low-level transaction/log code

xfs-y				+= xfs_log.o \

fs/xfs/uuid.c

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.

 * All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it would be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#include <xfs.h>



int

uuid_is_nil(uuid_t *uuid)

{

	int	i;

	char	*cp = (char *)uuid;



	if (uuid == NULL)

		return 0;

	/* implied check of version number here... */

	for (i = 0; i < sizeof *uuid; i++)

		if (*cp++) return 0;	/* not nil */

	return 1;	/* is nil */

}

fs/xfs/uuid.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.

 * All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it would be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#ifndef __XFS_SUPPORT_UUID_H__

#define __XFS_SUPPORT_UUID_H__



extern int uuid_is_nil(uuid_t *uuid);



#endif	/* __XFS_SUPPORT_UUID_H__ */

fs/xfs/xfs_linux.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ typedef __u32 xfs_nlink_t; 


#include "kmem.h"

#include "mrlock.h"

#include "uuid.h"



#include <linux/semaphore.h>

#include <linux/mm.h>

fs/xfs/xfs_log_recover.c

+3 −3
Original line number Diff line number Diff line
@@ -352,13 +352,13 @@ xlog_header_check_mount( 
{

	ASSERT(head->h_magicno == cpu_to_be32(XLOG_HEADER_MAGIC_NUM));



	if (uuid_is_nil(&head->h_fs_uuid)) {

	if (uuid_is_null(&head->h_fs_uuid)) {

		/*

		 * IRIX doesn't write the h_fs_uuid or h_fmt fields. If

		 * h_fs_uuid is nil, we assume this log was last mounted

		 * h_fs_uuid is null, we assume this log was last mounted

		 * by IRIX and continue.

		 */

		xfs_warn(mp, "nil uuid in log - IRIX style log");

		xfs_warn(mp, "null uuid in log - IRIX style log");

	} else if (unlikely(!uuid_equal(&mp->m_sb.sb_uuid, &head->h_fs_uuid))) {

		xfs_warn(mp, "log has mismatched uuid - can't recover");

		xlog_header_check_dump(mp, head);