3.16.61-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: "Yan, Zheng" <zyan@xxxxxxxxxx> commit 0abb43dcacb52145aa265f82c914375d59dfe2da upstream. only regular file and directory have vxattrs. Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx> Cc: Bryan Henderson <bryanh@xxxxxxxxxxxxxxxx> Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx> --- fs/ceph/xattr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/fs/ceph/xattr.c +++ b/fs/ceph/xattr.c @@ -284,8 +284,7 @@ static size_t ceph_vxattrs_name_size(str return ceph_dir_vxattrs_name_size; if (vxattrs == ceph_file_vxattrs) return ceph_file_vxattrs_name_size; - BUG(); - + BUG_ON(vxattrs); return 0; }
