Merge remote-tracking branch 'asoc/fix/core' into asoc-next

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_export.c

diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c
index a83611849cee292d6731d8a782778d6ebb2bf048..c585bc646395e04c5497621eeb4ec34bd1f262e7 100644 (file)
--- a/fs/xfs/xfs_export.c
+++ b/fs/xfs/xfs_export.c
@@ -48,7 +48,7 @@ static int xfs_fileid_length(int fileid_type)
        case FILEID_INO32_GEN_PARENT | XFS_FILEID_TYPE_64FLAG:
                return 6;
        }
-       return 255; /* invalid */
+       return FILEID_INVALID;
 }
 
 STATIC int
@@ -90,7 +90,7 @@ xfs_fs_encode_fh(
        len = xfs_fileid_length(fileid_type);
        if (*max_len < len) {
                *max_len = len;
-               return 255;
+               return FILEID_INVALID;
        }
        *max_len = len;