From e71a0f36032cf9cfaf209aa326f900f681ae1e83 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Tue, 26 Oct 2010 14:22:20 -0700 Subject: [PATCH] --- yaml --- r: 217508 b: refs/heads/master c: c5c6dd4e2dce3cb4d705d97183bc42b4e33e2606 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/hostfs/hostfs_user.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f46d2b07017f..ecb1b1f87e49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be76d81f99c4c120adcd201a7316e4dd7dbe3c11 +refs/heads/master: c5c6dd4e2dce3cb4d705d97183bc42b4e33e2606 diff --git a/trunk/fs/hostfs/hostfs_user.c b/trunk/fs/hostfs/hostfs_user.c index 8d02683585e0..d51a98384bc0 100644 --- a/trunk/fs/hostfs/hostfs_user.c +++ b/trunk/fs/hostfs/hostfs_user.c @@ -94,8 +94,7 @@ void *open_dir(char *path, int *err_out) dir = opendir(path); *err_out = errno; - if (dir == NULL) - return NULL; + return dir; } @@ -205,7 +204,7 @@ int set_attr(const char *file, struct hostfs_iattr *attrs, int fd) if (attrs->ia_valid & HOSTFS_ATTR_MODE) { if (fd >= 0) { if (fchmod(fd, attrs->ia_mode) != 0) - return (-errno); + return -errno; } else if (chmod(file, attrs->ia_mode) != 0) { return -errno; }