From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id n9MGomhp115085 for ; Thu, 22 Oct 2009 11:50:48 -0500 Received: from estes.americas.sgi.com (estes.americas.sgi.com [128.162.236.10]) by relay1.corp.sgi.com (Postfix) with ESMTP id A04B58F8050 for ; Thu, 22 Oct 2009 09:52:23 -0700 (PDT) Message-ID: <4AE08DC7.7000200@sgi.com> Date: Thu, 22 Oct 2009 11:52:23 -0500 From: Bill Kendall MIME-Version: 1.0 Subject: [PATCH 1/2] add lpath_to_handle to libhandle List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com path_to_handle() is not reliable when called on a path which is a symlink. If the symlink is dangling, or if its points to a non-XFS filesystem then path_to_handle() will fail. The reason is that path_to_handle() must open the path in order to obtain an fd for the xfsctl call. It's common during xfsrestore to have dangling symlinks since the target of the link may not be restored before the symlink. This patch adds a new function to libhandle, lpath_to_handle. It is just like path_to_handle, except it takes a filesystem path in addition to the path which you want convert to a handle. Alex Elder is going to take care of bumping the libhandle minor number, and adjusting the xfsdump/xfsprogs version numbers and dependencies to ensure a compatible libhandle is installed for xfsdump. Signed-off-by: Bill Kendall diff --git a/include/handle.h b/include/handle.h index b211a2f..3f1a137 100644 --- a/include/handle.h +++ b/include/handle.h @@ -27,6 +27,8 @@ struct attrlist_cursor; struct parent; extern int path_to_handle (char *__path, void **__hanp, size_t *__hlen); +extern int lpath_to_handle (char *__fspath, char *__path, + void **__hanp, size_t *__hlen); extern int path_to_fshandle (char *__path, void **__fshanp, size_t *__fshlen); extern int handle_to_fshandle (void *__hanp, size_t __hlen, void **__fshanp, size_t *__fshlen); diff --git a/libhandle/handle.c b/libhandle/handle.c index 6276797..6c9380d 100644 --- a/libhandle/handle.c +++ b/libhandle/handle.c @@ -111,16 +111,29 @@ path_to_handle( void **hanp, /* output, pointer to data */ size_t *hlen) /* output, size of returned data */ { + return lpath_to_handle(path, path, hanp, hlen); +} + +/* Like path_to_handle, but reliable for paths which are either dangling + * symlinks or symlinks whose targets are not in XFS filesystems. + */ +int +lpath_to_handle( + char *fspath, /* input, path in filesystem */ + char *path, /* input, path to convert */ + void **hanp, /* output, pointer to data */ + size_t *hlen) /* output, size of returned data */ +{ int fd; int result; comarg_t obj; - fd = open(path, O_RDONLY); + fd = open(fspath, O_RDONLY); if (fd < 0) return -1; obj.path = path; - result = obj_to_handle(path, fd, XFS_IOC_PATH_TO_HANDLE, + result = obj_to_handle(fspath, fd, XFS_IOC_PATH_TO_HANDLE, obj, hanp, hlen); close(fd); return result; _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs