Merge tag 'pull-file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-block.git] / fs / nfsd / nfs4recover.c

diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 5d680045fa2c7fcb6377b41b1b656df5abccfde6..78b8cd9651d5b929cd1352f55ee652c577f61960 100644 (file)
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -266,7 +266,7 @@ struct nfs4_dir_ctx {
        struct list_head names;
 };
 
-static int
+static bool
 nfsd4_build_namelist(struct dir_context *__ctx, const char *name, int namlen,
                loff_t offset, u64 ino, unsigned int d_type)
 {
@@ -275,14 +275,14 @@ nfsd4_build_namelist(struct dir_context *__ctx, const char *name, int namlen,
        struct name_list *entry;
 
        if (namlen != HEXDIR_LEN - 1)
-               return 0;
+               return true;
        entry = kmalloc(sizeof(struct name_list), GFP_KERNEL);
        if (entry == NULL)
-               return -ENOMEM;
+               return false;
        memcpy(entry->name, name, HEXDIR_LEN - 1);
        entry->name[HEXDIR_LEN - 1] = '\0';
        list_add(&entry->list, &ctx->names);
-       return 0;
+       return true;
 }
 
 static int