Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[~andy/linux] / fs / reiserfs / inode.c

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 95d7680ead47a8c6379629614eadb0fdbf233fe0..ea5061fd4f3e04b055421c1d8d6c5657d250e758 100644 (file)
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -1603,10 +1603,10 @@ int reiserfs_encode_fh(struct inode *inode, __u32 * data, int *lenp,
 
        if (parent && (maxlen < 5)) {
                *lenp = 5;
-               return 255;
+               return FILEID_INVALID;
        } else if (maxlen < 3) {
                *lenp = 3;
-               return 255;
+               return FILEID_INVALID;
        }
 
        data[0] = inode->i_ino;