Re: [Btrfs-next] bulid failure at fs/btrfs/ctree.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello David,
I compared the source code and found that I did have a merge conflict.
This is now resolved and now builds fine.

Thanks,
Gordon

On 3 October 2012 00:14, David Sterba <dave@xxxxxxxx> wrote:
> On Tue, Oct 02, 2012 at 10:50:26PM +1000, Gordon Ng wrote:
>> Hello Josef,
>>
>> FYI build failure occured in fs/btrfs/ctree.h.
>>   CC      fs/btrfs/super.o
>> In file included from fs/btrfs/delayed-inode.h:30:0,
>>                  from fs/btrfs/super.c:45:
>> fs/btrfs/ctree.h:3235:1: error: expected identifier or ?(? before ?<<? token
>
> Can you please paste the sources from your tree? It's possible that it's
> leftover from a local merge conflict.
>
> From my fresh 3.6 tree:
>
> 3232 static inline void btrfs_force_ra(struct address_space *mapping,
> 3233                                   struct file_ra_state *ra, struct file *file,
> 3234                                   pgoff_t offset, unsigned long req_size)
> 3235 {
> 3236         page_cache_sync_readahead(mapping, ra, file, offset, req_size);
> 3237 }
>
>
> david
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Filesystem Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux