Hi Greg, Patch 1 is added because there is a newly introduced (7fc1f83) error when CONFIG_FS_POSIX_ACL is off. Patch 2 is updated to fix build errors in itself.
Please see if they can be merged. Thanks and sorry for the noise. Thanks, Tao Cc: Andreas Dilger <[email protected]> Peng Tao (4): staging/lustre: fix build error in ll_setxattr_common staging/lustre/llite: remove ll_file_get_iov_count staging/lustre: fix undefined reference if CONFIG_PROC_FS is off staging/lustre: don't compile procfs code when CONFIG_PROC_FS is off drivers/staging/lustre/lustre/fid/Makefile | 3 +- drivers/staging/lustre/lustre/fid/lproc_fid.c | 2 - drivers/staging/lustre/lustre/fld/Makefile | 3 +- drivers/staging/lustre/lustre/fld/fld_internal.h | 1 - drivers/staging/lustre/lustre/fld/fld_request.c | 2 +- drivers/staging/lustre/lustre/fld/lproc_fld.c | 3 - .../staging/lustre/lustre/include/lprocfs_status.h | 8 +- drivers/staging/lustre/lustre/include/lustre_sec.h | 17 +- .../staging/lustre/lustre/include/obd_support.h | 3 +- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 9 + drivers/staging/lustre/lustre/llite/Makefile | 3 +- drivers/staging/lustre/lustre/llite/file.c | 36 +- .../staging/lustre/lustre/llite/llite_internal.h | 14 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 1 + drivers/staging/lustre/lustre/llite/lproc_llite.c | 4 - drivers/staging/lustre/lustre/llite/xattr.c | 2 +- drivers/staging/lustre/lustre/lmv/Makefile | 4 +- drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 5 - drivers/staging/lustre/lustre/lov/Makefile | 3 +- drivers/staging/lustre/lustre/lov/lov_internal.h | 2 +- drivers/staging/lustre/lustre/lov/lproc_lov.c | 4 +- drivers/staging/lustre/lustre/lvfs/Makefile | 3 +- drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 2 - drivers/staging/lustre/lustre/mdc/Makefile | 3 +- drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 3 - drivers/staging/lustre/lustre/mgc/Makefile | 3 +- drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 3 - drivers/staging/lustre/lustre/mgc/mgc_internal.h | 2 +- drivers/staging/lustre/lustre/mgc/mgc_request.c | 2 + drivers/staging/lustre/lustre/obdclass/class_obd.c | 13 + .../lustre/lustre/obdclass/linux/linux-module.c | 4 +- drivers/staging/lustre/lustre/obdclass/llog_test.c | 4 + .../lustre/lustre/obdclass/lprocfs_status.c | 348 ++++++++++---------- drivers/staging/lustre/lustre/osc/Makefile | 3 +- drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 - drivers/staging/lustre/lustre/ptlrpc/Makefile | 3 +- .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 6 + 37 files changed, 263 insertions(+), 270 deletions(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
